Ensure runtime dirs for virtual services differ

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 9c18c801e599fc44989681b04f8b0e63e0287571..237a627ffe7f0bc0fa7df2562723742c21092ad7 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1615,6 +1615,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 e8175a567570f0a7f28edaad577c7af31d8b9d7a..a66086d89b4dc122618b3cc10b9d2b90fcef1d4c 100644 (file)
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -468,7 +468,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 6842f7d2487ca8001dff456d2fa82cebf1fdc9aa..a0deddf9dd14727c0d5d6035326188c39e587b2c 100644 (file)
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -549,6 +549,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)