From 96219f406db5bbc7541c0be5c790aa409d30e154 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 20 Apr 2010 06:22:11 +0000 Subject: [PATCH] added configuration for bind's TTL value, fixes #166 --- actions/admin/settings/160.nameserver.php | 10 ++++++++++ install/froxlor.sql | 3 ++- install/updates/froxlor/0.9/update_0.9.inc.php | 11 +++++++++++ lib/tables.inc.php | 2 +- lng/english.lng.php | 2 ++ lng/german.lng.php | 2 ++ scripts/jobs/cron_tasks.inc.dns.10.bind.php | 2 +- 7 files changed, 29 insertions(+), 3 deletions(-) diff --git a/actions/admin/settings/160.nameserver.php b/actions/admin/settings/160.nameserver.php index fcfeeb06..e15986ca 100644 --- a/actions/admin/settings/160.nameserver.php +++ b/actions/admin/settings/160.nameserver.php @@ -59,6 +59,16 @@ return array( 'default' => '', 'save_method' => 'storeSettingField', ), + 'system_defaultttl' => array( + 'label' => $lng['serversettings']['defaultttl'], + 'settinggroup' => 'system', + 'varname' => 'defaultttl', + 'type' => 'int', + 'default' => 604800, /* 1 week */ + 'int_min' => 86400, /* 1 day */ + 'int_max' => 2147483647, /* integer max */ + 'save_method' => 'storeSettingField', + ), ), ), ), diff --git a/install/froxlor.sql b/install/froxlor.sql index 77d05635..2258a54e 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -451,7 +451,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 (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 (22, 'panel', 'version', '0.9.5'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.6-svn1'); 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 (25, 'login', 'deactivatetime', '900'); @@ -559,6 +559,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (128, 'system', 'stdsubdomain', ''); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (129, 'system', 'awstats_path', '/usr/bin/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (130, 'system', 'awstats_conf', '/etc/awstats/'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (131, 'system', 'defaultttl', '604800'); # -------------------------------------------------------- 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 6715f65d..d3e6a052 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -472,4 +472,15 @@ if(isFroxlorVersion('0.9.4-svn2')) lastStepStatus(0); updateToVersion('0.9.5'); } + +if(isFroxlorVersion('0.9.5')) +{ + showUpdateStep("Updating from 0.9.5 to 0.9.6-svn1", true); + + showUpdateStep("Adding time-to-live configuration setting"); + $db->query("INSERT INTO `" . TABLE_PANEL_SETTINGS . "` (`settinggroup`, `varname`, `value`) VALUES ('system', 'defaultttl', '604800');"); + lastStepStatus(0); + + updateToVersion('0.9.6-svn1'); +} ?> diff --git a/lib/tables.inc.php b/lib/tables.inc.php index 78176f88..668e147f 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -68,7 +68,7 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.5'; +$version = '0.9.6-svn1'; $dbversion = '2'; $branding = ''; diff --git a/lng/english.lng.php b/lng/english.lng.php index baf0eb43..aeb91c20 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1362,4 +1362,6 @@ $lng['admin']['configfiles']['compactoverview'] = 'Compact-overview'; $lng['admin']['lastlogin_succ'] = 'Last login'; $lng['panel']['neverloggedin'] = 'No login yet'; +$lng['serversettings']['defaultttl'] = 'Domain TTL for bind (default \'604800\' = 1 week)'; + ?> diff --git a/lng/german.lng.php b/lng/german.lng.php index 35f4eb7b..aa024f12 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1358,4 +1358,6 @@ $lng['success']['settingssaved'] = 'Die Einstellungen wurden erfolgreich gespeic $lng['admin']['lastlogin_succ'] = 'Letzte Anmeldung'; $lng['panel']['neverloggedin'] = 'Keine Anmeldung bisher'; +$lng['serversettings']['defaultttl'] = 'Domain TTL für Bind (default \'604800\' = 1 Woche)'; + ?> diff --git a/scripts/jobs/cron_tasks.inc.dns.10.bind.php b/scripts/jobs/cron_tasks.inc.dns.10.bind.php index d001605b..641254ca 100644 --- a/scripts/jobs/cron_tasks.inc.dns.10.bind.php +++ b/scripts/jobs/cron_tasks.inc.dns.10.bind.php @@ -183,7 +183,7 @@ class bind $date = date('Ymd'); $bindserial = (preg_match('/^' . $date . '/', $domain['bindserial']) ? $domain['bindserial'] + 1 : $date . '00'); $this->db->query('UPDATE `' . TABLE_PANEL_DOMAINS . '` SET `bindserial`=\'' . $bindserial . '\' WHERE `id`=\'' . $domain['id'] . '\''); - $zonefile = '$TTL 1W' . "\n"; + $zonefile = '$TTL ' . (int)$this->settings['system']['defaultttl'] . "\n"; if(count($this->nameservers) == 0) {