Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISPConfig
ISPConfig 3
Commits
cdf8f7ca
Commit
cdf8f7ca
authored
Aug 19, 2021
by
Till Brehm
Browse files
Update installer_base.lib.php
parent
74d74200
Pipeline
#9281
passed with stage
in 10 minutes and 12 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
install/lib/installer_base.lib.php
View file @
cdf8f7ca
...
...
@@ -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
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment