From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 16 May 2018 13:55:47 +0000 (+0200)
Subject: ixfrdist: add multi-unit file for systemd
X-Git-Tag: dnsdist-1.3.1~84^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a7eb2902452ef91fb2fa82699bf2538b759ab8d;p=pdns

ixfrdist: add multi-unit file for systemd
---

diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm
index 6d383a623..920d6b625 100755
--- 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 b8091214d..be41da6eb 100644
--- 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 48ac1532e..00be53ac9 100644
--- 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 8761c66b4..a51070ec8 100644
--- 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