From 863defd334d356fc697c542fb2a739c1403c2bc6 Mon Sep 17 00:00:00 2001
From: thom <thom@amsterdamtech.nl>
Date: Mon, 14 Sep 2020 01:38:10 +0200
Subject: [PATCH] Backport from !561
---
server/plugins-available/apache2_plugin.inc.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index e300117767..f6a0a1ce7b 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -714,7 +714,7 @@ class apache2_plugin {
}
//* Unmount the old log directory bfore we move the log dir
- $app->system->exec_safe('umount ?', $data['old']['document_root'].'/log');
+ $app->system->exec_safe('umount -l ?', $data['old']['document_root'].'/log');
//* Create new base directory, if it does not exist yet
if(!is_dir($new_dir)) $app->system->mkdirpath($new_dir);
@@ -808,7 +808,7 @@ class apache2_plugin {
$app->system->removeLine('/etc/fstab', $fstab_line);
//* Unmount log directory
- $app->system->exec_safe('umount ?', $data['old']['document_root'].'/'.$old_log_folder);
+ $app->system->exec_safe('umount -l ?', $data['old']['document_root'].'/'.$old_log_folder);
}
//* Create the log dir if nescessary and mount it
@@ -2138,10 +2138,10 @@ class apache2_plugin {
if($data['old']['type'] == 'vhost' || $data['old']['type'] == 'vhostsubdomain' || $data['old']['type'] == 'vhostalias'){
if(is_array($log_folders) && !empty($log_folders)){
foreach($log_folders as $log_folder){
- $app->system->exec_safe('umount ? 2>/dev/null', $data['old']['document_root'].'/'.$log_folder);
+ $app->system->exec_safe('umount -l ? 2>/dev/null', $data['old']['document_root'].'/'.$log_folder);
}
} else {
- $app->system->exec_safe('umount ? 2>/dev/null', $data['old']['document_root'].'/'.$log_folder);
+ $app->system->exec_safe('umount -l ? 2>/dev/null', $data['old']['document_root'].'/'.$log_folder);
}
// remove letsencrypt if it exists (renew will always fail otherwise)
--
GitLab