dnsdist: Fix configuration file installation / chmod

Introduced in c98c0ef694de0c536e6d71af8c58a16f6635ea35

diff --git a/builder-support/debian/dnsdist/debian-buster/dnsdist.postinst b/builder-support/debian/dnsdist/debian-buster/dnsdist.postinst
index 7bbf10b16b81f26892692cfe5b1a8623e3d29654..8f7a7ce1811d71ed2837024f028d53166bd9ec7e 100644 (file)
--- a/builder-support/debian/dnsdist/debian-buster/dnsdist.postinst
+++ b/builder-support/debian/dnsdist/debian-buster/dnsdist.postinst
@@ -19,10 +19,10 @@ case "$1" in
     adduser --force-badname --system --home /nonexistent --group \
         --no-create-home --quiet _dnsdist || true
 
-    if [ "`stat -c '%U:%G' /etc/powerdns/dnsdist.conf`" = "root:root" ]; then
-      chown root:_dnsdist /etc/powerdns/dnsdist.conf
+    if [ "`stat -c '%U:%G' /etc/dnsdist/dnsdist.conf`" = "root:root" ]; then
+      chown root:_dnsdist /etc/dnsdist/dnsdist.conf
       # Make sure that dnsdist can read it; the default used to be 0600
-      chmod g+r /etc/powerdns/dnsdist.conf
+      chmod g+r /etc/dnsdist/dnsdist.conf
     fi
   ;;
 

diff --git a/builder-support/debian/dnsdist/debian-buster/rules b/builder-support/debian/dnsdist/debian-buster/rules
index 31d234e4ead403e419795cc5fd759e87076c6619..42533bfda07d6bbc2127c1fbc49d4efe15c7fdf7 100755 (executable)
--- a/builder-support/debian/dnsdist/debian-buster/rules
+++ b/builder-support/debian/dnsdist/debian-buster/rules
@@ -78,4 +78,5 @@ override_dh_installinit:
 override_dh_fixperms:
        dh_fixperms
         # these files often contain passwords. 640 as it is chowned to root:_dnsdist
+       touch debian/dnsdist/etc/dnsdist/dnsdist.conf
        chmod 0640 debian/dnsdist/etc/dnsdist/dnsdist.conf

diff --git a/builder-support/debian/dnsdist/debian-jessie/dnsdist.postinst b/builder-support/debian/dnsdist/debian-jessie/dnsdist.postinst
index 7bbf10b16b81f26892692cfe5b1a8623e3d29654..8f7a7ce1811d71ed2837024f028d53166bd9ec7e 100644 (file)
--- a/builder-support/debian/dnsdist/debian-jessie/dnsdist.postinst
+++ b/builder-support/debian/dnsdist/debian-jessie/dnsdist.postinst
@@ -19,10 +19,10 @@ case "$1" in
     adduser --force-badname --system --home /nonexistent --group \
         --no-create-home --quiet _dnsdist || true
 
-    if [ "`stat -c '%U:%G' /etc/powerdns/dnsdist.conf`" = "root:root" ]; then
-      chown root:_dnsdist /etc/powerdns/dnsdist.conf
+    if [ "`stat -c '%U:%G' /etc/dnsdist/dnsdist.conf`" = "root:root" ]; then
+      chown root:_dnsdist /etc/dnsdist/dnsdist.conf
       # Make sure that dnsdist can read it; the default used to be 0600
-      chmod g+r /etc/powerdns/dnsdist.conf
+      chmod g+r /etc/dnsdist/dnsdist.conf
     fi
   ;;
 

diff --git a/builder-support/debian/dnsdist/debian-jessie/rules b/builder-support/debian/dnsdist/debian-jessie/rules
index 989562eb9369cd05aee5929355bf8d3fab1773fa..053c23e5ccb8a20d3f48829c3346cee4033f9b10 100755 (executable)
--- a/builder-support/debian/dnsdist/debian-jessie/rules
+++ b/builder-support/debian/dnsdist/debian-jessie/rules
@@ -78,4 +78,5 @@ override_dh_installinit:
 override_dh_fixperms:
        dh_fixperms
         # these files often contain passwords. 640 as it is chowned to root:_dnsdist
+       touch debian/dnsdist/etc/dnsdist/dnsdist.conf
        chmod 0640 debian/dnsdist/etc/dnsdist/dnsdist.conf

diff --git a/builder-support/debian/dnsdist/debian-stretch/dnsdist.postinst b/builder-support/debian/dnsdist/debian-stretch/dnsdist.postinst
index 7bbf10b16b81f26892692cfe5b1a8623e3d29654..8f7a7ce1811d71ed2837024f028d53166bd9ec7e 100644 (file)
--- a/builder-support/debian/dnsdist/debian-stretch/dnsdist.postinst
+++ b/builder-support/debian/dnsdist/debian-stretch/dnsdist.postinst
@@ -19,10 +19,10 @@ case "$1" in
     adduser --force-badname --system --home /nonexistent --group \
         --no-create-home --quiet _dnsdist || true
 
-    if [ "`stat -c '%U:%G' /etc/powerdns/dnsdist.conf`" = "root:root" ]; then
-      chown root:_dnsdist /etc/powerdns/dnsdist.conf
+    if [ "`stat -c '%U:%G' /etc/dnsdist/dnsdist.conf`" = "root:root" ]; then
+      chown root:_dnsdist /etc/dnsdist/dnsdist.conf
       # Make sure that dnsdist can read it; the default used to be 0600
-      chmod g+r /etc/powerdns/dnsdist.conf
+      chmod g+r /etc/dnsdist/dnsdist.conf
     fi
   ;;
 

diff --git a/builder-support/debian/dnsdist/debian-stretch/rules b/builder-support/debian/dnsdist/debian-stretch/rules
index dafe4957e14bddfa8c18b3a637787a9295fd4db2..e058f0e252e5e3a10ca8ae5c9648f4273d929562 100755 (executable)
--- a/builder-support/debian/dnsdist/debian-stretch/rules
+++ b/builder-support/debian/dnsdist/debian-stretch/rules
@@ -77,4 +77,5 @@ override_dh_installinit:
 override_dh_fixperms:
        dh_fixperms
         # these files often contain passwords. 640 as it is chowned to root:_dnsdist
+       touch debian/dnsdist/etc/dnsdist/dnsdist.conf
        chmod 0640 debian/dnsdist/etc/dnsdist/dnsdist.conf