Mercurial > dovecot > core-2.2

changeset 19760:a46848c73d7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dovecot: improve systemd support
author Aki Tuomi <aki.tuomi@dovecot.net>
date Thu, 18 Feb 2016 19:27:13 +0200
parents ca563b2b6788
children 52a0e0fcf910
files Makefile.am dovecot.service.in
diffstat 2 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Tue Feb 16 18:34:19 2016 +0200
+++ b/Makefile.am	Thu Feb 18 19:27:13 2016 +0200
@@ -47,7 +47,7 @@
 
 if HAVE_SYSTEMD
 %.service: %.service.in
-	$(AM_V_GEN)sed -e 's,@sbindir\@,$(sbindir),g' $< > $@
+	$(AM_V_GEN)sed -e 's,@sbindir\@,$(sbindir),g' -e 's,@bindir\@,$(bindir),g' -e 's,@statedir\@,$(statedir),g' $< > $@
 
 systemdsystemunit_DATA = \
         dovecot.socket \
--- a/dovecot.service.in	Tue Feb 16 18:34:19 2016 +0200
+++ b/dovecot.service.in	Thu Feb 18 19:27:13 2016 +0200
@@ -23,9 +23,14 @@
 After=local-fs.target network.target
 
 [Service]
-Type=simple
-ExecStart=@sbindir@/dovecot -F $OPTIONS
-ExecReload=@sbindir@/dovecot reload
+Type=forking
+ExecStart=@sbindir@/dovecot
+PIDFile=@statedir@dovecot/master.pid
+ExecReload=@bindir@/doveadm reload
+ExecStop=@bindir@/doveadm stop
+ProtectSystem=full
+ProtectHome=false
+PrivateTmp=true
 NonBlocking=yes
 
 [Install]