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

use system.defaultttl setting also for SOA record; fixes #667

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2019-03-16 18:09:21 +01:00
parent 4028e3ba5c
commit 6764747fa9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "e8e7674e76d62f5cfd913e3bb715eec2", "content-hash": "5a09e82c87504e904337a4fc8a80e3a8",
"packages": [ "packages": [
{ {
"name": "algo26-matthias/idna-convert", "name": "algo26-matthias/idna-convert",
@@ -2988,7 +2988,7 @@
"ext-openssl": "*" "ext-openssl": "*"
}, },
"platform-dev": { "platform-dev": {
"php": ">=7.0", "php": ">=7.1",
"ext-pcntl": "*" "ext-pcntl": "*"
} }
} }

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

@@ -304,7 +304,7 @@ class Dns
$soa_content = $primary_ns . " " . self::escapeSoaAdminMail(Settings::Get('panel.adminmail')) . " "; $soa_content = $primary_ns . " " . self::escapeSoaAdminMail(Settings::Get('panel.adminmail')) . " ";
$soa_content .= $domain['bindserial'] . " "; $soa_content .= $domain['bindserial'] . " ";
// TODO for now, dummy time-periods // TODO for now, dummy time-periods
$soa_content .= "3600 900 604800 1200"; $soa_content .= "3600 900 604800 " . (int) Settings::Get('system.defaultttl');
$soa_record = new DnsEntry('@', 'SOA', $soa_content); $soa_record = new DnsEntry('@', 'SOA', $soa_content);
array_unshift($zonerecords, $soa_record); array_unshift($zonerecords, $soa_record);