maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

keep compatibility and do not generate pdns records/zone when custom zonefile is set

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-08-07 17:56:03 +02:00
parent 731427255e
commit 003005f295
1 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/jobs/cron_tasks.inc.dns.20.pdns.php
View File

@@ -61,6 +61,7 @@ class pdns extends DnsBase
$subzones[] = $this->walkDomainList($domains[$child_domain_id], $domains); $subzones[] = $this->walkDomainList($domains[$child_domain_id], $domains);
} }
if ($domain['zonefile'] == '') {
// check for system-hostname // check for system-hostname
$isFroxlorHostname = false; $isFroxlorHostname = false;
if (isset($domain['froxlorhost']) && $domain['froxlorhost'] == 1) { if (isset($domain['froxlorhost']) && $domain['froxlorhost'] == 1) {
@@ -88,6 +89,11 @@ class pdns extends DnsBase
$isFroxlorHostname, $isFroxlorHostname,
true); true);
} }
} else {
$this->_logger->logAction(CRON_ACTION, LOG_ERROR,
'Custom zonefiles are NOT supported when PowerDNS is selected as DNS daemon (triggered by: ' .
$domain['domain'] . ')');
}
} }
private function _clearZoneTables() private function _clearZoneTables()