3.0.5 fstab log bind fail on glusterfs
Hi,
While using glusterfs the fstab bind entry for log such as: /var/log/ispconfig/httpd/web1.example.tld /var/www/clients/client1/web1/log none bind,nobootwait 0 0
fail since the underlying /var/www will be mounted later due _netdev option: localhost:/www /var/www glusterfs defaults,_netdev 0 0
ISPConfig fstab bind must safely assume _netdev in all circonstances to ensure late mount of such.
PROPOSED FIX (2x diff -u against 3.0.5.3 branch)
--- nginx_plugin.inc.php 2014-02-17 09:35:14.866369701 +0100
+++ /usr/local/ispconfig/server/plugins-available/nginx_plugin.inc.php 2014-02-17 09:35:19.586369823 +0100
@@ -479,7 +479,7 @@
//* Change the log mount
fstab_line = '/var/log/ispconfig/httpd/'.
data['old']['domain'].' '.data['old']['document_root'].'/'.
log_folder.' none bind';
$app->system->removeLine('/etc/fstab',$fstab_line);
-
$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait 0 0';
-
$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait,_netdev 0 0'; $app->system->replaceLine('/etc/fstab',$fstab_line,$fstab_line,1,1); }
@@ -529,7 +529,7 @@
$app->system->chmod($data['new']['document_root'].'/'.$log_folder,0755);
exec('mount --bind '.escapeshellarg('/var/log/ispconfig/httpd/'.data['new']['domain']).' '.escapeshellarg(
data['new']['document_root'].'/'.$log_folder));
//* add mountpoint to fstab
-
$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait 0 0';
-
$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait,_netdev 0 0'; $app->system->replaceLine('/etc/fstab',$fstab_line,$fstab_line,1,1); }
--- apache2_plugin.inc.php 2014-02-17 09:32:51.994562797 +0100
+++ /usr/local/ispconfig/server/plugins-available/apache2_plugin.inc.php 2014-02-17 09:33:34.686459382 +0100
@@ -475,7 +475,7 @@
//* Change the log mount
fstab_line = '/var/log/ispconfig/httpd/'.
data['old']['domain'].' '.data['old']['document_root'].'/'.
log_folder.' none bind';
$app->system->removeLine('/etc/fstab',$fstab_line);
-
$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait 0 0';
-
$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait,_netdev 0 0'; $app->system->replaceLine('/etc/fstab',$fstab_line,$fstab_line,1,1); }
@@ -525,7 +525,7 @@
$app->system->chmod($data['new']['document_root'].'/'.$log_folder,0755);
exec('mount --bind '.escapeshellarg('/var/log/ispconfig/httpd/'.data['new']['domain']).' '.escapeshellarg(
data['new']['document_root'].'/'.$log_folder));
//* add mountpoint to fstab
-
$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait 0 0';
-
$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait,_netdev 0 0'; $app->system->replaceLine('/etc/fstab',$fstab_line,$fstab_line,1,1); }
Best,