Merge branch 'master' into 'master'
FS#4031 - Disabling server option "Network Filesystem" does not work
See merge request !242
| | |
| | | |
| | | //* Unmount the old log directory bfore we move the log dir |
| | | //exec('fuser -km '.escapeshellcmd($old_dir.'/log')); |
| | | exec('umount '.escapeshellcmd($old_dir.'/log')); |
| | | exec('umount '.escapeshellcmd($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); |
| | |
| | | $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,_netdev 0 0'; |
| | | $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait'; |
| | | $fstab_line .= @($web_config['network_filesystem'] == 'y')?',_netdev 0 0':' 0 0'; |
| | | $app->system->replaceLine('/etc/fstab', $fstab_line, $fstab_line, 1, 1); |
| | | } |
| | | |
| | |
| | | |
| | | $this->update_config(); |
| | | |
| | | exec("nohup /usr/lib/mailman/bin/newlist -u ".escapeshellcmd($data["new"]["domain"])." -e ".escapeshellcmd($data["new"]["domain"])." ".escapeshellcmd($data["new"]["listname"])." ".escapeshellcmd($data["new"]["email"])." ".escapeshellcmd($data["new"]["password"])." >/dev/null 2>&1 &"); |
| | | $pid = exec("nohup /usr/lib/mailman/bin/newlist -u ".escapeshellcmd($data["new"]["domain"])." -e ".escapeshellcmd($data["new"]["domain"])." ".escapeshellcmd($data["new"]["listname"])." ".escapeshellcmd($data["new"]["email"])." ".escapeshellcmd($data["new"]["password"])." >/dev/null 2>&1 & echo $!;"); |
| | | // wait for /usr/lib/mailman/bin/newlist-call |
| | | $running = true; |
| | | do { |
| | | exec('ps -p '.intval($pid), $out); |
| | | if (count($out) ==1) $running=false; else sleep(1); |
| | | unset($out); |
| | | } while ($running); |
| | | unset($out); |
| | | if(is_file('/var/lib/mailman/data/virtual-mailman')) exec('postmap /var/lib/mailman/data/virtual-mailman'); |
| | | if(is_file('/var/lib/mailman/data/transport-mailman')) exec('postmap /var/lib/mailman/data/transport-mailman'); |
| | | exec('nohup '.$conf['init_scripts'] . '/' . 'mailman reload >/dev/null 2>&1 &'); |
| | |
| | | |
| | | //* Unmount the old log directory bfore we move the log dir |
| | | //exec('fuser -km '.escapeshellcmd($old_dir.'/log')); |
| | | exec('umount '.escapeshellcmd($old_dir.'/log')); |
| | | exec('umount '.escapeshellcmd($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); |
| | |
| | | $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,_netdev 0 0'; |
| | | $fstab_line = '/var/log/ispconfig/httpd/'.$data['new']['domain'].' '.$data['new']['document_root'].'/'.$log_folder.' none bind,nobootwait'; |
| | | $fstab_line .= @($web_config['network_filesystem'] == 'y')?',_netdev 0 0':' 0 0'; |
| | | $app->system->replaceLine('/etc/fstab', $fstab_line, $fstab_line, 1, 1); |
| | | } |
| | | |