From d5fb304403263b129d709c9fb312363aece229b4 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 21 Apr 2016 14:09:20 -0400
Subject: [PATCH] Fixed a problem with metronome restart on update.
---
install/apps/metronome-init | 4 ++--
install/update.php | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/install/apps/metronome-init b/install/apps/metronome-init
index 78ba7ea..19e0a19 100644
--- a/install/apps/metronome-init
+++ b/install/apps/metronome-init
@@ -35,12 +35,12 @@
reload()
{
- &METRONOME reload >> /dev/null
+ $METRONOME reload >> /dev/null
}
restart()
{
- &METRONOME restart >> /dev/null
+ $METRONOME restart >> /dev/null
}
case "$1" in
diff --git a/install/update.php b/install/update.php
index 8f818df..29ffcb4 100644
--- a/install/update.php
+++ b/install/update.php
@@ -526,7 +526,9 @@
}
if($conf['services']['xmpp']) {
- if($conf['xmpp']['installed'] == true && $conf['xmpp']['init_script'] != '') system($inst->getinitcommand($conf['xmpp']['init_script'], 'restart').' &> /dev/null');
+ //if($conf['xmpp']['installed'] == true && $conf['xmpp']['init_script'] != '') system($inst->getinitcommand($conf['xmpp']['init_script'], 'restart').' &> /dev/null');
+ // There is no metronome systemd unit at the moment, so we always use the init script.
+ if($conf['xmpp']['installed'] == true && $conf['xmpp']['init_script'] != '') system('/etc/init.d/metronome restart &> /dev/null');
}
if($conf['services']['proxy']) {
--
Gitblit v1.9.1