rec: ensure correct service user on debian

diff --git a/builder-support/debian/recursor/debian-buster/rules b/builder-support/debian/recursor/debian-buster/rules
index 23c5a37eb5fcf5a71fa7da004b9896322aebf8ca..b6495990d8c41c17af6a5becb568334505c21033 100755 (executable)
--- a/builder-support/debian/recursor/debian-buster/rules
+++ b/builder-support/debian/recursor/debian-buster/rules
@@ -33,6 +33,8 @@ override_dh_auto_configure:
                --with-protobuf=yes \
                --without-net-snmp \
                --disable-silent-rules \
+               --with-service-user=pdns \
+               --with-service-group=pdns \
                $(CONFIGURE_ARGS)
 
 override_dh_auto_install:
@@ -42,8 +44,6 @@ override_dh_auto_install:
                -e 's!# config-dir=.*!config-dir=/etc/powerdns!' \
                -e 's!# local-address=.*!local-address=127.0.0.1!' \
                -e 's!# quiet=.*!quiet=yes!' \
-               -e 's!# setgid=.*!setgid=pdns!' \
-               -e 's!# setuid=.*!setuid=pdns!' \
                -e 's!# hint-file=.*!&\nhint-file=/usr/share/dns/root.hints!' \
                > debian/pdns-recursor/etc/powerdns/recursor.conf
 

diff --git a/builder-support/debian/recursor/debian-jessie/rules b/builder-support/debian/recursor/debian-jessie/rules
index 0eec2a62a2a0f21e5adcab8cb469a6ee5ff49e5c..18583724c96fa733f4c6623e4067d01ae9bab90a 100755 (executable)
--- a/builder-support/debian/recursor/debian-jessie/rules
+++ b/builder-support/debian/recursor/debian-jessie/rules
@@ -33,6 +33,8 @@ override_dh_auto_configure:
                --with-protobuf=yes \
                --with-net-snmp \
                --disable-silent-rules \
+               --with-service-user=pdns \
+               --with-service-group=pdns \
                $(CONFIGURE_ARGS)
 
 override_dh_auto_install:
@@ -42,8 +44,6 @@ override_dh_auto_install:
                -e 's!# config-dir=.*!config-dir=/etc/powerdns!' \
                -e 's!# local-address=.*!local-address=127.0.0.1!' \
                -e 's!# quiet=.*!quiet=yes!' \
-               -e 's!# setgid=.*!setgid=pdns!' \
-               -e 's!# setuid=.*!setuid=pdns!' \
                -e 's!# hint-file=.*!&\nhint-file=/usr/share/dns/root.hints!' \
                > debian/tmp/etc/powerdns/recursor.conf
 

diff --git a/builder-support/debian/recursor/debian-stretch/rules b/builder-support/debian/recursor/debian-stretch/rules
index 23c5a37eb5fcf5a71fa7da004b9896322aebf8ca..b6495990d8c41c17af6a5becb568334505c21033 100755 (executable)
--- a/builder-support/debian/recursor/debian-stretch/rules
+++ b/builder-support/debian/recursor/debian-stretch/rules
@@ -33,6 +33,8 @@ override_dh_auto_configure:
                --with-protobuf=yes \
                --without-net-snmp \
                --disable-silent-rules \
+               --with-service-user=pdns \
+               --with-service-group=pdns \
                $(CONFIGURE_ARGS)
 
 override_dh_auto_install:
@@ -42,8 +44,6 @@ override_dh_auto_install:
                -e 's!# config-dir=.*!config-dir=/etc/powerdns!' \
                -e 's!# local-address=.*!local-address=127.0.0.1!' \
                -e 's!# quiet=.*!quiet=yes!' \
-               -e 's!# setgid=.*!setgid=pdns!' \
-               -e 's!# setuid=.*!setuid=pdns!' \
                -e 's!# hint-file=.*!&\nhint-file=/usr/share/dns/root.hints!' \
                > debian/pdns-recursor/etc/powerdns/recursor.conf