diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index d1a17f642e6e3ac0bc20d64fc2262d77294b49ff..e07205552130d03a460768c33718fbfcb686b21e 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -2792,7 +2792,6 @@ class installer_base { $server_name = exec('hostname -f'); } - $reload_web_server = false; $use_template = 'apache_acme.conf.master'; $use_symlink = '999-acme.conf'; $use_name = 'acme.conf'; @@ -2824,18 +2823,10 @@ class installer_base { if(@is_link($vhost_conf_enabled_dir.'/' . $use_symlink)) { unlink($vhost_conf_enabled_dir.'/' . $use_symlink); - $reload_web_server = true; } if(!@is_link($vhost_conf_enabled_dir.'/' . $use_symlink)) { symlink($vhost_conf_dir.'/' . $use_name, $vhost_conf_enabled_dir.'/' . $use_symlink); } - - if($reload_web_server == true) { - if($conf['apache']['installed'] == true && $conf['apache']['init_script'] != '') system($this->getinitcommand($conf['apache']['init_script'], 'reload')); -//* Reload is enough for nginx - if($conf['nginx']['installed'] == true && $conf['nginx']['php_fpm_init_script'] != '') system($this->getinitcommand($conf['nginx']['php_fpm_init_script'], 'reload')); - } - } public function make_ispconfig_ssl_cert() { @@ -3035,6 +3026,9 @@ class installer_base { # acme.sh does not set umask, resulting in incorrect permissions (ispconfig issue #6015) $old_umask = umask(0022); + // Switch from zerossl to letsencrypt CA + exec("$acme --set-default-ca --server letsencrypt"); + $out = null; $ret = null; if($conf['nginx']['installed'] == true || $conf['apache']['installed'] == true) {