Add ixfrdist to tool package

diff --git a/build-scripts/build-auth-debian b/build-scripts/build-auth-debian
index 5ef48711f046a16801eaf03efd4a825da31707ed..0a5e0115839051150a118fbb81069bf1b084b717 100755 (executable)
--- a/build-scripts/build-auth-debian
+++ b/build-scripts/build-auth-debian
@@ -34,7 +34,7 @@ export VERSION_ID="${VERSION_ID}"
 
 if [ ${ID} = "ubuntu" ]; then
   if [ ${VERSION_ID} = "14.04" ]; then
-    sed -i '/lib\/systemd\/system\/pdns@\?\.service/d' debian/pdns-server.install
+    sed -i '/lib\/systemd\/system\/pdns@\?\.service/d' debian/*.install
   fi
   if [ $VERSION_ID} = "16.10" ];then
     sed -i 's!libzmq-dev!libzmq3-dev!' debian/control.in

diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm
index 62adc374c1ece841a1be4d547cf46fcdb864ff2d..1b93d7262e4ca026ab5ff1f9f2f329350d4ba014 100755 (executable)
--- a/build-scripts/build-auth-rpm
+++ b/build-scripts/build-auth-rpm
@@ -446,6 +446,7 @@ fi
 %{_bindir}/dnsscope
 %{_bindir}/dnswasher
 %{_bindir}/dumresp
+%{_bindir}/ixfrdist
 %{_bindir}/ixplore
 %{_bindir}/pdns_notify
 %{_bindir}/nproxy
@@ -459,6 +460,7 @@ fi
 %{_mandir}/man1/dnsscope.1.gz
 %{_mandir}/man1/dnswasher.1.gz
 %{_mandir}/man1/dumresp.1.gz
+%{_mandir}/man1/ixfrdist.1.gz
 %{_mandir}/man1/ixplore.1.gz
 %{_mandir}/man1/pdns_notify.1.gz
 %{_mandir}/man1/nproxy.1.gz
@@ -756,6 +758,7 @@ exit 0
 %{_bindir}/dnstcpbench
 %{_bindir}/dnswasher
 %{_bindir}/dumresp
+%{_bindir}/ixfrdist
 %{_bindir}/ixplore
 %{_bindir}/pdns_notify
 %{_bindir}/nproxy
@@ -772,12 +775,14 @@ exit 0
 %{_mandir}/man1/dnstcpbench.1.gz
 %{_mandir}/man1/dnswasher.1.gz
 %{_mandir}/man1/dumresp.1.gz
+%{_mandir}/man1/ixfrdist.1.gz
 %{_mandir}/man1/ixplore.1.gz
 %{_mandir}/man1/pdns_notify.1.gz
 %{_mandir}/man1/nproxy.1.gz
 %{_mandir}/man1/nsec3dig.1.gz
 %{_mandir}/man1/saxfr.1.gz
 %{_mandir}/man1/sdig.1.gz
+%{_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 6ca38a9e4397ade10bce8dc81e39252223330901..057a238aa0ae5bd1f59e0c869cf9f81401a98f2c 100644 (file)
--- a/build-scripts/debian-authoritative/pdns-tools.install
+++ b/build-scripts/debian-authoritative/pdns-tools.install
@@ -8,9 +8,11 @@ usr/bin/dnsscope
 usr/bin/dnstcpbench
 usr/bin/dnswasher
 usr/bin/dumresp
+usr/bin/ixfrdist
 usr/bin/ixplore
 usr/bin/nproxy
 usr/bin/nsec3dig
 usr/bin/pdns_notify
 usr/bin/saxfr
 usr/bin/sdig
+lib/systemd/system/pdns.service

diff --git a/build-scripts/debian-authoritative/pdns-tools.manpages b/build-scripts/debian-authoritative/pdns-tools.manpages
index b8b70a83da965e2134a2ea3cddf87f76e2b43b55..67b6f7d95fae66696bd4f04e259e5936ac1940ab 100644 (file)
--- a/build-scripts/debian-authoritative/pdns-tools.manpages
+++ b/build-scripts/debian-authoritative/pdns-tools.manpages
@@ -8,6 +8,7 @@ debian/tmp/usr/share/man/man1/dnsscope.1
 debian/tmp/usr/share/man/man1/dnstcpbench.1
 debian/tmp/usr/share/man/man1/dnswasher.1
 debian/tmp/usr/share/man/man1/dumresp.1
+debian/tmp/usr/share/man/man1/ixfrdist.1
 debian/tmp/usr/share/man/man1/ixplore.1
 debian/tmp/usr/share/man/man1/nproxy.1
 debian/tmp/usr/share/man/man1/nsec3dig.1

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index b8fa57294f7b2e9dbf0bf3d85ded397d97ff2f6d..746f9b951efad94c948c90bda38fa7df7cb56106 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -54,7 +54,8 @@ EXTRA_DIST = \
        bindparser.h \
        named.conf.parsertest \
        delaypipe.hh delaypipe.cc \
-       pdns.service.in
+       pdns.service.in \
+       ixfrdist.service.in
 
 BUILT_SOURCES = \
        bind-dnssec.schema.sqlite3.sql.h \
@@ -1357,4 +1358,13 @@ systemdsystemunitdir = $(SYSTEMD_DIR)
 systemdsystemunit_DATA = \
        pdns.service \
        pdns@.service
-endif
+
+if TOOLS
+ixfrdist.service: ixfrdist.service.in
+       $(AM_V_GEN)sed -e 's![@]bindir[@]!$(bindir)!' < $< > $@
+
+systemdsystemunit_DATA += \
+       ixfrdist.service
+endif # TOOLS
+
+endif # HAVE_SYSTEMD

diff --git a/pdns/ixfrdist.service.in b/pdns/ixfrdist.service.in
new file mode 100644 (file)
index 0000000..8f7c8e4
--- /dev/null
+++ b/pdns/ixfrdist.service.in
@@ -0,0 +1,24 @@
+[Unit]
+Description=PowerDNS IXFR Distributor
+Documentation=man:ixfrdist(1)
+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
+StartLimitInterval=0
+PrivateTmp=true
+PrivateDevices=true
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+NoNewPrivileges=true
+ProtectSystem=full
+ProtectHome=true
+RestrictAddressFamilies=AF_INET AF_INET6
+
+[Install]
+WantedBy=multi-user.target