From cab4ba3af9dfd02c303d3b4714700269133f35bf Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 31 Mar 2015 05:35:38 -0400
Subject: [PATCH] Merge branch 'Quest/ispconfig3-master'
---
install/update.php | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/install/update.php b/install/update.php
index 311c070..8e05318 100644
--- a/install/update.php
+++ b/install/update.php
@@ -392,6 +392,11 @@
$inst->configure_apps_vhost();
}
+ if($conf['services']['xmpp']) {
+ //** Configure Metronome XMPP
+ $inst->configure_xmpp('dont-create-certs');
+ }
+
//* Configure DBServer
swriteln('Configuring Database');
@@ -494,6 +499,10 @@
if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '') system($inst->getinitcommand($conf['bind']['init_script'], 'restart').' &> /dev/null');
}
+ 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['services']['proxy']) {
// if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['squid']['init_script'])) system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '') system($inst->getinitcommand($conf['nginx']['init_script'], 'restart').' &> /dev/null');
--
Gitblit v1.9.1