2 commits - kolabd/kolabd.systemd pykolab/setup
Timotheus Pokorra
pokorra at kolabsys.com
Fri Feb 13 12:24:34 CET 2015
kolabd/kolabd.systemd | 4 ++--
pykolab/setup/setup_mysql.py | 9 +++++++--
2 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit 211d7e91775235b7ecd64b069535f6912ca40ce4
Author: Timotheus Pokorra <tp at tbits.net>
Date: Fri Feb 13 10:10:39 2015 +0100
fixing location of kolabd.pid file for systemd. fixing #2626
diff --git a/kolabd/kolabd.systemd b/kolabd/kolabd.systemd
index 92db05e..6d66334 100644
--- a/kolabd/kolabd.systemd
+++ b/kolabd/kolabd.systemd
@@ -4,11 +4,11 @@ After=syslog.target network.target
[Service]
Type=forking
-PIDFile=/var/run/kolabd/kolabd.pid
+PIDFile=/run/kolabd/kolabd.pid
User=kolab
Group=kolab
EnvironmentFile=/etc/sysconfig/kolabd
-ExecStart=/usr/sbin/kolabd $FLAGS
+ExecStart=/usr/sbin/kolabd $FLAGS --pid-file /run/kolabd/kolabd.pid
ExecReload=/bin/kill -HUP $MAINPID
ExecStop=/bin/kill -TERM $MAINPID
commit fd84ecba7e83719f444d930b31d3415056b1c732
Author: Timotheus Pokorra <tp at tbits.net>
Date: Thu Feb 12 15:17:51 2015 +0100
on CentOS7, there is MariaDB instead of MySQL. fixing bug 3877
diff --git a/pykolab/setup/setup_mysql.py b/pykolab/setup/setup_mysql.py
index 2211876..174cbc7 100644
--- a/pykolab/setup/setup_mysql.py
+++ b/pykolab/setup/setup_mysql.py
@@ -39,8 +39,13 @@ def description():
return _("Setup MySQL.")
def execute(*args, **kw):
+ # on CentOS7, there is MariaDB instead of MySQL
+ mysqlservice = 'mysqld.service'
+ if os.path.isfile('/usr/lib/systemd/system/mariadb.service'):
+ mysqlservice = 'mariadb.service'
+
if os.path.isfile('/bin/systemctl'):
- subprocess.call(['/bin/systemctl', 'restart', 'mysqld.service'])
+ subprocess.call(['/bin/systemctl', 'restart', mysqlservice])
elif os.path.isfile('/sbin/service'):
subprocess.call(['/sbin/service', 'mysqld', 'restart'])
elif os.path.isfile('/usr/sbin/service'):
@@ -49,7 +54,7 @@ def execute(*args, **kw):
log.error(_("Could not start the MySQL database service."))
if os.path.isfile('/bin/systemctl'):
- subprocess.call(['/bin/systemctl', 'enable', 'mysqld.service'])
+ subprocess.call(['/bin/systemctl', 'enable', mysqlservice])
elif os.path.isfile('/sbin/chkconfig'):
subprocess.call(['/sbin/chkconfig', 'mysqld', 'on'])
elif os.path.isfile('/usr/sbin/update-rc.d'):
More information about the commits
mailing list