From 461977bd9cba195bbffb677ea417eea69d51dab2 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 21 Apr 2016 14:15:20 -0400
Subject: [PATCH] Metronome init fix 2
---
install/lib/installer_base.lib.php | 2 +-
install/update.php | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 720d85e..9543376 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1630,7 +1630,7 @@
caselog('chmod u+x /etc/init.d/metronome', __FILE__, __LINE__);
caselog('update-rc.d metronome defaults', __FILE__, __LINE__);
- exec($this->getinitcommand('xmpp', 'restart'));
+ exec($this->getinitcommand('metronome', 'restart'));
/*
writing new private key to 'smtpd.key'
diff --git a/install/update.php b/install/update.php
index 29ffcb4..8f818df 100644
--- a/install/update.php
+++ b/install/update.php
@@ -526,9 +526,7 @@
}
if($conf['services']['xmpp']) {
- //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['xmpp']['installed'] == true && $conf['xmpp']['init_script'] != '') system($inst->getinitcommand($conf['xmpp']['init_script'], 'restart').' &> /dev/null');
}
if($conf['services']['proxy']) {
--
Gitblit v1.9.1