Revert "notify pdns after zone update"

This commit is contained in:
Tuxis Internet Engineering V.O.F 2018-03-28 09:05:09 +02:00 committed by GitHub
parent ed27b5e7d1
commit 635441dbe0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 19 deletions

View file

@ -84,14 +84,6 @@ class PdnsAPI {
return $this->loadzone($zone['id']); return $this->loadzone($zone['id']);
} }
public function notifyzone($zoneid) {
$api = clone $this->http;
$api->method = 'PUT';
$api->url = "/servers/localhost/zones/$zoneid/notify";
$api->call();
return $api->json;
}
public function deletezone($zoneid) { public function deletezone($zoneid) {
$api = clone $this->http; $api = clone $this->http;

View file

@ -9,7 +9,6 @@ $allowzoneadd = FALSE; # Allow normal users to add zones
$logging = TRUE; $logging = TRUE;
$allowclearlogs = TRUE; # Allow clearing of log entries $allowclearlogs = TRUE; # Allow clearing of log entries
$allowrotatelogs = FALSE;# Allow rotation to text file on server $allowrotatelogs = FALSE;# Allow rotation to text file on server
$notifyafterupdate = TRUE;# send notify to slaves after zone update
# Log directory - if allowrotatelogs is set, this is where the logs will # Log directory - if allowrotatelogs is set, this is where the logs will
# be written. It must be writeable by the web server user. # be written. It must be writeable by the web server user.

View file

@ -304,7 +304,6 @@ case "create":
} }
$api->savezone($zone->export()); $api->savezone($zone->export());
if ($notifyafterupdate) $api->notifyzone($_GET['zoneid']);
$zone = new Zone(); $zone = new Zone();
$zone->parse($api->loadzone($zonename)); $zone->parse($api->loadzone($zonename));
@ -328,8 +327,7 @@ case "create":
$rrset->delete(); $rrset->delete();
} }
} }
$api->savezone($zone->export()); $api->savezone($zone->export());
if ($notifyafterupdate) $api->notifyzone($_GET['zoneid']);
foreach ($template['records'] as $record) { foreach ($template['records'] as $record) {
$name = $record['name'] != '' ? join(Array($record['name'],'.',$zonename)) : $zonename; $name = $record['name'] != '' ? join(Array($record['name'],'.',$zonename)) : $zonename;
@ -342,7 +340,6 @@ case "create":
} }
$zone = $api->savezone($zone->export()); $zone = $api->savezone($zone->export());
if ($notifyafterupdate) $api->notifyzone($_GET['zoneid']);
writelog("Created zone ".$zone['name']); writelog("Created zone ".$zone['name']);
jtable_respond($zone, 'single'); jtable_respond($zone, 'single');
break; break;
@ -373,7 +370,6 @@ case "update":
writelog("Updated zone ".$zone->name); writelog("Updated zone ".$zone->name);
jtable_respond($api->savezone($zone->export()), 'single'); jtable_respond($api->savezone($zone->export()), 'single');
if ($notifyafterupdate) $api->notifyzone($_GET['zoneid']);
break; break;
case "createrecord": case "createrecord":
@ -415,7 +411,6 @@ case "createrecord":
$record = $zone->addRecord($name, $type, $content, $_POST['disabled'], $_POST['ttl'], $_POST['setptr']); $record = $zone->addRecord($name, $type, $content, $_POST['disabled'], $_POST['ttl'], $_POST['setptr']);
$api->savezone($zone->export()); $api->savezone($zone->export());
if ($notifyafterupdate) $api->notifyzone($_GET['zoneid']);
writelog("Created record: ".$record['id']); writelog("Created record: ".$record['id']);
jtable_respond($record, 'single'); jtable_respond($record, 'single');
@ -441,7 +436,6 @@ case "editrecord":
$zone->addRecord($_POST['name'], $_POST['type'], $content, $_POST['disabled'], $_POST['ttl'], $_POST['setptr']); $zone->addRecord($_POST['name'], $_POST['type'], $content, $_POST['disabled'], $_POST['ttl'], $_POST['setptr']);
$api->savezone($zone->export()); $api->savezone($zone->export());
if ($notifyafterupdate) $api->notifyzone($_GET['zoneid']);
$record = $zone->getRecord($_POST['name'], $_POST['type'], $content); $record = $zone->getRecord($_POST['name'], $_POST['type'], $content);
writelog("Updated record ".$_POST['id']." to ".$record['id']); writelog("Updated record ".$_POST['id']." to ".$record['id']);
@ -459,7 +453,6 @@ case "deleterecord":
$rrset->deleteRecord($old_record['content']); $rrset->deleteRecord($old_record['content']);
$api->savezone($zone->export()); $api->savezone($zone->export());
if ($notifyafterupdate) $api->notifyzone($_GET['zoneid']);
writelog("Deleted record ".$_POST['id']); writelog("Deleted record ".$_POST['id']);
jtable_respond(null, 'delete'); jtable_respond(null, 'delete');
@ -493,7 +486,6 @@ case "clone":
$srczone->setKind($_POST['kind']); $srczone->setKind($_POST['kind']);
$zone = $api->savezone($srczone->export()); $zone = $api->savezone($srczone->export());
if ($notifyafterupdate) $api->notifyzone($_GET['zoneid']);
$srczone->parse($zone); $srczone->parse($zone);
@ -512,7 +504,6 @@ case "clone":
} }
$zone = $api->savezone($srczone->export()); $zone = $api->savezone($srczone->export());
if ($notifyafterupdate) $api->notifyzone($_GET['zoneid']);
writelog("Cloned zone $src into $name"); writelog("Cloned zone $src into $name");
jtable_respond($zone, 'single'); jtable_respond($zone, 'single');