Update installer_base.lib.php to fix lines 2439-2441; remove line with .csr; use $conf['hostname'] if not localhost or empty.

Author: ahrasis

install/lib/installer_base.lib.php

@@ -2403,19 +2403,19 @@ public function make_ispconfig_ssl_cert() {
 		// This hostname can be taken from user entry too
 		// But I don't find a way for it yet so...
 		// I use this for now ;D
-		$hostname = exec('hostname -f');
+		if($conf['hostname'] !== ('localhost' || '') ) $hostname = $conf['hostname'];
+		else $hostname = exec('hostname -f');
+		
 		// Check if LE SSL folder for the hostname existed
 		$le_live_dir = '/etc/letsencrypt/live/' . $hostname; 
-		// Check if this is web server
-		$check_nginx = exec("dpkg-query -W -f='\${Status}' nginx 2>/dev/null | grep -c 'ok installed'");
-		$check_apache = exec("dpkg-query -W -f='\${Status}' apache2 2>/dev/null | grep -c 'ok installed'");
+		
 		// We support certbot so create standalone LE SSL certs for this server
 		if (!@is_dir($le_live_dir)) {
 			// If it is nginx webserver
-			if ($check_nginx == 1)
+			if($conf['nginx']['installed'] == true)
 				exec("certbot certonly --authenticator standalone -d $hostname --pre-hook 'service nginx stop' --post-hook 'service nginx start'");
 			// If it is apache2 webserver
-			elseif ($check_apache2 == 1)
+			elseif($conf['apache']['installed'] == true)
 				exec("certbot certonly --authenticator standalone -d $hostname --pre-hook 'service apache2 stop' --post-hook 'service apache2 start'");
 			// If it is not webserver
 			else
@@ -2428,17 +2428,17 @@ public function make_ispconfig_ssl_cert() {
 			// Define and check ISPConfig SSL folder
 			$install_dir = $conf['ispconfig_install_dir'];
 			if(!@is_dir($install_dir.'/interface/ssl')) mkdir($install_dir.'/interface/ssl', 0755, true);
+			
 			$ssl_crt_file = $install_dir.'/interface/ssl/ispserver.crt';
-			$ssl_csr_file = $install_dir.'/interface/ssl/ispserver.csr';
 			$ssl_key_file = $install_dir.'/interface/ssl/ispserver.key';
 			$ssl_pem_file = $install_dir.'/interface/ssl/ispserver.pem';
 			$ssl_bak_file = $install_dir.'/interface/ssl/ispserver.*.bak';
 
 			// Delete old then backup existing ispserver ssl files
 			if (is_file($ssl_bak_file)) exec("rm $ssl_bak_file");
-			if (is_file($ssl_crt_file)) exec("mv $ispccrt $ssl_crt_file-$(date +'%y%m%d%H%M%S).bak");
-			if (is_file($ssl_key_file)) exec("mv $ispccrt $ssl_key_file-$(date +'%y%m%d%H%M%S).bak");
-			if (is_file($ssl_pem_file)) exec("mv $ispccrt $ssl_pem_file-$(date +'%y%m%d%H%M%S).bak");
+			if (is_file($ssl_crt_file)) exec("mv $ssl_crt_file-\$(date +'%y%m%d%H%M%S).bak");
+			if (is_file($ssl_key_file)) exec("mv $ssl_key_file-\$(date +'%y%m%d%H%M%S).bak");
+			if (is_file($ssl_pem_file)) exec("mv $ssl_pem_file-\$(date +'%y%m%d%H%M%S).bak");
 
 			// Create symlink to LE fullchain and key for ISPConfig
 			exec("ln -sf $le_live_dir/fullchain.pem $ssl_crt_file");