Update installer_base.lib.php

Till Brehm · Till Brehm · commit d78fc43c31c7 · 2021-08-19T10:17:20.000Z
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
@@ -2792,6 +2792,7 @@ public function make_acme_vhost($server = 'apache') {
 			$server_name = exec('hostname -f');
 		}
 
+		$reload_web_server = false;
 		$use_template = 'apache_acme.conf.master';
 		$use_symlink = '999-acme.conf';
 		$use_name = 'acme.conf';
@@ -2823,10 +2824,18 @@ public function make_acme_vhost($server = 'apache') {
 
 		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() {

Original file line number	Diff line number	Diff line change
`@@ -2792,6 +2792,7 @@ public function make_acme_vhost($server = 'apache') {`
`2792`	`2792`	`$server_name = exec('hostname -f');`
`2793`	`2793`	`}`
`2794`	`2794`
	`2795`	`+ $reload_web_server = false;`
`2795`	`2796`	`$use_template = 'apache_acme.conf.master';`
`2796`	`2797`	`$use_symlink = '999-acme.conf';`
`2797`	`2798`	`$use_name = 'acme.conf';`
`@@ -2823,10 +2824,18 @@ public function make_acme_vhost($server = 'apache') {`
`2823`	`2824`
`2824`	`2825`	`if(@is_link($vhost_conf_enabled_dir.'/' . $use_symlink)) {`
`2825`	`2826`	`unlink($vhost_conf_enabled_dir.'/' . $use_symlink);`
	`2827`	`+ $reload_web_server = true;`
`2826`	`2828`	`}`
`2827`	`2829`	`if(!@is_link($vhost_conf_enabled_dir.'/' . $use_symlink)) {`
`2828`	`2830`	`symlink($vhost_conf_dir.'/' . $use_name, $vhost_conf_enabled_dir.'/' . $use_symlink);`
`2829`	`2831`	`}`
	`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`	`+`
`2830`	`2839`	`}`
`2831`	`2840`
`2832`	`2841`	`public function make_ispconfig_ssl_cert() {`