From: Pieter Lexis Date: Thu, 6 Jun 2019 10:58:19 +0000 (+0200) Subject: rec: ensure correct service user on debian X-Git-Tag: dnsdist-1.4.0-rc1~110^2~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02a1700aacb7939deae902ea75e9f7cfbd30f956;p=pdns 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 23c5a37eb..b6495990d 100755 --- 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 0eec2a62a..18583724c 100755 --- 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 23c5a37eb..b6495990d 100755 --- 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