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

- include nginx_phpfpm cron in cron_tasks.php

Browse Source 
- show parts of fcgid also when lighttpd is used
This commit is contained in:
Michael Kaufmann (d00p)
2010-12-03 08:58:44 +00:00
parent 759213f8b9
commit dae3e416a2
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
actions/admin/settings/135.fcgid.php
View File

@@ -19,7 +19,7 @@ return array(
'groups' => array( 'groups' => array(
'fcgid' => array( 'fcgid' => array(
'title' => $lng['admin']['fcgid_settings'], 'title' => $lng['admin']['fcgid_settings'],
'websrv_avail' => array('apache2'), 'websrv_avail' => array('apache2', 'lighttpd'),
'fields' => array( 'fields' => array(
'system_mod_fcgid_enabled' => array( 'system_mod_fcgid_enabled' => array(
'label' => $lng['serversettings']['mod_fcgid'], 'label' => $lng['serversettings']['mod_fcgid'],
@@ -68,6 +68,7 @@ return array(
'option_options' => array(0 => 'ScriptAlias', 1=> 'FCGIWrapper'), 'option_options' => array(0 => 'ScriptAlias', 1=> 'FCGIWrapper'),
'default' => 1, 'default' => 1,
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',
'websrv_avail' => array('apache2')
), ),
'system_mod_fcgid_starter' => array( 'system_mod_fcgid_starter' => array(
'label' => $lng['serversettings']['mod_fcgid']['starter'], 'label' => $lng['serversettings']['mod_fcgid']['starter'],
@@ -102,6 +103,7 @@ return array(
'type' => 'bool', 'type' => 'bool',
'default' => false, 'default' => false,
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',
'websrv_avail' => array('apache2')
), ),
'system_mod_fcgid_httpuser' => array( 'system_mod_fcgid_httpuser' => array(
'label' => $lng['admin']['mod_fcgid_user'], 'label' => $lng['admin']['mod_fcgid_user'],
@@ -110,6 +112,7 @@ return array(
'type' => 'string', 'type' => 'string',
'default' => 'froxlorlocal', 'default' => 'froxlorlocal',
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',
'websrv_avail' => array('apache2')
), ),
'system_mod_fcgid_httpgroup' => array( 'system_mod_fcgid_httpgroup' => array(
'label' => $lng['admin']['mod_fcgid_group'], 'label' => $lng['admin']['mod_fcgid_group'],
@@ -118,6 +121,7 @@ return array(
'type' => 'string', 'type' => 'string',
'default' => 'froxlorlocal', 'default' => 'froxlorlocal',
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',
'websrv_avail' => array('apache2')
), ),
'system_mod_fcgid_defaultini_ownvhost' => array( 'system_mod_fcgid_defaultini_ownvhost' => array(
'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'], 'label' => $lng['serversettings']['mod_fcgid']['defaultini_ownvhost'],
@@ -128,6 +132,7 @@ return array(
'option_mode' => 'one', 'option_mode' => 'one',
'option_options_method' => 'getPhpConfigs', 'option_options_method' => 'getPhpConfigs',
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',
'websrv_avail' => array('apache2')
), ),
) )
) )

1
scripts/jobs/cron_tasks.php
View File

@@ -26,6 +26,7 @@ require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.http.15.apache
require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.http.20.lighttpd.php')); require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.http.20.lighttpd.php'));
require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.http.25.lighttpd_fcgid.php')); require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.http.25.lighttpd_fcgid.php'));
require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.http.30.nginx.php')); require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.http.30.nginx.php'));
require_once(makeCorrectFile(dirname(__FILE__) . '/cron_tasks.inc.http.35.nginx_phpfpm.php'));
/** /**
* LOOK INTO TASKS TABLE TO SEE IF THERE ARE ANY UNDONE JOBS * LOOK INTO TASKS TABLE TO SEE IF THERE ARE ANY UNDONE JOBS