Commit ff7a93d5 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch...

Merge branch '6216-installation-fails-to-generate-le-certificate-running-forced-update-nightly-succeeds' into 'develop'

Resolve "Installation fails to generate LE certificate - running forced update nightly succeeds."

Closes #6216

See merge request ispconfig/ispconfig3!1509
parents 74d74200 cdf8f7ca
Pipeline #9283 passed with stage
in 15 seconds
......@@ -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) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment