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

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

@@ -61,32 +61,38 @@ 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) {
$isFroxlorHostname = true; $isFroxlorHostname = true;
} }
if ($domain['ismainbutsubto'] == 0) { if ($domain['ismainbutsubto'] == 0) {
$zoneContent = createDomainZone(($domain['id'] == 'none') ? $zoneContent = createDomainZone(($domain['id'] == 'none') ?
$domain : $domain :
$domain['id'], $domain['id'],
$isFroxlorHostname); $isFroxlorHostname);
if (count($subzones)) { if (count($subzones)) {
foreach ($subzones as $subzone) { foreach ($subzones as $subzone) {
$zoneContent->records[] = $subzone; $zoneContent->records[] = $subzone;
} }
}
$pdnsDomId = $this->_insertZone($zoneContent->origin, $zoneContent->serial);
$this->_insertRecords($pdnsDomId, $zoneContent->records, $zoneContent->origin);
$this->_insertAllowedTransfers($pdnsDomId);
$this->_logger->logAction(CRON_ACTION, LOG_INFO, 'DB entries stored for zone `' . $domain['domain'] . '`');
} else {
return createDomainZone(($domain['id'] == 'none') ?
$domain :
$domain['id'],
$isFroxlorHostname,
true);
} }
$pdnsDomId = $this->_insertZone($zoneContent->origin, $zoneContent->serial);
$this->_insertRecords($pdnsDomId, $zoneContent->records, $zoneContent->origin);
$this->_insertAllowedTransfers($pdnsDomId);
$this->_logger->logAction(CRON_ACTION, LOG_INFO, 'DB entries stored for zone `' . $domain['domain'] . '`');
} else { } else {
return createDomainZone(($domain['id'] == 'none') ? $this->_logger->logAction(CRON_ACTION, LOG_ERROR,
$domain : 'Custom zonefiles are NOT supported when PowerDNS is selected as DNS daemon (triggered by: ' .
$domain['id'], $domain['domain'] . ')');
$isFroxlorHostname,
true);
} }
} }