Browse files

Merged branches/duergner/bind-no-wildcard-domains with slight changes…

…, thanks Michael ;)

git-svn-id: file:///var/svn/trunk/syscp@1334 45fdb5c4-e40b-0410-b369-9aab4fe9a275
  • Loading branch information...
1 parent ca3905d commit e1ff27398a6964b9d4d66ec5b971dfe79c547b60 @flol committed Dec 29, 2007
View
9 admin_configfiles.php
@@ -49,9 +49,6 @@
'daemons' => Array(
'bind' => Array(
'label' => 'Bind9',
- 'files' => Array(
- 'etc_bind_default.zone' => '/etc/bind/default.zone'
- ),
'commands' => Array(
'echo "include \"' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf\";" >> /etc/bind/named.conf',
'touch ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf'
@@ -174,9 +171,6 @@
'daemons' => Array(
'bind' => Array(
'label' => 'Bind9',
- 'files' => Array(
- 'etc_bind_default.zone' => '/etc/bind/default.zone'
- ),
'commands' => Array(
'echo "include \"' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf\";" >> /etc/bind/named.conf',
'touch ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf'
@@ -296,9 +290,6 @@
'daemons' => Array(
'bind' => Array(
'label' => 'Bind',
- 'files' => Array(
- 'etc_bind_default.zone' => '/etc/named.d/default.zone'
- ),
'commands' => Array(
'echo "include \"' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf\";" >> /etc/named.conf',
'touch ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf'
View
12 admin_settings.php
@@ -281,10 +281,16 @@
$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='" . $db->escape($value) . "' WHERE `settinggroup`='system' AND `varname`='bindreload_command'");
}
- if($_POST['system_binddefaultzone'] != $settings['system']['binddefaultzone'])
+ if($_POST['system_nameservers'] != $settings['system']['nameservers'])
{
- $value = validate($_POST['system_binddefaultzone'], 'bind default zone', '/^[a-z0-9\-\._]+$/i');
- $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='" . $db->escape($value) . "' WHERE `settinggroup`='system' AND `varname`='binddefaultzone'");
+ $value = validate($_POST['system_nameservers'], 'nameservers', '/^(([a-z0-9\-\._]+, ?)*[a-z0-9\-\._]+)?$/i');
+ $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='" . $db->escape($value) . "' WHERE `settinggroup`='system' AND `varname`='nameservers'");
+ }
+
+ if($_POST['system_mxservers'] != $settings['system']['mxservers'])
+ {
+ $value = validate($_POST['system_mxservers'], 'mxservers', '/^(([0-9]+ [a-z0-9\-\._]+, ?)*[0-9]+ [a-z0-9\-\._]+)?$/i');
+ $db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value`='" . $db->escape($value) . "' WHERE `settinggroup`='system' AND `varname`='mxservers'");
}
if($_POST['system_vmail_uid'] != $settings['system']['vmail_uid'])
View
5 customer_domains.php
@@ -177,6 +177,7 @@
$result = $db->query("DELETE FROM `" . TABLE_PANEL_DOMAINS . "` WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
$result = $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `subdomains_used`=`subdomains_used`-1 WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
inserttask('1');
+ inserttask('4');
redirectTo($filename, Array(
'page' => $page,
's' => $s
@@ -293,6 +294,7 @@
$result = $db->query("INSERT INTO `" . TABLE_PANEL_DOMAINS . "` (`customerid`, `domain`, `documentroot`, `ipandport`, `aliasdomain`, `parentdomainid`, `isemaildomain`, `openbasedir`, `openbasedir_path`, `safemode`, `speciallogfile`, `specialsettings`) VALUES ('" . (int)$userinfo['customerid'] . "', '" . $db->escape($completedomain) . "', '" . $db->escape($path) . "', '" . $db->escape($domain_check['ipandport']) . "', " . (($aliasdomain != 0) ? "'" . $db->escape($aliasdomain) . "'" : "NULL") . ", '" . (int)$domain_check['id'] . "', '" . ($domain_check['subcanemaildomain'] == '3' ? '1' : '0') . "', '" . $db->escape($domain_check['openbasedir']) . "', '" . $db->escape($openbasedir_path) . "', '" . $db->escape($domain_check['safemode']) . "', '" . $db->escape($domain_check['speciallogfile']) . "', '" . $db->escape($domain_check['specialsettings']) . "')");
$result = $db->query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `subdomains_used`=`subdomains_used`+1 WHERE `customerid`='" . (int)$userinfo['customerid'] . "'");
inserttask('1');
+ inserttask('4');
redirectTo($filename, Array(
'page' => $page,
's' => $s
@@ -430,7 +432,8 @@
|| $aliasdomain != $result['aliasdomain']
|| $openbasedir_path != $result['openbasedir_path'])
{
- inserttask('1');
+ inserttask('1');
+ inserttask('4');
$result = $db->query("UPDATE `" . TABLE_PANEL_DOMAINS . "` SET `documentroot`='" . $db->escape($path) . "', `isemaildomain`='" . (int)$isemaildomain . "', `iswildcarddomain`='" . (int)$iswildcarddomain . "', `aliasdomain`=" . (($aliasdomain != 0 && $alias_check == 0) ? '\'' . $db->escape($aliasdomain) . '\'' : 'NULL') . ",`openbasedir_path`='" . $db->escape($openbasedir_path) . "' WHERE `customerid`='" . (int)$userinfo['customerid'] . "' AND `id`='" . (int)$id . "'");
}
View
4 install/syscp.sql
@@ -261,6 +261,7 @@ CREATE TABLE `panel_domains` (
`speciallogfile` tinyint(1) NOT NULL default '0',
`specialsettings` text NOT NULL,
`deactivated` tinyint(1) NOT NULL default '0',
+ `bindserial` varchar(10) NOT NULL default '2000010100',
PRIMARY KEY (`id`),
KEY `customerid` (`customerid`),
KEY `parentdomain` (`parentdomainid`),
@@ -405,7 +406,6 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/kunden/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 (21, 'system', 'binddefaultzone', 'default.zone');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '1.2.16');
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');
@@ -426,6 +426,8 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (39, 'system', 'mailpwcleartext', '0');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (40, 'system', 'last_tasks_run', '000000');
INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (41, 'customer', 'ftpatdomain', '0');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (42, 'system', 'nameservers', '');
+INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (43, 'system', 'mxservers', '');
# --------------------------------------------------------
View
12 install/updatesql_1.2.inc.php
@@ -1102,5 +1102,17 @@
$db->query($query);
$settings['panel']['version'] = '1.2.16-svn10';
}
+if($setting['panel']['version'] == '1.2.16-svn10')
+{
+ $db->query('ALTER TABLE `' . TABLE_PANEL_DOMAINS . '` ADD `bindserial` VARCHAR( 10 ) NOT NULL DEFAULT \'2000010100\'');
+ $db->query('INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (42, \'system\', \'nameservers\', \'\')');
+ $db->query('INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (43, \'system\', \'mxservers\', \'\')');
+ $db->query('DELETE FROM `panel_settings` WHERE `settinggroup`=\'system\' AND `varname`=\'binddefaultzone\'');
+
+ $query = 'UPDATE `%s` ' . 'SET `value` = \'1.2.16-svn11\' ' . 'WHERE `settinggroup` = \'panel\' ' . 'AND `varname` = \'version\'';
+ $query = sprintf($query, TABLE_PANEL_SETTINGS);
+ $db->query($query);
+ $settings['panel']['version'] = '1.2.16-svn11';
+}
?>
View
2 lib/tables.inc.php
@@ -35,6 +35,6 @@
define('TABLE_PANEL_LANGUAGE', 'panel_languages');
define('TABLE_PANEL_CRONSCRIPT', 'panel_cronscript');
define('TABLE_PANEL_IPSANDPORTS', 'panel_ipsandports');
-$version = '1.2.16-svn10';
+$version = '1.2.16-svn11';
?>
View
4 lng/english.lng.php
@@ -371,6 +371,10 @@
$lng['serversettings']['deactivatetime']['description'] = 'Time (sec.) an account gets deactivated after too many login tries.';
$lng['serversettings']['pathedit']['title'] = 'Type of path input';
$lng['serversettings']['pathedit']['description'] = 'Should a path be selected by a dropdown menu or by an input field?';
+$lng['serversettings']['nameservers']['title'] = 'Nameservers';
+$lng['serversettings']['nameservers']['description'] = 'A comma separated list containing the hostnames of all nameservers. The first one will be the primary one.';
+$lng['serversettings']['mxservers']['title'] = 'MX servers';
+$lng['serversettings']['mxservers']['description'] = 'A comma seperated list containing a pair of a number and a hostname separated by whitespace (e.g. \'10 mx.example.com\') containing the mx servers.';
/**
* CHANGED BETWEEN 1.2.12 and 1.2.13
View
4 lng/german.lng.php
@@ -371,6 +371,10 @@
$lng['serversettings']['deactivatetime']['description'] = 'Zeitraum (in sek.) für den der Account deaktiviert ist.';
$lng['serversettings']['pathedit']['title'] = 'Pfad-Eingabemethode';
$lng['serversettings']['pathedit']['description'] = 'Soll ein Pfad via Dropdown-Menü ausgewählt oder manuell eingegeben werden können.';
+$lng['serversettings']['nameservers']['title'] = 'Nameserver';
+$lng['serversettings']['nameservers']['description'] = 'Eine durch Komma getrennte Liste mit den Hostnamen aller Nameserver. Der erste ist der primäre.';
+$lng['serversettings']['mxservers']['title'] = 'MX Server';
+$lng['serversettings']['mxservers']['description'] = 'Eine durch Komma getrenne Liste die ein Paar mit einer Nummer und den Hostnamen einen MX Servers, getrennt durch ein Leerzeichen, enthaelt (z.B. \'10 mx.example.com\').';
/**
* CHANGED BETWEEN 1.2.12 and 1.2.13
View
190 scripts/cron_tasks.php
@@ -489,10 +489,11 @@
fclose($diroptions_file_handler);
safe_exec($settings['system']['apachereload_command']);
- if(file_exists($settings['system']['apacheconf_directory'] . 'htpasswd/')
- && is_dir($settings['system']['apacheconf_directory'] . 'htpasswd/'))
+ $htpasswd_dir = makeCorrectDir($settings['system']['apacheconf_directory'] . 'htpasswd/');
+ if(file_exists($htpasswd_dir)
+ && is_dir($htpasswd_dir))
{
- $htpasswd_file_dirhandle = opendir($settings['system']['apacheconf_directory'] . 'htpasswd/');
+ $htpasswd_file_dirhandle = opendir($htpasswd_dir);
while(false !== ($htpasswd_filename = readdir($htpasswd_file_dirhandle)))
{
@@ -513,33 +514,176 @@
elseif ($row['type'] == '4')
{
fwrite($debugHandler, ' cron_tasks: Task4 started - Rebuilding syscp_bind.conf' . "\n");
+
+ if(!file_exists($settings['system']['bindconf_directory'] . 'domains/'))
+ {
+ safe_exec('mkdir '.escapeshellarg(makeCorrectDir($settings['system']['bindconf_directory'] . '/domains/')));
+ }
+
$bindconf_file = '# ' . $settings['system']['bindconf_directory'] . 'syscp_bind.conf' . "\n" . '# Created ' . date('d.m.Y H:i') . "\n" . '# Do NOT manually edit this file, all changes will be deleted after the next domain change at the panel.' . "\n" . "\n";
- $result_domains = $db->query("SELECT `d`.`id`, `d`.`domain`, `d`.`customerid`, `d`.`zonefile`, `c`.`loginname`, `c`.`guid` FROM `" . TABLE_PANEL_DOMAINS . "` `d` LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` `c` USING(`customerid`) WHERE `d`.`isbinddomain` = '1' ORDER BY `d`.`domain` ASC");
+
+ $nameservers = (($settings['system']['nameservers'] != '') ? split(',',$settings['system']['nameservers']) : array());
+ for($i=0; $i<count($nameservers); $i++)
+ {
+ if(!preg_match('/\.$/',$nameservers[$i]))
+ {
+ $nameservers[$i] .= '.';
+ }
+ $array = array('hostname' => trim($nameservers[$i]), 'ip' => gethostbyname(trim($nameservers[$i])));
+ $nameservers[$i] = $array;
+ }
+
+ $mxservers = (($settings['system']['mxservers'] != '') ? split(',',$settings['system']['mxservers']) : array());
+ for($i=0; $i<count($mxservers); $i++)
+ {
+ if(!preg_match('/\.$/',$mxservers[$i]))
+ {
+ $mxservers[$i] .= '.';
+ }
+ }
+
+ $known_domain_zonefiles = array();
+ $result_domains = $db->query("SELECT `d`.`id`, `d`.`domain`, `d`.`iswildcarddomain`, `d`.`customerid`, `d`.`zonefile`, `d`.`bindserial`, `ip`.`ip`, `c`.`loginname`, `c`.`guid` FROM `" . TABLE_PANEL_DOMAINS . "` `d` LEFT JOIN `" . TABLE_PANEL_CUSTOMERS . "` `c` USING(`customerid`) LEFT JOIN `" . TABLE_PANEL_IPSANDPORTS . "` AS `ip` ON(`d`.`ipandport`=`ip`.`id`) WHERE `d`.`isbinddomain` = '1' ORDER BY `d`.`domain` ASC");
+ while($domain = $db->fetch_array($result_domains))
+ {
+ fwrite($debugHandler, ' cron_tasks: Task4 - Writing ' . $domain['id'] . '::' . $domain['domain'] . "\n");
+
+ if($domain['zonefile'] == '')
+ {
+ $date = date('Ymd');
+ $bindserial = (preg_match('/^' . $date . '/',$domain['bindserial']) ? $domain['bindserial'] + 1 : $date . '00' );
+ $db->query('UPDATE `' . TABLE_PANEL_DOMAINS . '` SET `bindserial`=\'' . $bindserial . '\' WHERE `id`=\'' . $domain['id'] . '\'');
+
+ $zonefile = '$TTL 1W' . "\n";
+ if(count($nameservers) == 0)
+ {
+ $zonefile .= '@ IN SOA ns ' . str_replace('@','.',$settings['panel']['adminmail']) . ' (' . "\n";
+ }
+ else
+ {
+ $zonefile .= '@ IN SOA ' . $nameservers[0]['hostname'] . ' ' . str_replace('@','.',$settings['panel']['adminmail']) . ' (' . "\n";
+ }
+ $zonefile .= ' ' . $bindserial . ' ; serial' . "\n" .
+ ' 8H ; refresh' . "\n" .
+ ' 2H ; retry' . "\n" .
+ ' 1W ; expiry' . "\n" .
+ ' 11h) ; minimum' . "\n" .
+ '';
+ if(count($nameservers) == 0)
+ {
+ $zonefile .= ' IN NS ns' . "\n" .
+ 'ns IN A ' . $domain['ip'] . "\n";
+ }
+ else
+ {
+ foreach($nameservers as $nameserver)
+ {
+ $zonefile .= ' IN NS ' . $nameserver['hostname'] . "\n";
+ }
+ }
+ if(count($mxservers) == 0)
+ {
+ $zonefile .= ' IN MX 10 mail' . "\n" .
+ 'mail IN A ' . $domain['ip'] . "\n";
+ }
+ else
+ {
+ foreach($mxservers as $mxserver)
+ {
+ $zonefile .= ' IN MX ' . $mxserver . "\n";
+ }
+ }
+
+ $nssubdomains = $db->query('SELECT `domain` FROM `' . TABLE_PANEL_DOMAINS . '` WHERE `isbinddomain`=\'1\' AND `domain` LIKE \'%.' . $domain['domain'] . '\'');
+ while($nssubdomain = $db->fetch_array($nssubdomains))
+ {
+ if(preg_match('/^[^\.]+\.' . $domain['domain'] . '/',$nssubdomain['domain']))
+ {
+ $nssubdomain = str_replace('.' . $domain['domain'],'',$nssubdomain['domain']);
+
+ if(count($nameservers) == 0)
+ {
+ $zonefile .= $nssubdomain . ' IN NS ns.' . $nssubdomain . "\n";
+// 'ns IN A ' . $domain['ip'] . "\n";
+ }
+ else
+ {
+ foreach($nameservers as $nameserver)
+ {
+ $zonefile .= $nssubdomain . ' IN NS ' . $nameserver['hostname'] . "\n";
+ }
+ }
+ }
+ }
+
+ $zonefile .= ' IN A ' . $domain['ip'] . "\n" .
+ 'www IN A ' . $domain['ip'] . "\n";
+ if($domain['iswildcarddomain'] == '1')
+ {
+ $zonefile .= '* IN A ' . $domain['ip'] . "\n";
+ }
+
+ $subdomains = $db->query('SELECT `d`.`domain`, `ip`.`ip` AS `ip` FROM `' . TABLE_PANEL_DOMAINS . '` `d`, `' . TABLE_PANEL_IPSANDPORTS . '` `ip` WHERE `parentdomainid`=\'' . $domain['id'] . '\' AND `d`.`ipandport`=`ip`.`id`');
+
+ while($subdomain = $db->fetch_array($subdomains))
+ {
+ $zonefile .= str_replace('.' . $domain['domain'],'',$subdomain['domain']) . ' IN A ' . $subdomain['ip'] . "\n";
+ }
+
+ $domain['zonefile'] = 'domains/' . $domain['domain'] . '.zone';
+ $zonefile_name = makeCorrectFile($settings['system']['bindconf_directory'] . '/domains/' . $domain['domain'] . '.zone');
+ $known_domain_zonefiles[] = basename( $zonefile_name );
+
+ $zonefile_handler = fopen($zonefile_name,'w');
+ fwrite($zonefile_handler,$zonefile);
+ fclose($zonefile_handler);
+ fwrite($debugHandler, ' cron_tasks: Task4 - `' . $zonefile_name . '` zone written' . "\n");
+ }
- while($domain = $db->fetch_array($result_domains))
+ $bindconf_file.= '# Domain ID: ' . $domain['id'] . ' - CustomerID: ' . $domain['customerid'] . ' - CustomerLogin: ' . $domain['loginname'] . "\n";
+ $bindconf_file.= 'zone "' . $domain['domain'] . '" in {' . "\n";
+ $bindconf_file.= ' type master;' . "\n";
+ $bindconf_file.= ' file "' . $settings['system']['bindconf_directory'] . $domain['zonefile'] . '";' . "\n";
+ $bindconf_file.= ' allow-query { any; };' . "\n";
+ if(count($nameservers)>1)
+ {
+ $bindconf_file .= ' allow-transfer {' . "\n";
+ for($i=1;$i<count($nameservers); $i++)
+ {
+ $bindconf_file .= ' ' . $nameservers[$i]['ip'] . ';' . "\n";
+ }
+ $bindconf_file .= ' }' . "\n";
+ }
+ $bindconf_file.= '};' . "\n";
+ $bindconf_file.= "\n";
+
+ $bindconf_file_handler = fopen(makeCorrectFile($settings['system']['bindconf_directory'] . '/syscp_bind.conf'), 'w');
+ fwrite($bindconf_file_handler, $bindconf_file);
+ fclose($bindconf_file_handler);
+ fwrite($debugHandler, ' cron_tasks: Task4 - syscp_bind.conf written' . "\n");
+ }
+
+ safe_exec($settings['system']['bindreload_command']);
+ fwrite($debugHandler, ' cron_tasks: Task4 - Bind9 reloaded' . "\n");
+
+ $domains_dir = makeCorrectDir($settings['system']['bindconf_directory'] . '/domains/');
+ if(file_exists($domains_dir)
+ && is_dir($domains_dir))
{
- fwrite($debugHandler, ' cron_tasks: Task4 - Writing ' . $domain['id'] . '::' . $domain['domain'] . "\n");
+ $domain_file_dirhandle = opendir($domains_dir);
- if($domain['zonefile'] == '')
+ while(false !== ($domain_filename = readdir($domain_file_dirhandle)))
{
- $domain['zonefile'] = $settings['system']['binddefaultzone'];
+ if($domain_filename != '.'
+ && $domain_filename != '..'
+ && !in_array($domain_filename, $known_domain_zonefiles)
+ && file_exists($domains_dir . $domain_filename))
+ {
+ fwrite($debugHandler, ' cron_tasks: Task4 - unlinking ' . $domain_filename . "\n");
+ unlink($domains_dir . $domain_filename);
+ }
}
-
- $bindconf_file.= '# Domain ID: ' . $domain['id'] . ' - CustomerID: ' . $domain['customerid'] . ' - CustomerLogin: ' . $domain['loginname'] . "\n";
- $bindconf_file.= 'zone "' . $domain['domain'] . '" in {' . "\n";
- $bindconf_file.= ' type master;' . "\n";
- $bindconf_file.= ' file "' . $settings['system']['bindconf_directory'] . $domain['zonefile'] . '";' . "\n";
- $bindconf_file.= ' allow-query { any; };' . "\n";
- $bindconf_file.= '};' . "\n";
- $bindconf_file.= "\n";
}
-
- $bindconf_file_handler = fopen($settings['system']['bindconf_directory'] . 'syscp_bind.conf', 'w');
- fwrite($bindconf_file_handler, $bindconf_file);
- fclose($bindconf_file_handler);
- fwrite($debugHandler, ' cron_tasks: Task4 - syscp_bind.conf written' . "\n");
- safe_exec($settings['system']['bindreload_command']);
- fwrite($debugHandler, ' cron_tasks: Task4 - Bind9 reloaded' . "\n");
}
/**
View
8 templates/admin/settings/settings.tpl
@@ -178,8 +178,12 @@ $header
<td class="main_field_display" nowrap="nowrap"><input type="text" name="system_bindreload_command" value="{$settings['system']['bindreload_command']}" /></td>
</tr>
<tr>
- <td class="main_field_name"><b>{$lng['serversettings']['binddefaultzone']['title']}:</b><br />{$lng['serversettings']['binddefaultzone']['description']}</td>
- <td class="main_field_display" nowrap="nowrap"><input type="text" name="system_binddefaultzone" value="{$settings['system']['binddefaultzone']}" /></td>
+ <td class="main_field_name"><b>{$lng['serversettings']['nameservers']['title']}:</b><br />{$lng['serversettings']['nameservers']['description']}</td>
+ <td class="main_field_display" nowrap="nowrap"><input type="text" name="system_nameservers" value="{$settings['system']['nameservers']}" /></td>
+ </tr>
+ <tr>
+ <td class="main_field_name"><b>{$lng['serversettings']['mxservers']['title']}:</b><br />{$lng['serversettings']['mxservers']['description']}</td>
+ <td class="main_field_display" nowrap="nowrap"><input type="text" name="system_mxservers" value="{$settings['system']['mxservers']}" /></td>
</tr>
</table>
</form>
View
21 templates/misc/configfiles/debian_etch/bind/etc_bind_default.zone
@@ -1,21 +0,0 @@
-$TTL 1W
-@ IN SOA ns root (
- 2004060501 ; serial
- 8H ; refresh
- 2H ; retry
- 1W ; expiry
- 11h) ; minimum
-
- IN NS ns
- IN MX 10 mail
-
- IN A <SERVERIP>
- IN MX 10 mail
-
-* IN A <SERVERIP>
- IN MX 10 mail
-
-ns IN A <SERVERIP>
-
-mail IN A <SERVERIP>
- IN MX 10 mail
View
21 templates/misc/configfiles/debian_sarge/bind/etc_bind_default.zone
@@ -1,21 +0,0 @@
-$TTL 1W
-@ IN SOA ns root (
- 2004060501 ; serial
- 8H ; refresh
- 2H ; retry
- 1W ; expiry
- 11h) ; minimum
-
- IN NS ns
- IN MX 10 mail
-
- IN A <SERVERIP>
- IN MX 10 mail
-
-* IN A <SERVERIP>
- IN MX 10 mail
-
-ns IN A <SERVERIP>
-
-mail IN A <SERVERIP>
- IN MX 10 mail
View
21 templates/misc/configfiles/suse_linux_10_0/bind/etc_bind_default.zone
@@ -1,21 +0,0 @@
-$TTL 1W
-@ IN SOA ns root (
- 2004060501 ; serial
- 8H ; refresh
- 2H ; retry
- 1W ; expiry
- 11h) ; minimum
-
- IN NS ns
- IN MX 10 mail
-
- IN A <SERVERIP>
- IN MX 10 mail
-
-* IN A <SERVERIP>
- IN MX 10 mail
-
-ns IN A <SERVERIP>
-
-mail IN A <SERVERIP>
- IN MX 10 mail

0 comments on commit e1ff273

Please sign in to comment.