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 41501cc4cd52eca2a9f06a67de1a8091a1ca5308..186acece8896e85da1edc7a6a3f0c672430892d3 100644 (file)
--- 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 30f0d76436ea0702a5ede9a9bd70e477be13ed9c..9dde6f62fcb3644fd1e10e85a57fc65238615418 100644 (file)
--- 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',