From dc7aa0813f52eed4eb039a21ee13d6a5cb7f104c Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 19 May 2016 05:01:32 -0400
Subject: [PATCH] Merge branch 'master' into 'stable-3.1'

---
 install/lib/installer_base.lib.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 9543376..334a16b 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('metronome', 'restart'));
+        exec($this->getinitcommand($conf['xmpp']['init_script'], 'restart'));
 
 /*
 writing new private key to 'smtpd.key'

--
Gitblit v1.9.1