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

- recorded merge of revisions 737-1483 via svnmerge from http://Dessa@svn.froxlor.org/branches/philderbeast

Browse Source 
- fixes #103
This commit is contained in:
Robert Foerster (Dessa)
2010-11-26 12:30:54 +00:00
parent 01404187cc
commit 6066601568
24 changed files with 2593 additions and 1301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
actions/admin/settings/120.system.php
View File

@@ -28,7 +28,6 @@ return array(
'varname' => 'documentroot_prefix',
'type' => 'string',
'default' => '/var/customers/webs/',
'plausibility_check_method' => 'checkPathConflicts',
'save_method' => 'storeSettingField',
),
'system_ipaddress' => array(
@@ -59,22 +58,6 @@ return array(
'default' => '',
'save_method' => 'storeSettingHostname',
),
'system_froxlordirectlyviahostname' => array(
'label' => $lng['serversettings']['froxlordirectlyviahostname'],
'settinggroup' => 'system',
'varname' => 'froxlordirectlyviahostname',
'type' => 'bool',
'default' => false,
'save_method' => 'storeSettingField',
),
'system_stdsubdomain' => array(
'label' => $lng['serversettings']['stdsubdomainhost'],
'settinggroup' => 'system',
'varname' => 'stdsubdomain',
'type' => 'string',
'default' => '',
'save_method' => 'storeSettingHostname',
),
'system_mysql_access_host' => array(
'label' => $lng['serversettings']['mysql_access_host'],
'settinggroup' => 'system',
@@ -84,6 +67,15 @@ return array(
'plausibility_check_method' => 'checkMysqlAccessHost',
'save_method' => 'storeSettingMysqlAccessHost',
),
'system_realtime_port' => array(
'label' => $lng['serversettings']['system_realtime_port'],
'settinggroup' => 'system',
'varname' => 'realtime_port',
'type' => (function_exists('socket_create') ? 'int' : 'hidden'),
'int_max' => 65535,
'default' => 0,
'save_method' => 'storeSettingField',
),
'system_index_file_extension' => array(
'label' => $lng['serversettings']['index_file_extension'],
'settinggroup' => 'system',
@@ -101,6 +93,18 @@ return array(
'default' => true,
'save_method' => 'storeSettingField',
),
'system_httpuser' => array(
'settinggroup' => 'system',
'varname' => 'httpuser',
'type' => 'hidden',
'default' => 'www-data',
),
'system_httpgroup' => array(
'settinggroup' => 'system',
'varname' => 'httpgroup',
'type' => 'hidden',
'default' => 'www-data',
),
'system_debug_cron' => array(
'label' => $lng['serversettings']['cron']['debug'],
'settinggroup' => 'system',

4
actions/admin/settings/130.webserver.php
View File

@@ -29,7 +29,7 @@ return array(
'type' => 'option',
'default' => 'Apache2',
'option_mode' => 'one',
'option_options' => array('apache2' => 'Apache 2', 'lighttpd' => 'ligHTTPd'),
'option_options' => array('apache2' => 'Apache 2', 'lighttpd' => 'ligHTTPd', 'nginx' => 'Nginx'),
'save_method' => 'storeSettingField',
'overview_option' => true
),
@@ -253,4 +253,4 @@ return array(
),
);
?>
?>

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

@@ -84,6 +84,14 @@ return array(
'default' => 250,
'save_method' => 'storeSettingField',
),
'system_mod_fcgid_startport' => array(
'label' => $lng['serversettings']['mod_fcgid_startport'],
'settinggroup' => 'system',
'varname' => 'mod_fcgid_startport',
'type' => 'int',
'default' => 8888,
'save_method' => 'storeSettingField',
),
'system_mod_fcgid_defaultini' => array(
'label' => $lng['serversettings']['mod_fcgid']['defaultini'],
'settinggroup' => 'system',

8
actions/admin/settings/137.perl.php
View File

@@ -44,6 +44,14 @@ return array(
'default' => '/var/www/cgi-bin/',
'save_method' => 'storeSettingField',
),
'perl_server' => array(
'label' => $lng['serversettings']['perl_server'],
'settinggroup' => 'system',
'varname' => 'perl_server',
'type' => 'string',
'default' => 'unix:/var/run/nginx/cgiwrap-dispatch.sock',
'save_method' => 'storeSettingField',
),
),
),
),