maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix command for creating deactivated-root-dir, thx to oschni

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2014-08-05 18:12:35 +02:00
parent 80a2b5da34
commit ce88d1caae
6 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/configfiles/freebsd.inc.php
View File

@@ -39,8 +39,6 @@ return array(
'http' => array( 'http' => array(
'label' => $lng['admin']['configfiles']['http'], 'label' => $lng['admin']['configfiles']['http'],
'daemons' => array( 'daemons' => array(
// Begin: Nginx Config
'nginx' => array( 'nginx' => array(
'label' => 'Nginx Webserver', 'label' => 'Nginx Webserver',
'commands_1' => array( 'commands_1' => array(
@@ -58,7 +56,7 @@ return array(
'commands_2' => array( 'commands_2' => array(
$configcommand['vhost'], $configcommand['vhost'],
$configcommand['diroptions'], $configcommand['diroptions'],
(Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p '. Settings::Get('system.deactivateddocroot') : null, (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '',
'mkdir -p '. Settings::Get('system.documentroot_prefix'), 'mkdir -p '. Settings::Get('system.documentroot_prefix'),
'mkdir -p '. Settings::Get('system.mod_fcgid_tmpdir'), 'mkdir -p '. Settings::Get('system.mod_fcgid_tmpdir'),
'mkdir -p '. Settings::Get('system.logfiles_directory'), 'mkdir -p '. Settings::Get('system.logfiles_directory'),
@@ -71,8 +69,6 @@ return array(
'/usr/local/etc/rc.d/nginx restart' '/usr/local/etc/rc.d/nginx restart'
) )
), ),
// End: Nginx Config
'apache2' => array( 'apache2' => array(
'label' => 'Apache2 Webserver', 'label' => 'Apache2 Webserver',
'commands' => array( 'commands' => array(

2
lib/configfiles/gentoo.inc.php
View File

@@ -101,7 +101,7 @@ return array(
'commands_2' => array( 'commands_2' => array(
'mkdir -p ' . Settings::Get('system.documentroot_prefix'), 'mkdir -p ' . Settings::Get('system.documentroot_prefix'),
'mkdir -p ' . Settings::Get('system.logfiles_directory'), 'mkdir -p ' . Settings::Get('system.logfiles_directory'),
'mkdir -p ' . Settings::Get('system.deactivateddocroot'), (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '',
'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'),
'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'), 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'),
'chmod u+x /etc/init.d/php-fcgi', 'chmod u+x /etc/init.d/php-fcgi',

2
lib/configfiles/lucid.inc.php
View File

@@ -99,7 +99,7 @@ return array(
'rm /etc/nginx/sites-enabled/default', 'rm /etc/nginx/sites-enabled/default',
'mkdir -p ' . Settings::Get('system.documentroot_prefix'), 'mkdir -p ' . Settings::Get('system.documentroot_prefix'),
'mkdir -p ' . Settings::Get('system.logfiles_directory'), 'mkdir -p ' . Settings::Get('system.logfiles_directory'),
'mkdir -p ' . Settings::Get('system.deactivateddocroot'), (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '',
'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'),
'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'), 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'),
'chmod u+x /etc/init.d/php-fcgi' 'chmod u+x /etc/init.d/php-fcgi'

2
lib/configfiles/precise.inc.php
View File

@@ -99,7 +99,7 @@ return array(
'rm /etc/nginx/sites-enabled/default', 'rm /etc/nginx/sites-enabled/default',
'mkdir -p ' . Settings::Get('system.documentroot_prefix'), 'mkdir -p ' . Settings::Get('system.documentroot_prefix'),
'mkdir -p ' . Settings::Get('system.logfiles_directory'), 'mkdir -p ' . Settings::Get('system.logfiles_directory'),
'mkdir -p ' . Settings::Get('system.deactivateddocroot'), (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '',
'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'),
'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'), 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'),
'chmod u+x /etc/init.d/php-fcgi' 'chmod u+x /etc/init.d/php-fcgi'

2
lib/configfiles/squeeze.inc.php
View File

@@ -99,7 +99,7 @@ return array(
'rm /etc/nginx/sites-enabled/default', 'rm /etc/nginx/sites-enabled/default',
'mkdir -p ' . Settings::Get('system.documentroot_prefix'), 'mkdir -p ' . Settings::Get('system.documentroot_prefix'),
'mkdir -p ' . Settings::Get('system.logfiles_directory'), 'mkdir -p ' . Settings::Get('system.logfiles_directory'),
//'mkdir -p ' . Settings::Get('system.deactivateddocroot'), (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '',
'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'),
'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'), 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'),
'chmod u+x /etc/init.d/php-fcgi' 'chmod u+x /etc/init.d/php-fcgi'

2
lib/configfiles/wheezy.inc.php
View File

@@ -97,7 +97,7 @@ return array(
'rm /etc/nginx/sites-enabled/default', 'rm /etc/nginx/sites-enabled/default',
'mkdir -p ' . Settings::Get('system.documentroot_prefix'), 'mkdir -p ' . Settings::Get('system.documentroot_prefix'),
'mkdir -p ' . Settings::Get('system.logfiles_directory'), 'mkdir -p ' . Settings::Get('system.logfiles_directory'),
//'mkdir -p ' . Settings::Get('system.deactivateddocroot'), (Settings::Get('system.deactivateddocroot') != '') ? 'mkdir -p ' . Settings::Get('system.deactivateddocroot') : '',
'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'), 'mkdir -p ' . Settings::Get('system.mod_fcgid_tmpdir'),
'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'), 'chmod 1777 ' . Settings::Get('system.mod_fcgid_tmpdir'),
'chmod u+x /etc/init.d/php-fcgi' 'chmod u+x /etc/init.d/php-fcgi'