PowerDNS plugin update + new config paramater for user defined powerdns database
Hi, I want to help with maintaining of the PowerDNS plugin. This patch brings the cleanup code, the possibility of setting additional attributes in the SOA record, and to specify a name of the database other than 'powerdns'. In the next step I'd like to publish patches to install and update scripts.
/usr/local/ispconfig/server/lib/config.inc.php
--- config.inc.php.orig 2011-02-02 06:19:34.000000000 +0100 +++ config.inc.php 2011-02-02 07:14:06.000000000 +0100 @@ -83,6 +83,14 @@ $conf['dbmaster_password'] = '92ac6a472c8185239d10de52fa93c7ee';
+//** Database settings for the PowerDNS DB. This setting is only used in multiserver setups +$conf['dbpowerdns_type'] = 'mysql'; +$conf['dbpowerdns_host'] = 'localhost'; +$conf['dbpowerdns_database'] = 'powerdns'; +$conf['dbpowerdns_user'] = 'ispconfig'; +$conf['dbpowerdns_password'] = '6d812b7162be9925995dd9f53a8210db'; + + //** Paths $conf['ispconfig_log_dir'] = '/var/log/ispconfig'; define('ISPC_ROOT_PATH', realpath(dirname(FILE).'/../')); // Main ROOT is the parent directory to this file, ie interface/ or server/. NO trailing slashes.
/usr/local/ispconfig/server/plugins-available/powerdns_plugin.inc.php
--- powerdns_plugin.inc.php.3.0.3.orig 2010-10-31 09:14:21.000000000 +0100 +++ powerdns_plugin.inc.php 2011-02-02 07:10:32.000000000 +0100 @@ -92,7 +92,6 @@ } else { return false; }
}
@@ -121,21 +120,21 @@ $app->plugins->registerEvent('dns_rr_insert',$this->plugin_name,'rr_insert'); $app->plugins->registerEvent('dns_rr_update',$this->plugin_name,'rr_update'); $app->plugins->registerEvent('dns_rr_delete',$this->plugin_name,'rr_delete');
}
function soa_insert($event_name,$data) {
global $app, $conf;
-
if($data["new"]["active"] != 'Y') return;
-
$origin = substr($data["new"]["origin"], 0, -1); $ispconfig_id = $data["new"]["id"];
-
$serial = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ".$ispconfig_id);
-
$serial_id = $serial["serial"];
-
$app->db->query("INSERT INTO powerdns.domains (name, type, notified_serial, ispconfig_id) VALUES ('$origin', 'MASTER', $serial_id, $ispconfig_id)");
-
$origin = substr($data["new"]["origin"], 0, -1);
-
$app->db->query("INSERT INTO ".$conf["dbpowerdns_database"].".domains (name, type, ispconfig_id) VALUES ('$origin', 'MASTER', $ispconfig_id)"); $zone_id = mysql_insert_id();
-
if(substr($data["new"]["ns"], -1) == '.'){ $ns = substr($data["new"]["ns"], 0, -1); } else {
@@ -144,30 +143,35 @@ if($ns == '') $ns = $origin;
$hostmaster = substr($data["new"]["mbox"], 0, -1);
-
$content = $ns.' '.$hostmaster.' 0';
-
// http://doc.powerdns.com/types.html
-
$serial = $data["new"]["serial"];
-
$refresh = $data["new"]["refresh"];
-
$retry = $data["new"]["retry"];
-
$expire = $data["new"]["expire"];
-
$default_ttl = $data["new"]["minimum"]; // FIX ME
-
$content = $ns.' '.$hostmaster.' '.$serial.' '.$refresh.' '.$retry.' '.$expire.' '.$default_ttl;
-
$ttl = $data["new"]["ttl"];
-
$app->db->query("INSERT INTO powerdns.records (domain_id, name, type, content, ttl, prio, change_date, ispconfig_id) VALUES ($zone_id, '$origin', 'SOA', '$content', $ttl, 0, ".time().", $ispconfig_id)");
-
//* Reload powerdns nameserver
-
$app->services->restartServiceDelayed('powerdns','reload');
-
$app->db->query("INSERT INTO ".$conf["dbpowerdns_database"].".records (domain_id, name, type, content, ttl, prio, change_date, ispconfig_id) VALUES ($zone_id, '$origin', 'SOA', '$content', $ttl, 0, ".time().", $ispconfig_id)");
-
//* Reload powerdns nameserver
-
$app->services->restartServiceDelayed('powerdns','reload'); } function soa_update($event_name,$data) { global $app, $conf;
-
if($data["new"]["active"] != 'Y'){ if($data["old"]["active"] != 'Y') return; $this->soa_delete($event_name,$data); } else { if($data["old"]["active"] == 'Y'){
-
$origin = substr($data["new"]["origin"], 0, -1); $ispconfig_id = $data["new"]["id"];
-
$serial = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ".$ispconfig_id);
-
$serial_id = $serial["serial"];
-
//$app->db->query("UPDATE powerdns.domains SET name = '$origin', notified_serial = $serial_id WHERE ispconfig_id = $ispconfig_idi AND type = 'MASTER'");
-
//$app->db->query("UPDATE powerdns.domains SET name = '$origin' WHERE ispconfig_id = $ispconfig_id AND type = 'MASTER'");
-
$origin = substr($data["new"]["origin"], 0, -1); if(substr($data["new"]["ns"], -1) == '.'){ $ns = substr($data["new"]["ns"], 0, -1);
@@ -177,18 +181,29 @@ if($ns == '') $ns = $origin;
$hostmaster = substr($data["new"]["mbox"], 0, -1);
-
//$content = $ns.' '.$hostmaster.' 0';
-
$content = $ns.' '.$hostmaster.' '.$serial_id.'';
-
// http://doc.powerdns.com/types.html
-
$serial = $data["new"]["serial"];
-
$refresh = $data["new"]["refresh"];
-
$retry = $data["new"]["retry"];
-
$expire = $data["new"]["expire"];
-
$default_ttl = $data["new"]["minimum"]; // FIX ME
-
$content = $ns.' '.$hostmaster.' '.$serial.' '.$refresh.' '.$retry.' '.$expire.' '.$default_ttl;
-
$ttl = $data["new"]["ttl"];
-
$app->db->query("UPDATE powerdns.records SET name = '$origin', content = '$content', ttl = $ttl, change_date = ".time()." WHERE ispconfig_id = ".$data["new"]["id"]." AND type = 'SOA'");
-
//* Reload powerdns nameserver
-
$app->services->restartServiceDelayed('powerdns','reload');
-
$app->db->query("UPDATE ".$conf["dbpowerdns_database"].".records SET name = '$origin', content = '$content', ttl = $ttl, change_date = ".time()." WHERE ispconfig_id = $ispconfig_id AND type = 'SOA'");
-
// FIX NEEDED - UPDATE powerdns.domains
-
//* Reload powerdns nameserver
-
$app->services->restartServiceDelayed('powerdns','reload'); } else { $this->soa_insert($event_name,$data);
-
$ispconfig_id = $data["new"]["id"];
-
if($records = $app->db->queryAllRecords("SELECT * FROM dns_rr WHERE zone = $ispconfig_id AND active = 'Y'")){ foreach($records as $record){ foreach($record as $key => $val){
@@ -197,100 +212,98 @@ $this->rr_insert("dns_rr_insert", $data); } }
}
-
}
-
} } function soa_delete($event_name,$data) { global $app, $conf;
-
$zone = $app->db->queryOneRecord("SELECT * FROM powerdns.domains WHERE ispconfig_id = ".$data["old"]["id"]." AND type = 'MASTER'");
-
$zone = $app->db->queryOneRecord("SELECT * FROM ".$conf["dbpowerdns_database"].".domains WHERE ispconfig_id = ".$data["old"]["id"]." AND type = 'MASTER'"); $zone_id = $zone["id"];
-
$app->db->query("DELETE FROM powerdns.records WHERE domain_id = $zone_id");
-
$app->db->query("DELETE FROM powerdns.domains WHERE id = $zone_id");
-
//* Reload powerdns nameserver
-
$app->services->restartServiceDelayed('powerdns','reload');
-
$app->db->query("DELETE FROM ".$conf["dbpowerdns_database"].".records WHERE domain_id = $zone_id");
-
$app->db->query("DELETE FROM ".$conf["dbpowerdns_database"].".domains WHERE id = $zone_id");
-
//* Reload powerdns nameserver
-
$app->services->restartServiceDelayed('powerdns','reload'); } function slave_insert($event_name,$data) { global $app, $conf;
-
if($data["new"]["active"] != 'Y') return;
-
$origin = substr($data["new"]["origin"], 0, -1);
-
$ispconfig_id = $data["new"]["id"];
-
$origin = substr($data["new"]["origin"], 0, -1);
-
$master_ns = $data["new"]["ns"];
-
$app->db->query("INSERT INTO powerdns.domains (name, type, master, ispconfig_id) VALUES ('$origin', 'SLAVE', '$master_ns', $ispconfig_id)");
-
//$app->db->query("INSERT INTO powerdns.domains (name, type, ispconfig_id) VALUES ('$origin', 'NATIVE', $ispconfig_id)");
-
$app->db->query("INSERT INTO ".$conf["dbpowerdns_database"].".domains (name, type, master, ispconfig_id) VALUES ('$origin', 'SLAVE', '$master_ns', $ispconfig_id)"); $zone_id = mysql_insert_id();
-
//* Reload powerdns nameserver
-
$app->services->restartServiceDelayed('powerdns','reload');
-
//* Reload powerdns nameserver
-
$app->services->restartServiceDelayed('powerdns','reload'); }
-
function slave_update($event_name,$data) { global $app, $conf;
-
if($data["new"]["active"] != 'Y'){ if($data["old"]["active"] != 'Y') return; $this->slave_delete($event_name,$data); } else { if($data["old"]["active"] == 'Y'){
-
$ispconfig_id = $data["new"]["id"];
-
$origin = substr($data["new"]["origin"], 0, -1);
-
$master_ns = $data["new"]["ns"];
-
$origin = substr($data["new"]["origin"], 0, -1);
-
$ispconfig_id = $data["new"]["id"];
-
$master_ns = $data["new"]["ns"];
-
$app->db->query("UPDATE powerdns.domains SET name = '$origin', type = 'SLAVE', master = '$master_ns' WHERE ispconfig_id=$ispconfig_id AND type = 'SLAVE'");
-
//$app->db->query("INSERT INTO powerdns.domains (name, type, ispconfig_id) VALUES ('$origin', 'NATIVE', $ispconfig_id)");
-
$zone_id = mysql_insert_id();
-
$zone = $app->db->queryOneRecord("SELECT * FROM powerdns.domains WHERE ispconfig_id = ".$ispconfig_id." AND type = 'SLAVE'");
-
$zone_id = $zone["id"];
-
$app->db->query("DELETE FROM powerdns.records WHERE domain_id = $zone_id AND ispconfig_id = 0");
-
$app->db->query("UPDATE ".$conf["dbpowerdns_database"].".domains SET name = '$origin', type = 'SLAVE', master = '$master_ns' WHERE ispconfig_id=$ispconfig_id AND type = 'SLAVE'");
-
//* Reload powerdns nameserver
-
$app->services->restartServiceDelayed('powerdns','reload');
-
$zone = $app->db->queryOneRecord("SELECT * FROM ".$conf["dbpowerdns_database"].".domains WHERE ispconfig_id = ".$ispconfig_id." AND type = 'SLAVE'");
-
$zone_id = $zone["id"];
-
$app->db->query("DELETE FROM ".$conf["dbpowerdns_database"].".records WHERE domain_id = $zone_id");
-
//* Reload powerdns nameserver
-
$app->services->restartServiceDelayed('powerdns','reload'); } else { $this->slave_insert($event_name,$data);
-
} }
-
} function slave_delete($event_name,$data) { global $app, $conf;
-
$zone = $app->db->queryOneRecord("SELECT * FROM powerdns.domains WHERE ispconfig_id = ".$data["old"]["id"]." AND type = 'SLAVE'");
-
$zone = $app->db->queryOneRecord("SELECT * FROM ".$conf["dbpowerdns_database"].".domains WHERE ispconfig_id = ".$data["old"]["id"]." AND type = 'SLAVE'"); $zone_id = $zone["id"];
-
$app->db->query("DELETE FROM powerdns.records WHERE domain_id = $zone_id");
-
$app->db->query("DELETE FROM powerdns.domains WHERE id = $zone_id");
-
//* Reload powerdns nameserver
-
$app->services->restartServiceDelayed('powerdns','reload');
-
$app->db->query("DELETE FROM ".$conf["dbpowerdns_database"].".records WHERE domain_id = $zone_id");
-
$app->db->query("DELETE FROM ".$conf["dbpowerdns_database"].".domains WHERE id = $zone_id");
-
//* Reload powerdns nameserver
-
$app->services->restartServiceDelayed('powerdns','reload'); } function rr_insert($event_name,$data) { global $app, $conf;
-
if($data["new"]["active"] != 'Y') return;
-
$ispconfig_id = $data["new"]["id"];
-
$zone = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ".$data["new"]["zone"]); $origin = substr($zone["origin"], 0, -1);
-
$powerdns_zone = $app->db->queryOneRecord("SELECT * FROM powerdns.domains WHERE ispconfig_id = ".$data["new"]["zone"]." AND type = 'MASTER'");
-
$powerdns_zone = $app->db->queryOneRecord("SELECT * FROM ".$conf["dbpowerdns_database"].".domains WHERE ispconfig_id = ".$data["new"]["zone"]." AND type = 'MASTER'"); $zone_id = $powerdns_zone["id"];
-
$type = $data["new"]["type"];
-
if(substr($data["new"]["name"], -1) == '.'){ $name = substr($data["new"]["name"], 0, -1); } else {
@@ -301,7 +314,7 @@ } } if($name == '') $name = $origin;
-
switch ($type) { case "CNAME": case "MX":
@@ -316,7 +329,7 @@ } break; case "HINFO":
-
$content = $data["new"]["data"];
-
$content = $data["new"]["data"]; $quote1 = strpos($content, '"'); if($quote1 !== FALSE){ $quote2 = strpos(substr($content, ($quote1 + 1)), '"');
@@ -326,34 +339,34 @@
$content = text_between_quotes.substr(
content, ($quote2 + 2));
}
break;
-
default:
-
default: $content = $data["new"]["data"]; }
-
$ttl = $data["new"]["ttl"]; $prio = $data["new"]["aux"];
-
$change_date = time();
-
$ispconfig_id = $data["new"]["id"];
-
$app->db->query("INSERT INTO powerdns.records (domain_id, name, type, content, ttl, prio, change_date, ispconfig_id) VALUES ($zone_id, '$name', '$type', '$content', $ttl, $prio, $change_date, $ispconfig_id)");
-
$app->db->query("INSERT INTO ".$conf["dbpowerdns_database"].".records (domain_id, name, type, content, ttl, prio, change_date, ispconfig_id) VALUES ($zone_id, '$name', '$type', '$content', $ttl, $prio, ".time().", $ispconfig_id)"); } function rr_update($event_name,$data) { global $app, $conf;
-
if($data["new"]["active"] != 'Y'){ if($data["old"]["active"] != 'Y') return; $this->rr_delete($event_name,$data); } else { if($data["old"]["active"] == 'Y'){
-
$ispconfig_id = $data["new"]["id"];
-
$zone = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ".$data["new"]["zone"]); $origin = substr($zone["origin"], 0, -1);
-
$powerdns_zone = $app->db->queryOneRecord("SELECT * FROM powerdns.domains WHERE ispconfig_id = ".$data["new"]["zone"]." AND type = 'MASTER'");
-
$powerdns_zone = $app->db->queryOneRecord("SELECT * FROM ".$conf["dbpowerdns_database"].".domains WHERE ispconfig_id = ".$data["new"]["zone"]); $zone_id = $powerdns_zone["id"];
-
$type = $data["new"]["type"];
-
$type = $data["new"]["type"];
-
if(substr($data["new"]["name"], -1) == '.'){ $name = substr($data["new"]["name"], 0, -1); } else {
@@ -379,7 +392,7 @@ } break; case "HINFO":
-
$content = $data["new"]["data"];
-
$content = $data["new"]["data"]; $quote1 = strpos($content, '"'); if($quote1 !== FALSE){ $quote2 = strpos(substr($content, ($quote1 + 1)), '"');
@@ -389,33 +402,27 @@
$content = text_between_quotes.substr(
content, ($quote2 + 2));
}
break;
-
default:
-
default: $content = $data["new"]["data"]; }
-
$ttl = $data["new"]["ttl"]; $prio = $data["new"]["aux"];
-
$change_date = time();
-
$ispconfig_id = $data["new"]["id"];
-
//echo "UPDATE powerdns.records SET name = '$name', type = '$type', content = '$content', ttl = $ttl, prio = $prio, change_date = ".time()." WHERE id = $record_id";
-
$app->db->query("UPDATE powerdns.records SET name = '$name', type = '$type', content = '$content', ttl = $ttl, prio = $prio, change_date = ".time()." WHERE ispconfig_id = $ispconfig_id AND type != 'SOA'");
-
$app->db->query("UPDATE ".$conf["dbpowerdns_database"].".records SET name = '$name', type = '$type', content = '$content', ttl = $ttl, prio = $prio, change_date = ".time()." WHERE ispconfig_id = $ispconfig_id AND type != 'SOA'"); } else { $this->rr_insert($event_name,$data); } }
-
} function rr_delete($event_name,$data) { global $app, $conf;
-
$ispconfig_id = $data["old"]["id"];
-
$app->db->query("DELETE FROM powerdns.records WHERE ispconfig_id = $ispconfig_id AND type != 'SOA'");
-
$app->db->query("DELETE FROM ".$conf["dbpowerdns_database"].".records WHERE ispconfig_id = $ispconfig_id AND type != 'SOA'"); }
} // end class
?>