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

fix powerdns-config template

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-05-19 09:28:46 +02:00
parent 076b6143ce
commit 96ff346e54
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/configfiles/gentoo.xml
View File

@@ -396,7 +396,7 @@ mail IN A <SERVERIP>
################################# #################################
# allow-axfr-ips Allow zonetransfers only to these subnets # allow-axfr-ips Allow zonetransfers only to these subnets
# #
allow-axfr-ips=<NAMESERVERS> # allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS>
################################# #################################
# allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges.
@@ -908,15 +908,17 @@ version-string=powerdns
# #
# webserver-print-arguments=no # webserver-print-arguments=no
# include froxlor-bind-specific config # include froxlor-specific config
include=/etc/powerdns/pdns_froxlor.conf include-dir=/etc/powerdns/froxlor/
]]> ]]>
</content> </content>
</file> </file>
<file name="/etc/powerdns/pdns_froxlor.conf" chown="root:0" <command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:0"
chmod="644"> chmod="644">
<content><![CDATA[ <content><![CDATA[
# mysql-settings / you need to create the power-dns database for yourself! # mysql-settings / you need to create the power-dns database for yourself!
launch=gmysql
gmysql-host=127.0.0.1 gmysql-host=127.0.0.1
gmysql-port=3306 gmysql-port=3306
gmysql-dbname=pdns gmysql-dbname=pdns
@@ -936,7 +938,7 @@ gmysql-password=
################################# #################################
# allow-axfr-ips Allow zonetransfers only to these subnets # allow-axfr-ips Allow zonetransfers only to these subnets
# #
allow-axfr-ips=<NAMESERVERS> # allow-axfr-ips=127.0.0.0/8,::1,<NAMESERVERS>
################################# #################################
# allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges. # allow-dnsupdate-from A global setting to allow DNS updates from these IP ranges.
@@ -1449,11 +1451,12 @@ version-string=powerdns
# webserver-print-arguments=no # webserver-print-arguments=no
# include froxlor-bind-specific config # include froxlor-bind-specific config
include=/etc/powerdns/pdns_froxlor.conf include-dir=/etc/powerdns/froxlor/
]]> ]]>
</content> </content>
</file> </file>
<file name="/etc/powerdns/pdns_froxlor.conf" chown="root:0" <command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:0"
chmod="644"> chmod="644">
<content><![CDATA[ <content><![CDATA[
#local-ipv6=YOUR_IPv6_(if_any) #local-ipv6=YOUR_IPv6_(if_any)

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

@@ -142,7 +142,7 @@ class pdns extends DnsBase
private function _connectToPdnsDb() private function _connectToPdnsDb()
{ {
// get froxlor pdns config // get froxlor pdns config
$cf = Settings::Get('system.bindconf_directory').'/pdns_froxlor.conf'; $cf = Settings::Get('system.bindconf_directory').'/froxlor/pdns_froxlor.conf';
$config = makeCorrectFile($cf); $config = makeCorrectFile($cf);
if (!file_exists($config)) if (!file_exists($config))