From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Tue, 4 Feb 2025 14:13:08 +0000 (+0100)
Subject: mangle unit file to take into account bindir and multiple instances
X-Git-Tag: dnsdist-2.0.0-alpha1~96^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f9b478f07a0842cf68166dba4b0e5da30bbe742f;p=thirdparty%2Fpdns.git

mangle unit file to take into account bindir and multiple instances
---

diff --git a/pdns/recursordist/Makefile.am b/pdns/recursordist/Makefile.am
index 92dcd7583a..331408fa8f 100644
--- a/pdns/recursordist/Makefile.am
+++ b/pdns/recursordist/Makefile.am
@@ -623,7 +623,7 @@ endif
 
 if HAVE_SYSTEMD
 pdns-recursor.service: pdns-recursor.service.in
-	$(AM_V_GEN)sed -e 's![@]sbindir[@]!$(sbindir)!' -e 's![@]service_user[@]!$(service_user)!' -e 's![@]service_group[@]!$(service_group)!' < $< > $@
+	$(AM_V_GEN)sed -e 's![@]bindir[@]!$(bindir)!' -e 's![@]sbindir[@]!$(sbindir)!' -e 's![@]service_user[@]!$(service_user)!' -e 's![@]service_group[@]!$(service_group)!' < $< > $@
 if !HAVE_SYSTEMD_WITH_RUNTIME_DIR_ENV
 if HAVE_SYSTEMD_PERCENT_T
 	$(AM_V_GEN)sed -e 's!/pdns_recursor!& --socket-dir=%t/pdns-recursor!' -i $@
@@ -697,6 +697,7 @@ pdns-recursor@.service: pdns-recursor.service
 	$(AM_V_GEN)sed -e 's!/pdns_recursor!& --config-name=%i!' \
 	  -e 's!Recursor!& %i!' \
 	  -e 's!SyslogIdentifier=.*!&-%i!' \
+	  -e 's!--socket-dir=%t/pdns-recursor!--socket-dir=%t/pdns-recursor-%i --config-name=%i!' \
 	  < $< > $@
 if HAVE_SYSTEMD_PERCENT_T
 	$(AM_V_GEN)sed -e 's!RuntimeDirectory=.*!&-%i!' -i $@