Commit 48d4a49f authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'jnorell-develop-patch-59936' into 'develop'

Avoid symlink() error if acme conf already exists as a file.

See merge request !1587
parents 5f6949cd e240dde9
Pipeline #11406 passed with stage
in 11 seconds
......@@ -2876,7 +2876,7 @@ class installer_base {
if(@is_link($vhost_conf_enabled_dir.'/' . $use_symlink)) {
unlink($vhost_conf_enabled_dir.'/' . $use_symlink);
}
if(!@is_link($vhost_conf_enabled_dir.'/' . $use_symlink)) {
if(!@is_file($vhost_conf_enabled_dir.'/' . $use_symlink)) {
symlink($vhost_conf_dir.'/' . $use_name, $vhost_conf_enabled_dir.'/' . $use_symlink);
}
}
......
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