From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 19 Feb 2016 14:11:58 +0000 (+0200)
Subject: dovecot.service: Fixed PIDFile path
X-Git-Tag: 2.2.22.rc1~146
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22d75d47097ca83c6e824a5129d81e8f18fb589b;p=thirdparty%2Fdovecot%2Fcore.git

dovecot.service: Fixed PIDFile path
---

diff --git a/Makefile.am b/Makefile.am
index 67cbd5cc6c..a7be896d2f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,7 +47,7 @@ dovecot-config: dovecot-config.in Makefile
 
 if HAVE_SYSTEMD
 %.service: %.service.in
-	$(AM_V_GEN)sed -e 's,@sbindir\@,$(sbindir),g' -e 's,@bindir\@,$(bindir),g' -e 's,@statedir\@,$(statedir),g' $< > $@
+	$(AM_V_GEN)sed -e 's,@sbindir\@,$(sbindir),g' -e 's,@bindir\@,$(bindir),g' -e 's,@rundir\@,$(rundir),g' $< > $@
 
 systemdsystemunit_DATA = \
         dovecot.socket \
diff --git a/dovecot.service.in b/dovecot.service.in
index 8b4c76d226..d4ad79d894 100644
--- a/dovecot.service.in
+++ b/dovecot.service.in
@@ -25,7 +25,7 @@ After=local-fs.target network.target
 [Service]
 Type=forking
 ExecStart=@sbindir@/dovecot
-PIDFile=@statedir@dovecot/master.pid
+PIDFile=@rundir@/dovecot/master.pid
 ExecReload=@bindir@/doveadm reload
 ExecStop=@bindir@/doveadm stop
 PrivateTmp=true