From 96ff346e546630fadbfe53ba91dbf5316fde26c3 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Thu, 19 May 2016 09:28:46 +0200
Subject: [PATCH] fix powerdns-config template

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 lib/configfiles/gentoo.xml                  | 17 ++++++++++-------
 scripts/jobs/cron_tasks.inc.dns.20.pdns.php |  2 +-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml
index 71374ccb..e86c2478 100644
--- a/lib/configfiles/gentoo.xml
+++ b/lib/configfiles/gentoo.xml
@@ -396,7 +396,7 @@ mail	IN		A	<SERVERIP>
 #################################
 # 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.
@@ -908,15 +908,17 @@ version-string=powerdns
 #
 # webserver-print-arguments=no
 
-# include froxlor-bind-specific config
-include=/etc/powerdns/pdns_froxlor.conf
+# include froxlor-specific config
+include-dir=/etc/powerdns/froxlor/
 ]]>
 						</content>
 					</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">
 						<content><![CDATA[
 # mysql-settings / you need to create the power-dns database for yourself!
+launch=gmysql
 gmysql-host=127.0.0.1
 gmysql-port=3306
 gmysql-dbname=pdns
@@ -936,7 +938,7 @@ gmysql-password=
 #################################
 # 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.
@@ -1449,11 +1451,12 @@ version-string=powerdns
 # webserver-print-arguments=no
 
 # include froxlor-bind-specific config
-include=/etc/powerdns/pdns_froxlor.conf
+include-dir=/etc/powerdns/froxlor/
 ]]>
 						</content>
 					</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">
 						<content><![CDATA[
 #local-ipv6=YOUR_IPv6_(if_any)
diff --git a/scripts/jobs/cron_tasks.inc.dns.20.pdns.php b/scripts/jobs/cron_tasks.inc.dns.20.pdns.php
index 8352c095..c0e12897 100644
--- a/scripts/jobs/cron_tasks.inc.dns.20.pdns.php
+++ b/scripts/jobs/cron_tasks.inc.dns.20.pdns.php
@@ -142,7 +142,7 @@ class pdns extends DnsBase
 	private function _connectToPdnsDb()
 	{
 		// 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);
 
 		if (!file_exists($config))