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

fix call to undefined method pdns::_generateDomainConfig() in PowerDNS cronjob when using custom zone-file in a domain

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

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

@@ -61,39 +61,32 @@ 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 {
$this->_logger->logAction(CRON_ACTION, LOG_ERROR, return createDomainZone(($domain['id'] == 'none') ?
'Zonefiles are NOT supported when PowerDNS is selected as DNS daemon (triggered by: ' . $domain :
$domain['domain'] . ')'); $domain['id'],
$this->_bindconf_file .= $this->_generateDomainConfig($domain); $isFroxlorHostname,
true);
} }
} }