Fix systemd user for debian packages

diff --git a/builder-support/debian/recursor/debian-buster/rules b/builder-support/debian/recursor/debian-buster/rules
index 87d979e8faa5305cc55bed651e59d87b79af864e..f6c54cdaaad9ea7fdfc2be93b767194ce1b8eaf3 100755 (executable)
--- a/builder-support/debian/recursor/debian-buster/rules
+++ b/builder-support/debian/recursor/debian-buster/rules
@@ -12,6 +12,8 @@ include /usr/share/dpkg/default.mk
 # Only enable systemd integration on Linux operating systems
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 MESON_ARGS += -Dsystemd-service=enabled
+MESON_ARGS += -Dsystemd-service-user=pdns
+MESON_ARGS += -Dsystemd-service-group=pdns
 DH_ARGS += --with systemd
 else
 MESON_ARGS += -Dsystemd-service=disabled

diff --git a/builder-support/debian/recursor/debian-trixie/rules b/builder-support/debian/recursor/debian-trixie/rules
index 87d979e8faa5305cc55bed651e59d87b79af864e..f6c54cdaaad9ea7fdfc2be93b767194ce1b8eaf3 100755 (executable)
--- a/builder-support/debian/recursor/debian-trixie/rules
+++ b/builder-support/debian/recursor/debian-trixie/rules
@@ -12,6 +12,8 @@ include /usr/share/dpkg/default.mk
 # Only enable systemd integration on Linux operating systems
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 MESON_ARGS += -Dsystemd-service=enabled
+MESON_ARGS += -Dsystemd-service-user=pdns
+MESON_ARGS += -Dsystemd-service-group=pdns
 DH_ARGS += --with systemd
 else
 MESON_ARGS += -Dsystemd-service=disabled

diff --git a/pdns/recursordist/meson_options.txt b/pdns/recursordist/meson_options.txt
index 09d8668154b4bc384f4491107697546c0a67f806..704745410f4761a32ec96fe0a7aded78b20c0f22 100644 (file)
--- a/pdns/recursordist/meson_options.txt
+++ b/pdns/recursordist/meson_options.txt
@@ -13,8 +13,8 @@ option('unit-tests', type: 'boolean', value: false, description: 'Build and run
 option('unit-tests-backends', type: 'boolean', value: false, description: 'Not relevant for recursor')
 option('reproducible', type: 'boolean', value: false, description: 'Reproducible builds (for distro maintainers, makes debugging difficult)')
 option('systemd-service', type: 'feature', value: 'auto', description: 'Systemd integration (requires libsystemd)')
-option('systemd-service-user', type: 'string', value: 'pdns', description: 'Systemd service user (setuid and unit file; user is not created)')
-option('systemd-service-group', type: 'string', value: 'pdns', description: 'Systemd service group (setgid and unit file; group is not created)')
+option('systemd-service-user', type: 'string', value: 'pdns-recursor', description: 'Systemd service user (setuid and unit file; user is not created)')
+option('systemd-service-group', type: 'string', value: 'pdns-recursor', description: 'Systemd service group (setgid and unit file; group is not created)')
 option('auto-var-init', type: 'combo', value: 'disabled', choices: ['zero', 'pattern', 'disabled'], description: 'Enable initialization of automatic variables')
 option('malloc-trace', type: 'boolean', value: false, description: 'Enable malloc-trace')
 option('socket-dir', type: 'string', value: '/var/run', description: 'Where the control socket lives')