From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 29 Apr 2020 08:12:03 +0000 (+0200)
Subject: Ensure runtime dirs for virtual services differ
X-Git-Tag: rec-4.3.4~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f1aa30d129d5ad1724194e0ff45f2e20bd4941f;p=thirdparty%2Fpdns.git

Ensure runtime dirs for virtual services differ

(cherry picked from commit fcbada458f4625736ba962d6523339b0c34a04f0)
---

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 9de4b641d4..2f68d26e51 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1596,6 +1596,7 @@ endif
 pdns@.service: pdns.service
 	$(AM_V_GEN)sed -e 's!/pdns_server!& --config-name=%i!' \
 	  -e 's!Authoritative Server!& %i!' \
+	  -e 's!RuntimeDirectory=.*!&-%i!' \
 	  < $< > $@
 
 systemdsystemunitdir = $(SYSTEMD_DIR)
diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 163d441380..728aae7677 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -439,7 +439,9 @@ if !HAVE_SYSTEMD_SYSTEM_CALL_FILTER
 endif
 
 dnsdist@.service: dnsdist.service
-	$(AM_V_GEN)sed -e 's!/dnsdist !&--config $(sysconfdir)/dnsdist-%i.conf !' < $< >$@
+	$(AM_V_GEN)sed -e 's!/dnsdist !&--config $(sysconfdir)/dnsdist-%i.conf !' \
+	  -e 's!RuntimeDirectory=.*!&-%i!' \
+	  < $< >$@
 
 systemdsystemunitdir = $(SYSTEMD_DIR)
 
diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 565bd70d3b..e5a5c038bd 100644
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -546,6 +546,7 @@ endif
 pdns-recursor@.service: pdns-recursor.service
 	$(AM_V_GEN)sed -e 's!/pdns_recursor!& --config-name=%i!' \
 	  -e 's!Recursor!& %i!' \
+	  -e 's!RuntimeDirectory=.*!&-%i!' \
 	  < $< > $@
 
 systemdsystemunitdir = $(SYSTEMD_DIR)