From: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Date: Tue, 2 Jun 2020 09:49:32 +0000 (+0200)
Subject: Set SyslogIdentifier for multiple instances
X-Git-Tag: dnsdist-1.5.0-rc3~14^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F9187%2Fhead;p=thirdparty%2Fpdns.git

Set SyslogIdentifier for multiple instances

Fixes #8490.
---

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 52f18d5957..bde0e29c5d 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -1625,6 +1625,7 @@ pdns@.service: pdns.service
 	$(AM_V_GEN)sed -e 's!/pdns_server!& --config-name=%i!' \
 	  -e 's!Authoritative Server!& %i!' \
 	  -e 's!RuntimeDirectory=.*!&-%i!' \
+	  -e 's!SyslogIdentifier=.*!&-%i!' \
 	  < $< > $@
 
 systemdsystemunitdir = $(SYSTEMD_DIR)
diff --git a/pdns/pdns.service.in b/pdns/pdns.service.in
index 1ce670228a..76f08f91d3 100644
--- a/pdns/pdns.service.in
+++ b/pdns/pdns.service.in
@@ -7,6 +7,7 @@ After=network-online.target mysqld.service postgresql.service slapd.service mari
 
 [Service]
 ExecStart=@sbindir@/pdns_server --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no
+SyslogIdentifier=pdns_server
 User=@service_user@
 Group=@service_group@
 Type=notify