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

- set version to 0.9.15 for upcoming release

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-11-29 08:56:27 +00:00
parent cd79670438
commit 0c25611d26
5 changed files with 1099 additions and 1102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@ return array(
'settinggroup' => 'system', 'settinggroup' => 'system',
'varname' => 'webserver', 'varname' => 'webserver',
'type' => 'option', 'type' => 'option',
'default' => 'Apache2', 'default' => 'apache2',
'option_mode' => 'one', 'option_mode' => 'one',
'option_options' => array('apache2' => 'Apache 2', 'lighttpd' => 'ligHTTPd', 'nginx' => 'Nginx'), 'option_options' => array('apache2' => 'Apache 2', 'lighttpd' => 'ligHTTPd', 'nginx' => 'Nginx'),
'save_method' => 'storeSettingField', 'save_method' => 'storeSettingField',

2
install/froxlor.sql
View File

@@ -462,7 +462,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.15-svn1'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.15');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, 'login', 'deactivatetime', '900');

8
install/updates/froxlor/0.9/update_0.9.inc.php
View File

@@ -1261,3 +1261,11 @@ if(isFroxlorVersion('0.9.14'))
updateToVersion('0.9.15-svn1'); updateToVersion('0.9.15-svn1');
} }
if(isFroxlorVersion('0.9.15-svn1'))
{
showUpdateStep("Updating from 0.9.15-svn1 to 0.9.15 final");
lastStepStatus(0);
updateToVersion('0.9.15');
}

2
lib/tables.inc.php
View File

@@ -71,7 +71,7 @@ define('PACKAGE_ENABLED', 2);
// VERSION INFO // VERSION INFO
$version = '0.9.15-svn1'; $version = '0.9.15';
$dbversion = '2'; $dbversion = '2';
$branding = ''; $branding = '';

11
scripts/jobs/cron_tasks.php
View File

@@ -118,17 +118,6 @@ while($row = $db->fetch_array($result_tasks))
$configdir.='/*'; $configdir.='/*';
safe_exec('rm -rf '. makeCorrectFile($configdir)); safe_exec('rm -rf '. makeCorrectFile($configdir));
} }
elseif($settings['system']['webserver'] == "nginx")
{
if($settings['system']['mod_fcgid'] == 1)
{
$webserver = new nginx_fcgid($db, $cronlog, $debugHandler, $idna_convert, $settings);
}
else
{
$webserver = new nginx($db, $cronlog, $debugHandler, $idna_convert, $settings);
}
}
} }
if(!isset($webserver)) if(!isset($webserver))