From cfa94c58379905e85f8c0a57ce95534e91a2369f Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Sat, 18 Jun 2011 19:03:20 +0200 Subject: [PATCH] Added new settings for disk quota, refs #814 Signed-off-by: Florian Aders (EleRas) --- install/froxlor.sql | 9 ++++-- .../updates/froxlor/0.9/update_0.9.inc.php | 32 +++++++++++++------ lib/tables.inc.php | 2 +- 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index 8c711708..7a1c9030 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -468,7 +468,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('syste INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'vmail_homedir', '/var/customers/mail/'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindconf_directory', '/etc/bind/'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindreload_command', '/etc/init.d/bind9 reload'); -INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.21'); +INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.22-svn1'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'hostname', 'SERVERNAME'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'maxloginattempts', '3'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'deactivatetime', '900'); @@ -632,6 +632,11 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('syste INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_user', ''); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_pass', ''); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_passive', '1'); +INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'diskquota_enabled', '0'); +INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'diskquota_repquota_path', '/usr/sbin/repquota'); +INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'diskquota_quotatool_path', '/usr/bin/quotatool'); +INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'diskquota_customer_partition', '/dev/root'); + # -------------------------------------------------------- # @@ -1019,7 +1024,7 @@ CREATE TABLE IF NOT EXISTS `aps_temp_settings` ( DROP TABLE IF EXISTS `cronjobs_run`; CREATE TABLE IF NOT EXISTS `cronjobs_run` ( `id` bigint(20) NOT NULL auto_increment, - `module` varchar(250) NOT NULL, + `module` varchar(250) NOT NULL, `cronfile` varchar(250) NOT NULL, `lastrun` int(15) NOT NULL DEFAULT '0', `interval` varchar(100) NOT NULL DEFAULT '5 MINUTE', diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 4d6fcab1..f068bda9 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -1382,7 +1382,7 @@ if(isFroxlorVersion('0.9.16')) } $check = $db->query_first("SELECT `varname` FROM `" . TABLE_PANEL_TEMPLATES . "` WHERE `varname`='trafficninetypercent_mailbody';"); if(isset($check['varname']) && $check['varname'] == 'trafficninetypercent_mailbody') - { + { $db->query("UPDATE `" . TABLE_PANEL_TEMPLATES . "` SET `varname` = 'trafficmaxpercent_mailbody' WHERE `varname`='trafficninetypercent_mailbody';"); } lastStepStatus(0); @@ -1400,7 +1400,7 @@ if(isFroxlorVersion('0.9.17-svn1')) `fid` int(11) NOT NULL, `docrootsettings` text NOT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM;"); +) ENGINE=MyISAM;"); $db->query("CREATE TABLE IF NOT EXISTS `domain_docrootsettings` ( `id` int(5) NOT NULL auto_increment, `fid` int(11) NOT NULL, @@ -1495,11 +1495,11 @@ if(isFroxlorVersion('0.9.19')) { showUpdateStep("Updating from 0.9.19 to 0.9.20-svn1"); lastStepStatus(0); - + showUpdateStep("Adding new setting for domain validation"); $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'validate_domain', '1')"); lastStepStatus(0); - + updateToVersion('0.9.20-svn1'); } @@ -1549,7 +1549,7 @@ if(isFroxlorVersion('0.9.20.1')) lastStepStatus(0); showUpdateStep("Fixing possible broken tables"); - + // The customer-table may miss the columns, if installed a fresh 0.9.20 or 0.9.20.1 - add them $result = $db->query("DESCRIBE `" . TABLE_PANEL_CUSTOMERS . "`"); $columnfound = 0; @@ -1593,7 +1593,7 @@ if(isFroxlorVersion('0.9.20.1-svn1') || isFroxlorVersion('0.9.20.2-svn1')) // add table column for gender $db->query("ALTER TABLE `" . TABLE_PANEL_CUSTOMERS . "` ADD `gender` INT( 1 ) NOT NULL DEFAULT '0' AFTER `firstname`"); - + lastStepStatus(0); @@ -1604,10 +1604,10 @@ if(isFroxlorVersion('0.9.21-svn1')) { showUpdateStep("Updating from 0.9.21-svn1 to 0.9.21-svn2"); lastStepStatus(0); - + /* add new setting: backup FTP mode */ $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'backup_ftp_passive', '1')"); - + lastStepStatus(0); updateToVersion('0.9.21-svn2'); @@ -1617,6 +1617,20 @@ if(isFroxlorVersion('0.9.21-svn2')) { showUpdateStep("Updating from 0.9.21-svn2 to 0.9.21"); lastStepStatus(0); - + updateToVersion('0.9.21'); } + +if(isFroxlorVersion('0.9.21')) +{ + showUpdateStep("Updating from 0.9.21 to 0.9.22-svn1"); + lastStepStatus(0); + + /* add new settings for diskspacequota - support */ + $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'diskquota_enabled', '0');"); + $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'diskquota_repquota_path', '/usr/sbin/repquota');"); + $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'diskquota_quotatool_path', '/usr/bin/quotatool');"); + $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'diskquota_customer_partition', '/dev/root');"); + + updateToVersion('0.9.22-svn1'); +} diff --git a/lib/tables.inc.php b/lib/tables.inc.php index e6c9ae36..44465169 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -73,6 +73,6 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.21'; +$version = '0.9.22-svn1'; $dbversion = '2'; $branding = '';