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

Merge pull request #919 from nachtgeist/soa

Browse Source 
dns: make mail address of SOA records configurable
This commit is contained in:
Michael Kaufmann
2021-02-21 18:27:57 +01:00
committed by GitHub
parent 356a087b6a a1b8807b0f
commit 036d5f0713
7 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Froxlor/Dns/Dns.php
View File

@@ -365,7 +365,11 @@ class Dns
}
// PowerDNS does not like multi-line-format
$soa_content = $primary_ns . " " . self::escapeSoaAdminMail(Settings::Get('panel.adminmail')) . " ";
$soa_email = Settings::Get('system.soaemail');
if ($soa_email == "") {
$soa_email = Settings::Get('panel.adminmail');
}
$soa_content = $primary_ns . " " . self::escapeSoaAdminMail($soa_email) . " ";
$soa_content .= $domain['bindserial'] . " ";
// TODO for now, dummy time-periods
$soa_content .= "3600 900 604800 " . (int) Settings::Get('system.defaultttl');

2
lib/Froxlor/Froxlor.php
View File

@@ -10,7 +10,7 @@ final class Froxlor
const VERSION = '0.10.24';
// Database version (YYYYMMDDC where C is a daily counter)
const DBVERSION = '202101200';
const DBVERSION = '202102200';
// Distribution branding-tag (used for Debian etc.)
const BRANDING = '';