From fcbada458f4625736ba962d6523339b0c34a04f0 Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Wed, 29 Apr 2020 10:12:03 +0200 Subject: [PATCH] Ensure runtime dirs for virtual services differ --- pdns/Makefile.am | 1 + pdns/dnsdistdist/Makefile.am | 4 +++- pdns/recursordist/Makefile.am | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pdns/Makefile.am b/pdns/Makefile.am index 9c18c801e5..237a627ffe 100644 --- 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 e8175a5675..a66086d89b 100644 --- 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 6842f7d248..a0deddf9dd 100644 --- 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) -- 2.47.2