From 391e05cbee6ff84bce60b665be60b4e5f049ee7f Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Tue, 22 Oct 2013 12:48:51 -0400
Subject: [PATCH] - Display hostname next to IP (where available) in the jQuery IP suggestion box.
---
server/plugins-available/bind_plugin.inc.php | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php
index bb98f36..fd7f516 100644
--- a/server/plugins-available/bind_plugin.inc.php
+++ b/server/plugins-available/bind_plugin.inc.php
@@ -39,7 +39,7 @@
function onInstall() {
global $conf;
- if(isset($conf['bind']['installed']) && $conf['bind']['installed'] == true) {
+ if(isset($conf['bind']['installed']) && $conf['bind']['installed'] == true && @is_link('/usr/local/ispconfig/server/mods-enabled/dns_module.inc.php')) {
return true;
} else {
return false;
@@ -103,6 +103,11 @@
$tpl->setVar($zone);
$records = $app->db->queryAllRecords("SELECT * FROM dns_rr WHERE zone = ".$zone['id']." AND active = 'Y'");
+ if(is_array($records) && !empty($records)){
+ for($i=0;$i<sizeof($records);$i++){
+ if($records[$i]['ttl'] == 0) $records[$i]['ttl'] = '';
+ }
+ }
$tpl->setLoop('zones',$records);
//TODO : change this when distribution information has been integrated into server record
@@ -113,10 +118,19 @@
$filename = escapeshellcmd($dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'],0,-1)));
}
- $app->log("Writing BIND domain file: ".$filename,LOGLEVEL_DEBUG);
file_put_contents($filename,$tpl->grab());
chown($filename, escapeshellcmd($dns_config['bind_user']));
chgrp($filename, escapeshellcmd($dns_config['bind_group']));
+
+ //* Check the zonefile
+ if(is_file($filename.'.err')) unlink($filename.'.err');
+ exec('named-checkzone '.escapeshellarg($zone['origin']).' '.escapeshellarg($filename),$out,$return_status);
+ if($return_status === 0) {
+ $app->log("Writing BIND domain file: ".$filename,LOGLEVEL_DEBUG);
+ } else {
+ $app->log("Writing BIND domain file failed: ".$filename." ".implode(' ',$out),LOGLEVEL_WARN);
+ rename($filename,$filename.'.err');
+ }
unset($tpl);
unset($records);
unset($records_out);
@@ -132,13 +146,14 @@
if($data['old']['origin'] != $data['new']['origin']) {
//TODO : change this when distribution information has been integrated into server record
if (file_exists('/etc/gentoo-release')) {
- $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'],0,-1));
+ $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($data['old']['origin'],0,-1));
}
else {
- $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($zone['origin'],0,-1));
+ $filename = $dns_config['bind_zonefiles_dir'].'/pri.'.str_replace("/", "_", substr($data['old']['origin'],0,-1));
}
- if(is_file($filename)) unset($filename);
+ if(is_file($filename)) unlink($filename);
+ if(is_file($filename.'.err')) unlink($filename.'.err');
}
//* Reload bind nameserver
@@ -166,6 +181,7 @@
}
if(is_file($zone_file_name)) unlink($zone_file_name);
+ if(is_file($zone_file_name.'.err')) unlink($zone_file_name.'.err');
$app->log("Deleting BIND domain file: ".$zone_file_name,LOGLEVEL_DEBUG);
//* Reload bind nameserver
@@ -294,16 +310,18 @@
global $app, $conf;
//* Only write the master file for the current server
- $tmps = $app->db->queryAllRecords("SELECT origin, xfer, also_notify FROM dns_soa WHERE active = 'Y' AND server_id=".$conf["server_id"]);
+ $tmps = $app->db->queryAllRecords("SELECT origin, xfer, also_notify, update_acl FROM dns_soa WHERE active = 'Y' AND server_id=".$conf["server_id"]);
$zones = array();
//* Check if the current zone that triggered this function has at least one NS record
+ /* Has been replaced by a better zone check
$rec_num = $app->db->queryOneRecord("SELECT count(id) as ns FROM dns_rr WHERE type = 'NS' AND zone = ".intval($data['new']['id'])." AND active = 'Y'");
if($rec_num['ns'] == 0) {
$exclude_zone = $data['new']['origin'];
} else {
$exclude_zone = '';
}
+ */
//TODO : change this when distribution information has been integrated into server record
if (file_exists('/etc/gentoo-release')) {
@@ -319,6 +337,8 @@
//* Loop trough zones
foreach($tmps as $tmp) {
+ $zone_file = $pri_zonefiles_path.str_replace("/", "_",substr($tmp['origin'],0,-1));
+
$options = '';
if(trim($tmp['xfer']) != '') {
$options .= " allow-transfer {".str_replace(',',';',$tmp['xfer']).";};\n";
@@ -326,10 +346,11 @@
$options .= " allow-transfer {none;};\n";
}
if(trim($tmp['also_notify']) != '') $options .= ' also-notify {'.str_replace(',',';',$tmp['also_notify']).";};\n";
+ if(trim($tmp['update_acl']) != '') $options .= " allow-update {".str_replace(',',';',$tmp['update_acl']).";};\n";
- if($tmp['origin'] != $exclude_zone) {
+ if(file_exists($zone_file)) {
$zones[] = array( 'zone' => substr($tmp['origin'],0,-1),
- 'zonefile_path' => $pri_zonefiles_path.str_replace("/", "_",substr($tmp['origin'],0,-1)),
+ 'zonefile_path' => $zone_file,
'options' => $options
);
}
--
Gitblit v1.9.1