Kolab Groupware OBS

Changes of Revision 147

pykolab.spec Changed

fix_wallace_pid_location_centos7.patch Added

@@ -0,0 +1,40 @@
+From 2560d642b84828e6feba4d934b3b7f8e589d141a Mon Sep 17 00:00:00 2001
+From: Timotheus Pokorra <tp@tbits.net>
+Date: Mon, 23 Feb 2015 07:31:21 +0100
+Subject: [PATCH] CentOS7 systemd: use /run/wallaced as location for the pid file (#4673)
+ instead of a mix of /var/run/wallaced and /run/wallaced
+
+---
+ wallace/wallace.systemd         |    4 ++--
+ wallace/wallace.tmpfiles.d.conf |    2 +-
+ 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
+ 
+-- 
+1.7.1
+