From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 24 Jul 2025 09:41:38 +0000 (+0200)
Subject: dnsdist: Fix systemd template unit when building with meson
X-Git-Tag: auth-5.1.0-alpha0~11^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8b86d5644f46b2f07cd7f633cbfd98395ec8ec6;p=thirdparty%2Fpdns.git

dnsdist: Fix systemd template unit when building with meson

Signed-off-by: Remi Gacogne <remi.gacogne@powerdns.com>
---

diff --git a/pdns/dnsdistdist/dnsdist.service.meson.in b/pdns/dnsdistdist/dnsdist.service.meson.in
index 41501cc4c..186acece8 100644
--- a/pdns/dnsdistdist/dnsdist.service.meson.in
+++ b/pdns/dnsdistdist/dnsdist.service.meson.in
@@ -6,12 +6,12 @@ Wants=network-online.target
 After=network-online.target time-sync.target
 
 [Service]
-ExecStartPre=@BinDir@/dnsdist --check-config
+ExecStartPre=@BinDir@/dnsdist --check-config @ConfigFile@
 # Note: when editing the ExecStart command, keep --supervised and --disable-syslog
-ExecStart=@BinDir@/dnsdist --supervised --disable-syslog
+ExecStart=@BinDir@/dnsdist --supervised --disable-syslog @ConfigFile@
 User=@ServiceUser@
 Group=@ServiceGroup@
-SyslogIdentifier=dnsdist
+SyslogIdentifier=@SyslogIdentifier@
 Type=notify
 Restart=on-failure
 RestartSec=2
diff --git a/pdns/dnsdistdist/meson.build b/pdns/dnsdistdist/meson.build
index 30f0d7643..9dde6f62f 100644
--- a/pdns/dnsdistdist/meson.build
+++ b/pdns/dnsdistdist/meson.build
@@ -739,6 +739,7 @@ if dep_systemd_prog.found()
   dnsdist_service_conf_general.set('Description', 'DNS Loadbalancer')
   dnsdist_service_conf_general.merge_from(systemd_service_conf)
   dnsdist_service_conf_general.set('SyslogIdentifier', 'dnsdist')
+  dnsdist_service_conf_general.set('ConfigFile', '')
 
   configure_file(
     input: 'dnsdist.service.meson.in',
@@ -752,6 +753,7 @@ if dep_systemd_prog.found()
   dnsdist_service_conf_instance.merge_from(systemd_service_conf)
   dnsdist_service_conf_instance.set('Description', 'DNS Loadbalancer %i')
   dnsdist_service_conf_instance.set('SyslogIdentifier', 'dnsdist-%i')
+  dnsdist_service_conf_instance.set('ConfigFile', '--config ' + get_option('sysconfdir') + '/dnsdist-%i.conf')
 
   configure_file(
     input: 'dnsdist.service.meson.in',