summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimotheus Pokorra <tp@tbits.net>2015-02-23 07:31:21 +0100
committerTimotheus Pokorra <timotheus.pokorra@solidcharity.com>2015-02-23 07:33:20 +0100
commit24d68bfd402e2071402332fa61ed564a196c7cd4 (patch)
tree6b9b1f7aff4b7b2b46452e011af274dc305d4f2d
parent710478e89f4f65190a2fd13912ece4884beb3c71 (diff)
downloadpykolab-24d68bfd402e2071402332fa61ed564a196c7cd4.tar.gz
CentOS7 systemd: use /run/wallaced as location for the pid file (#4673) instead of a mix of /var/run/wallaced and /run/wallaced
-rw-r--r--wallace/wallace.systemd4
-rw-r--r--wallace/wallace.tmpfiles.d.conf2
2 files changed, 3 insertions, 3 deletions
diff --git a/wallace/wallace.systemd b/wallace/wallace.systemd
index 38a6604..c033269 100644
--- a/wallace/wallace.systemd
+++ b/wallace/wallace.systemd
@@ -4,11 +4,11 @@ After=syslog.target network.target
[Service]
Type=forking
-PIDFile=/var/run/wallaced/wallaced.pid
+PIDFile=/run/wallaced/wallaced.pid
User=kolab
Group=kolab
EnvironmentFile=/etc/sysconfig/wallace
-ExecStart=/usr/sbin/wallaced $FLAGS
+ExecStart=/usr/sbin/wallaced $FLAGS --pid-file /run/wallaced/wallaced.pid
ExecReload=/bin/kill -HUP $MAINPID
ExecStop=/bin/kill -TERM $MAINPID
diff --git a/wallace/wallace.tmpfiles.d.conf b/wallace/wallace.tmpfiles.d.conf
index 7dd659a..b072311 100644
--- a/wallace/wallace.tmpfiles.d.conf
+++ b/wallace/wallace.tmpfiles.d.conf
@@ -1,2 +1,2 @@
-d /var/run/wallaced 750 kolab kolab
+d /run/wallaced 750 kolab kolab