/etc/fstab mount option change when site is moved to another client

short description

When I add a new web site, into /etc/fstab is used the deprecated "nobootwait" option If I move the site to another client, the option used is "nofail".

correct behaviour

Alway use the "nofail" option.

environment

Server OS: (centos)
Server OS version: (7) ISPConfig version: (3.1.13)

If it might be related to the problem
0ce3c7b9

apachectl -v

Server version: Apache/2.4.6 (CentOS)
Server built:   Jun 27 2018 13:48:59

php -v

PHP 5.4.16 (cli) (built: Apr 12 2018 19:02:01) 
Copyright (c) 1997-2013 The PHP Group
Zend Engine v2.4.0, Copyright (c) 1998-2013 Zend Technologies
    with XCache v3.1.1, Copyright (c) 2005-2014, by mOo
    with XCache Optimizer v3.1.1, Copyright (c) 2005-2014, by mOo
    with XCache Cacher v3.1.1, Copyright (c) 2005-2014, by mOo
    with XCache Coverager v3.1.1, Copyright (c) 2005-2014, by mOo

proposed fix

--- /usr/local/ispconfig/server/plugins-available/apache2_plugin.inc.php.orig	2018-09-19 18:04:54.902795736 +0200
+++ /usr/local/ispconfig/server/plugins-available/apache2_plugin.inc.php	2018-09-19 18:05:35.955310849 +0200
@@ -769,7 +769,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';
+			$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nofail';
 			$fstab_line .= @($web_config['network_filesystem'] == 'y')?',_netdev    0 0':'    0 0';
 			$app->system->replaceLine('/etc/fstab', $fstab_line, $fstab_line, 1, 1);
 		}
--- /usr/local/ispconfig/server/plugins-available/nginx_plugin.inc.php.orig	2018-09-19 12:18:45.905628864 +0200
+++ /usr/local/ispconfig/server/plugins-available/nginx_plugin.inc.php	2018-09-19 18:08:34.859481863 +0200
@@ -613,7 +613,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';
+			$fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.'    none    bind,nofail';
 			$fstab_line .= @($web_config['network_filesystem'] == 'y')?',_netdev    0 0':'    0 0';
 			$app->system->replaceLine('/etc/fstab', $fstab_line, $fstab_line, 1, 1);
 		}

references

screenshots

log entries

apache / nginx error.log lines (if related)