dnsdist: use correct user in debian packages

diff --git a/builder-support/debian/dnsdist/debian-buster/rules b/builder-support/debian/dnsdist/debian-buster/rules
index 9f49e0b6ce063374c1d3fa2520750b3e21acf79f..8ff24d0a0ec8fd716783276f1feda95f6b4c7ada 100755 (executable)
--- a/builder-support/debian/dnsdist/debian-buster/rules
+++ b/builder-support/debian/dnsdist/debian-buster/rules
@@ -51,6 +51,8 @@ override_dh_auto_configure:
          --with-ebpf \
          --with-lua=luajit \
          --with-protobuf \
+         --with-service-user='_dnsdist' \
+         --with-service-group='_dnsdist' \
          $(CONFIGURE_ARGS)
 
 override_dh_auto_build-arch:
@@ -58,8 +60,6 @@ override_dh_auto_build-arch:
 
 override_dh_install:
        dh_auto_install
-       echo Patching uid and git into debian/dnsdist/lib/systemd/system/*.service
-       perl -pi -e 's/(^ExecStart=.*)/$$1 -u _dnsdist -g _dnsdist/' debian/dnsdist/lib/systemd/system/*.service
 ifeq ($(DEB_HOST_ARCH_BITS),32)
        echo RestrictAddressFamilies is broken on 32bit, removing it from service file
        perl -ni -e 'print unless /RestrictAddressFamilies/' debian/dnsdist/lib/systemd/system/*.service

diff --git a/builder-support/debian/dnsdist/debian-jessie/rules b/builder-support/debian/dnsdist/debian-jessie/rules
index e0f70b6c9a0ae74bca3f8e97ae607b60f1f60274..1d80904bc575e7ff020e7473af2b51ddd50275b3 100755 (executable)
--- a/builder-support/debian/dnsdist/debian-jessie/rules
+++ b/builder-support/debian/dnsdist/debian-jessie/rules
@@ -47,6 +47,8 @@ override_dh_auto_configure:
          --with-ebpf \
          --with-lua=luajit \
          --with-protobuf \
+         --with-service-user='_dnsdist' \
+         --with-service-group='_dnsdist' \
          $(CONFIGURE_ARGS)
 
 override_dh_auto_build-arch:
@@ -54,8 +56,6 @@ override_dh_auto_build-arch:
 
 override_dh_install:
        dh_install
-       echo Patching uid and git into debian/dnsdist/lib/systemd/system/*.service
-       perl -pi -e 's/(^ExecStart=.*)/$$1 -u _dnsdist -g _dnsdist/' debian/dnsdist/lib/systemd/system/*.service
 ifeq ($(DEB_HOST_ARCH_BITS),32)
        echo RestrictAddressFamilies is broken on 32bit, removing it from service file
        perl -ni -e 'print unless /RestrictAddressFamilies/' debian/dnsdist/lib/systemd/system/*.service

diff --git a/builder-support/debian/dnsdist/debian-stretch/rules b/builder-support/debian/dnsdist/debian-stretch/rules
index 4ae2ee8a810c18eaa88726d3301b6f610248ab89..c310e01700d2582298ea66a9e4f4f47cf8523994 100755 (executable)
--- a/builder-support/debian/dnsdist/debian-stretch/rules
+++ b/builder-support/debian/dnsdist/debian-stretch/rules
@@ -50,6 +50,8 @@ override_dh_auto_configure:
          --with-ebpf \
          --with-lua=luajit \
          --with-protobuf \
+         --with-service-user='_dnsdist' \
+         --with-service-group='_dnsdist' \
          $(CONFIGURE_ARGS)
 
 override_dh_auto_build-arch:
@@ -57,8 +59,6 @@ override_dh_auto_build-arch:
 
 override_dh_install:
        dh_auto_install
-       echo Patching uid and git into debian/dnsdist/lib/systemd/system/*.service
-       perl -pi -e 's/(^ExecStart=.*)/$$1 -u _dnsdist -g _dnsdist/' debian/dnsdist/lib/systemd/system/*.service
 ifeq ($(DEB_HOST_ARCH_BITS),32)
        echo RestrictAddressFamilies is broken on 32bit, removing it from service file
        perl -ni -e 'print unless /RestrictAddressFamilies/' debian/dnsdist/lib/systemd/system/*.service