Ensure runtime dirs for virtual services differ

(cherry picked from commit fcbada458f4625736ba962d6523339b0c34a04f0)

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 9de4b641d4c475fa9b292e0c3d7374bef2520c04..2f68d26e51f0bf6917527d745046420fae462766 100644 (file)
--- 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 163d4413802daa3d48c167834e3d5fccc3aa4a47..728aae7677caca579463fd8d1f786b61c5c77ee0 100644 (file)
--- 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 565bd70d3b15b6c29615731b468574c2aef08820..e5a5c038bde2d70c2f4a5bc1e1335c9099b1ac6d 100644 (file)
--- 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)