@@ -2792,7 +2792,6 @@ public function make_acme_vhost($server = 'apache') {
27922792 $ server_name = exec ('hostname -f ' );
27932793 }
27942794
2795- $ reload_web_server = false ;
27962795 $ use_template = 'apache_acme.conf.master ' ;
27972796 $ use_symlink = '999-acme.conf ' ;
27982797 $ use_name = 'acme.conf ' ;
@@ -2824,18 +2823,10 @@ public function make_acme_vhost($server = 'apache') {
28242823
28252824 if (@is_link ($ vhost_conf_enabled_dir .'/ ' . $ use_symlink )) {
28262825 unlink ($ vhost_conf_enabled_dir .'/ ' . $ use_symlink );
2827- $ reload_web_server = true ;
28282826 }
28292827 if (!@is_link ($ vhost_conf_enabled_dir .'/ ' . $ use_symlink )) {
28302828 symlink ($ vhost_conf_dir .'/ ' . $ use_name , $ vhost_conf_enabled_dir .'/ ' . $ use_symlink );
28312829 }
2832-
2833- if ($ reload_web_server == true ) {
2834- if ($ conf ['apache ' ]['installed ' ] == true && $ conf ['apache ' ]['init_script ' ] != '' ) system ($ this ->getinitcommand ($ conf ['apache ' ]['init_script ' ], 'reload ' ));
2835- //* Reload is enough for nginx
2836- if ($ conf ['nginx ' ]['installed ' ] == true && $ conf ['nginx ' ]['php_fpm_init_script ' ] != '' ) system ($ this ->getinitcommand ($ conf ['nginx ' ]['php_fpm_init_script ' ], 'reload ' ));
2837- }
2838-
28392830 }
28402831
28412832 public function make_ispconfig_ssl_cert () {
@@ -3035,6 +3026,9 @@ public function make_ispconfig_ssl_cert() {
30353026 # acme.sh does not set umask, resulting in incorrect permissions (ispconfig issue #6015)
30363027 $ old_umask = umask (0022 );
30373028
3029+ // Switch from zerossl to letsencrypt CA
3030+ exec ("$ acme --set-default-ca --server letsencrypt " );
3031+
30383032 $ out = null ;
30393033 $ ret = null ;
30403034 if ($ conf ['nginx ' ]['installed ' ] == true || $ conf ['apache ' ]['installed ' ] == true ) {
0 commit comments