From c96ef3505b2e8450638ce784fe4cb8887f067f9b Mon Sep 17 00:00:00 2001
From: Matus Honek <mhonek@redhat.com>
Date: Jun 07 2019 12:41:14 +0000
Subject: Issue 50365 - PIDFile= references path below legacy directory /var/run/


Bug description:
SystemD complains the PIDFile= in the .service file points into a legacy
directory /var/run

Fix description:
Drop '@localstatedir@' which interpolates to '/var'. Although the actual
directory referenced everywhere else is the one prefixed with '/var' it
should not pose a problem since every environment SystemD is supposed to
run in has to have absolute path `/run' present which is effectively
always linked to the legacy '/var/run'.

Fixes https://pagure.io/389-ds-base/issue/50365

Author: Matus Honek <mhonek@redhat.com>

Review by: mreynolds, vashirov, firstyear (thanks!)

---

diff --git a/wrappers/systemd-snmp.service.in b/wrappers/systemd-snmp.service.in
index f1b895c..690afec 100644
--- a/wrappers/systemd-snmp.service.in
+++ b/wrappers/systemd-snmp.service.in
@@ -9,7 +9,7 @@ After=syslog.target network.target
 
 [Service]
 Type=forking
-PIDFile=@localstatedir@/run/ldap-agent.pid
+PIDFile=/run/ldap-agent.pid
 ExecStart=@sbindir@/ldap-agent @configdir@/ldap-agent.conf 
 
 [Install]
diff --git a/wrappers/systemd.template.service.in b/wrappers/systemd.template.service.in
index 2ac6f97..e44f3c4 100644
--- a/wrappers/systemd.template.service.in
+++ b/wrappers/systemd.template.service.in
@@ -12,9 +12,9 @@ Type=notify
 NotifyAccess=all
 EnvironmentFile=-@initconfigdir@/@package_name@
 EnvironmentFile=-@initconfigdir@/@package_name@-%i
-PIDFile=@localstatedir@/run/@package_name@/slapd-%i.pid
+PIDFile=/run/@package_name@/slapd-%i.pid
 ExecStartPre=@libexecdir@/ds_systemd_ask_password_acl @instconfigdir@/slapd-%i/dse.ldif
-ExecStart=@sbindir@/ns-slapd -D @instconfigdir@/slapd-%i -i @localstatedir@/run/@package_name@/slapd-%i.pid
+ExecStart=@sbindir@/ns-slapd -D @instconfigdir@/slapd-%i -i /run/@package_name@/slapd-%i.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/wrappers/systemd.template.service.xsan.conf.in b/wrappers/systemd.template.service.xsan.conf.in
index f4bf809..6818bcf 100644
--- a/wrappers/systemd.template.service.xsan.conf.in
+++ b/wrappers/systemd.template.service.xsan.conf.in
@@ -5,7 +5,7 @@ Description=@capbrand@ Directory Server with @SANITIZER@ %i.
 
 [Service]
 # We can't symbolize here, as llvm symbolize crashes when it goes near systemd.
-Environment=ASAN_OPTIONS=log_path=@localstatedir@/run/@package_name@/ns-slapd-%i.asan:print_stacktrace=1
-Environment=TSAN_OPTIONS=log_path=@localstatedir@/run/@package_name@/ns-slapd-%i.tsan:print_stacktrace=1:second_deadlock_stack=1:history_size=7
-Environment=MSAN_OPTIONS=log_path=@localstatedir@/run/@package_name@/ns-slapd-%i.msan:print_stacktrace=1
-Environment=UBSAN_OPTIONS=log_path=@localstatedir@/run/@package_name@/ns-slapd-%i.ubsan:print_stacktrace=1
+Environment=ASAN_OPTIONS=log_path=/run/@package_name@/ns-slapd-%i.asan:print_stacktrace=1
+Environment=TSAN_OPTIONS=log_path=/run/@package_name@/ns-slapd-%i.tsan:print_stacktrace=1:second_deadlock_stack=1:history_size=7
+Environment=MSAN_OPTIONS=log_path=/run/@package_name@/ns-slapd-%i.msan:print_stacktrace=1
+Environment=UBSAN_OPTIONS=log_path=/run/@package_name@/ns-slapd-%i.ubsan:print_stacktrace=1