|  | @@ -5008,7 +5008,7 @@ function configure_email {
 | 
	
		
			
			| 5008 | 5008 |    /etc/init.d/saslauthd start
 | 
	
		
			
			| 5009 | 5009 |  
 | 
	
		
			
			| 5010 | 5010 |    # make a tls certificate for email
 | 
	
		
			
			| 5011 |  | -  if [ ! -f /etc/ssl/private/exim.key ]; then
 | 
	
		
			
			|  | 5011 | +  if [ ! -f /etc/ssl/certs/exim.dhparam ]; then
 | 
	
		
			
			| 5012 | 5012 |        makecert exim
 | 
	
		
			
			| 5013 | 5013 |        check_certificates exim
 | 
	
		
			
			| 5014 | 5014 |    fi
 | 
	
	
		
			
			|  | @@ -5196,7 +5196,7 @@ function configure_imap {
 | 
	
		
			
			| 5196 | 5196 |        exit 48
 | 
	
		
			
			| 5197 | 5197 |    fi
 | 
	
		
			
			| 5198 | 5198 |  
 | 
	
		
			
			| 5199 |  | -  if [ ! -f /etc/ssl/private/dovecot.key ]; then
 | 
	
		
			
			|  | 5199 | +  if [ ! -f /etc/ssl/certs/dovecot.dhparam ]; then
 | 
	
		
			
			| 5200 | 5200 |        makecert dovecot
 | 
	
		
			
			| 5201 | 5201 |        check_certificates dovecot
 | 
	
		
			
			| 5202 | 5202 |    fi
 | 
	
	
		
			
			|  | @@ -6511,7 +6511,7 @@ quit" > $INSTALL_DIR/batch.sql
 | 
	
		
			
			| 6511 | 6511 |  
 | 
	
		
			
			| 6512 | 6512 |    configure_php
 | 
	
		
			
			| 6513 | 6513 |  
 | 
	
		
			
			| 6514 |  | -  if [ ! -f /etc/ssl/private/$OWNCLOUD_DOMAIN_NAME.key ]; then
 | 
	
		
			
			|  | 6514 | +  if [ ! -f /etc/ssl/certs/$OWNCLOUD_DOMAIN_NAME.dhparam ]; then
 | 
	
		
			
			| 6515 | 6515 |        makecert $OWNCLOUD_DOMAIN_NAME
 | 
	
		
			
			| 6516 | 6516 |        check_certificates $OWNCLOUD_DOMAIN_NAME
 | 
	
		
			
			| 6517 | 6517 |    fi
 | 
	
	
		
			
			|  | @@ -6588,7 +6588,7 @@ function install_xmpp {
 | 
	
		
			
			| 6588 | 6588 |        exit 52
 | 
	
		
			
			| 6589 | 6589 |    fi
 | 
	
		
			
			| 6590 | 6590 |  
 | 
	
		
			
			| 6591 |  | -  if [ ! -f "/etc/ssl/private/xmpp.key" ]; then
 | 
	
		
			
			|  | 6591 | +  if [ ! -f /etc/ssl/certs/xmpp.dhparam ]; then
 | 
	
		
			
			| 6592 | 6592 |        makecert xmpp
 | 
	
		
			
			| 6593 | 6593 |        check_certificates xmpp
 | 
	
		
			
			| 6594 | 6594 |    fi
 | 
	
	
		
			
			|  | @@ -6712,7 +6712,7 @@ function install_irc_server {
 | 
	
		
			
			| 6712 | 6712 |        exit 53
 | 
	
		
			
			| 6713 | 6713 |    fi
 | 
	
		
			
			| 6714 | 6714 |  
 | 
	
		
			
			| 6715 |  | -  if [ ! -f /etc/ssl/private/ngircd.key ]; then
 | 
	
		
			
			|  | 6715 | +  if [ ! -f /etc/ssl/certs/ngircd.dhparam ]; then
 | 
	
		
			
			| 6716 | 6716 |        makecert ngircd
 | 
	
		
			
			| 6717 | 6717 |        check_certificates ngircd
 | 
	
		
			
			| 6718 | 6718 |    fi
 | 
	
	
		
			
			|  | @@ -6801,7 +6801,7 @@ function install_wiki {
 | 
	
		
			
			| 6801 | 6801 |    if [ -d /var/www/$WIKI_DOMAIN_NAME/htdocs ]; then
 | 
	
		
			
			| 6802 | 6802 |        rm -rf /var/www/$WIKI_DOMAIN_NAME/htdocs
 | 
	
		
			
			| 6803 | 6803 |    fi
 | 
	
		
			
			| 6804 |  | -  if [ ! -f /etc/ssl/private/$WIKI_DOMAIN_NAME.key ]; then
 | 
	
		
			
			|  | 6804 | +  if [ ! -f /etc/ssl/certs/$WIKI_DOMAIN_NAME.dhparam ]; then
 | 
	
		
			
			| 6805 | 6805 |        makecert $WIKI_DOMAIN_NAME
 | 
	
		
			
			| 6806 | 6806 |        check_certificates $WIKI_DOMAIN_NAME
 | 
	
		
			
			| 6807 | 6807 |    fi
 | 
	
	
		
			
			|  | @@ -7079,7 +7079,7 @@ function install_blog {
 | 
	
		
			
			| 7079 | 7079 |    git clone https://github.com/danpros/htmly htdocs
 | 
	
		
			
			| 7080 | 7080 |    chown -R www-data:www-data /var/www/$FULLBLOG_DOMAIN_NAME/htdocs
 | 
	
		
			
			| 7081 | 7081 |  
 | 
	
		
			
			| 7082 |  | -  if [ ! -f /etc/ssl/private/$FULLBLOG_DOMAIN_NAME.key ]; then
 | 
	
		
			
			|  | 7082 | +  if [ ! -f /etc/ssl/certs/$FULLBLOG_DOMAIN_NAME.dhparam ]; then
 | 
	
		
			
			| 7083 | 7083 |        makecert $FULLBLOG_DOMAIN_NAME
 | 
	
		
			
			| 7084 | 7084 |        check_certificates $FULLBLOG_DOMAIN_NAME
 | 
	
		
			
			| 7085 | 7085 |    fi
 | 
	
	
		
			
			|  | @@ -7439,7 +7439,7 @@ quit" > $INSTALL_DIR/batch.sql
 | 
	
		
			
			| 7439 | 7439 |  
 | 
	
		
			
			| 7440 | 7440 |    configure_php
 | 
	
		
			
			| 7441 | 7441 |  
 | 
	
		
			
			| 7442 |  | -  if [ ! -f /etc/ssl/private/$MICROBLOG_DOMAIN_NAME.key ]; then
 | 
	
		
			
			|  | 7442 | +  if [ ! -f /etc/ssl/certs/$MICROBLOG_DOMAIN_NAME.dhparam ]; then
 | 
	
		
			
			| 7443 | 7443 |        makecert $MICROBLOG_DOMAIN_NAME
 | 
	
		
			
			| 7444 | 7444 |        check_certificates $MICROBLOG_DOMAIN_NAME
 | 
	
		
			
			| 7445 | 7445 |    fi
 | 
	
	
		
			
			|  | @@ -7711,7 +7711,7 @@ quit" > $INSTALL_DIR/batch.sql
 | 
	
		
			
			| 7711 | 7711 |  
 | 
	
		
			
			| 7712 | 7712 |    configure_php
 | 
	
		
			
			| 7713 | 7713 |  
 | 
	
		
			
			| 7714 |  | -  if [ ! -f /etc/ssl/private/$REDMATRIX_DOMAIN_NAME.key ]; then
 | 
	
		
			
			|  | 7714 | +  if [ ! -f /etc/ssl/certs/$REDMATRIX_DOMAIN_NAME.dhparam ]; then
 | 
	
		
			
			| 7715 | 7715 |        makecert $REDMATRIX_DOMAIN_NAME
 | 
	
		
			
			| 7716 | 7716 |        check_certificates $REDMATRIX_DOMAIN_NAME
 | 
	
		
			
			| 7717 | 7717 |    fi
 | 
	
	
		
			
			|  | @@ -8611,7 +8611,7 @@ function install_voip {
 | 
	
		
			
			| 8611 | 8611 |    fi
 | 
	
		
			
			| 8612 | 8612 |  
 | 
	
		
			
			| 8613 | 8613 |    # Make an ssl cert for the server
 | 
	
		
			
			| 8614 |  | -  if [ ! -f /etc/ssl/certs/mumble.crt ]; then
 | 
	
		
			
			|  | 8614 | +  if [ ! -f /etc/ssl/certs/mumble.dhparam ]; then
 | 
	
		
			
			| 8615 | 8615 |        makecert mumble
 | 
	
		
			
			| 8616 | 8616 |        check_certificates mumble
 | 
	
		
			
			| 8617 | 8617 |    fi
 |