ixfrdist: add multi-unit file for systemd

diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm
index 6d383a623ace54679b1f2f004ba8170f7901185f..920d6b625ca16c680f6d0265e74cbab7ae254d3f 100755 (executable)
--- a/build-scripts/build-auth-rpm
+++ b/build-scripts/build-auth-rpm
@@ -810,6 +810,7 @@ exit 0
 %{_mandir}/man1/saxfr.1.gz
 %{_mandir}/man1/sdig.1.gz
 %{_unitdir}/ixfrdist.service
+%{_unitdir}/ixfrdist@.service
 
 %files backend-mysql
 %doc modules/gmysqlbackend/schema.mysql.sql
@@ -1093,6 +1094,7 @@ exit 0
 %{_mandir}/man1/saxfr.1.gz
 %{_mandir}/man1/sdig.1.gz
 %{_unitdir}/ixfrdist.service
+%{_unitdir}/ixfrdist@.service
 
 %files backend-mysql
 %doc modules/gmysqlbackend/schema.mysql.sql

diff --git a/build-scripts/debian-authoritative/pdns-tools.install b/build-scripts/debian-authoritative/pdns-tools.install
index b8091214d82616527451a2ef948b34dd5803ba34..be41da6eb467cef8abb5d20eafed47eb6c329fe6 100644 (file)
--- a/build-scripts/debian-authoritative/pdns-tools.install
+++ b/build-scripts/debian-authoritative/pdns-tools.install
@@ -17,3 +17,4 @@ usr/bin/pdns_notify
 usr/bin/saxfr
 usr/bin/sdig
 lib/systemd/system/ixfrdist.service
+lib/systemd/system/ixfrdist@.service

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 48ac1532e46bfc16438e0f5b1d279e27c3c4006f..00be53ac9294444be2d576cac7ce3684dcb32dba 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1427,11 +1427,17 @@ if IXFRDIST
 ixfrdist.service: ixfrdist.service.in
        $(AM_V_GEN)sed -e 's![@]bindir[@]!$(bindir)!' < $< > $@
 
+ixfrdist@.service: ixfrdist.service
+       $(AM_V_GEN)sed -e 's!/ixfrdist!& --config $(sysconfdir)/ixfrdist-%i.yml!' \
+         < $< > $@
+
 systemdsystemunit_DATA += \
-       ixfrdist.service
+       ixfrdist.service \
+       ixfrdist@.service
 endif # IXFRDIST
 
 CLEANFILES += \
-       ixfrdist.service
+       ixfrdist.service \
+       ixfrdist@.service
 
 endif # HAVE_SYSTEMD

diff --git a/pdns/ixfrdist.service.in b/pdns/ixfrdist.service.in
index 8761c66b4c93e54a9df5d50f980d8203dadf4a73..a51070ec87d2dc324a4a1beb483e2ace3a3b46af 100644 (file)
--- a/pdns/ixfrdist.service.in
+++ b/pdns/ixfrdist.service.in
@@ -1,13 +1,13 @@
 [Unit]
 Description=PowerDNS IXFR Distributor
 Documentation=man:ixfrdist(1)
+Documentation=man:ixfrdist.yml(5)
 Documentation=https://doc.powerdns.com
 Wants=network-online.target
 After=network-online.target
 
 [Service]
 Type=simple
-# You'll want to override this, see the manpage
 ExecStart=@bindir@/ixfrdist
 Restart=on-failure
 RestartSec=1