From 3f790bc334bfdf5e9d815375ac455a9b9069cd66 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Fri, 24 Jun 2016 08:03:42 +0200
Subject: [PATCH] keep the same structure for every distro + minor permission
 fixes

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 lib/configfiles/gentoo.xml  |  2 +-
 lib/configfiles/jessie.xml  | 12 ++++++++----
 lib/configfiles/precise.xml |  8 +++++---
 lib/configfiles/trusty.xml  |  7 ++++---
 lib/configfiles/wheezy.xml  | 11 +++++++----
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml
index 28083420..3e0e5c3b 100644
--- a/lib/configfiles/gentoo.xml
+++ b/lib/configfiles/gentoo.xml
@@ -1457,7 +1457,7 @@ include-dir=/etc/powerdns/froxlor/
 					</file>
 					<command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
 					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
-						chmod="644">
+						chmod="600">
 						<content><![CDATA[
 #local-ipv6=YOUR_IPv6_(if_any)
 bind-config=<BIND_CONFIG_PATH>named.conf
diff --git a/lib/configfiles/jessie.xml b/lib/configfiles/jessie.xml
index e3133fae..7a3e19f8 100644
--- a/lib/configfiles/jessie.xml
+++ b/lib/configfiles/jessie.xml
@@ -566,7 +566,6 @@ guardian=yes
 # include-dir	Include *.conf files from this directory
 #
 # include-dir=
-include-dir=/etc/powerdns/pdns.d
 
 #################################
 # launch	Which backends to launch and order to query them in
@@ -893,7 +892,8 @@ version-string=powerdns
 #
 # webserver-print-arguments=no
 
-include-dir=/etc/powerdns/froxlor
+# include froxlor-bind-specific config
+include-dir=/etc/powerdns/froxlor/
 ]]>
 						</content>
 					</file>
@@ -1107,7 +1107,6 @@ guardian=yes
 # include-dir	Include *.conf files from this directory
 #
 # include-dir=
-include-dir=/etc/powerdns/pdns.d
 
 #################################
 # launch	Which backends to launch and order to query them in
@@ -1434,10 +1433,15 @@ version-string=powerdns
 # webserver-print-arguments	If the webserver should print arguments
 #
 # webserver-print-arguments=no
+
+# include froxlor-bind-specific config
+include-dir=/etc/powerdns/froxlor/
 ]]>
 						</content>
 					</file>
-					<file name="/etc/powerdns/pdns.d/bindbackend.conf" backup="true">
+					<command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
+					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
+						chmod="600">
 						<content><![CDATA[
 # Bind backend configuration
 
diff --git a/lib/configfiles/precise.xml b/lib/configfiles/precise.xml
index 8fd81f34..d9374de3 100644
--- a/lib/configfiles/precise.xml
+++ b/lib/configfiles/precise.xml
@@ -363,6 +363,7 @@ include-dir=/etc/powerdns/froxlor/
 ]]>
 						</content>
 					</file>
+					<command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
 					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
 						chmod="600">
 						<content><![CDATA[
@@ -398,12 +399,13 @@ socket-dir=/var/run
 version-string=powerdns
 bind-config=<BIND_CONFIG_PATH>named.conf
 bind-check-interval=300
-include=/etc/powerdns/pdns_froxlor.conf
+include-dir=/etc/powerdns/froxlor/
 ]]>
 						</content>
 					</file>
-					<file name="/etc/powerdns/pdns_froxlor.conf" chown="root:root"
-						chmod="644">
+					<command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
+					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
+						chmod="600">
 						<content><![CDATA[
 allow-axfr-ips=<NAMESERVERS>
 #local-ipv6=YOUR_IPv6_(if_any)
diff --git a/lib/configfiles/trusty.xml b/lib/configfiles/trusty.xml
index 824cd147..f21517b4 100644
--- a/lib/configfiles/trusty.xml
+++ b/lib/configfiles/trusty.xml
@@ -433,12 +433,13 @@ socket-dir=/var/run
 version-string=powerdns
 bind-config=<BIND_CONFIG_PATH>named.conf
 bind-check-interval=300
-include-dir=/etc/powerdns/pdns.d
+include-dir=/etc/powerdns/froxlor/
 ]]>
 						</content>
 					</file>
-					<file name="/etc/powerdns/pdns.d/bindbackend.conf" chown="root:root"
-						chmod="644">
+					<command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
+					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
+						chmod="600">
 						<content><![CDATA[
 allow-axfr-ips=<NAMESERVERS>
 #local-ipv6=YOUR_IPv6_(if_any)
diff --git a/lib/configfiles/wheezy.xml b/lib/configfiles/wheezy.xml
index d54b1a3e..bf63a447 100644
--- a/lib/configfiles/wheezy.xml
+++ b/lib/configfiles/wheezy.xml
@@ -732,7 +732,8 @@ socket-dir=/var/run
 #                  allowed methods are anonymous / powerdns / full / custom
 version-string=powerdns
 
-include-dir=/etc/powerdns/froxlor
+# include froxlor-bind-specific config
+include-dir=/etc/powerdns/froxlor/
 ]]>
 						</content>
 					</file>
@@ -1070,12 +1071,14 @@ socket-dir=/var/run
 #                  allowed methods are anonymous / powerdns / full / custom
 version-string=powerdns
 
-include-dir=/etc/powerdns/pdns.d
+# include froxlor-bind-specific config
+include-dir=/etc/powerdns/froxlor/
 ]]>
 						</content>
 					</file>
-					<file name="/etc/powerdns/pdns.d/bindbackend.conf" backup="true" chown="root:root"
-						chmod="644">
+					<command><![CDATA[mkdir -p /etc/powerdns/froxlor/]]></command>
+					<file name="/etc/powerdns/froxlor/pdns_froxlor.conf" chown="root:root"
+						chmod="600">
 						<content><![CDATA[
 # Bind backend configuration