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/install.php | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/install/install.php b/install/install.php
index 91759f2..3aedfef 100644
--- a/install/install.php
+++ b/install/install.php
@@ -347,6 +347,13 @@
}
*/
+ //* Configure XMPP
+ if($conf['xmpp']['installed'] == true){
+ $conf['services']['xmpp'] = true;
+ swriteln('Configuring Metronome XMPP Server');
+ $inst->configure_xmpp();
+ }
+
//* Configure ISPConfig
swriteln('Installing ISPConfig');
@@ -398,6 +405,7 @@
//if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_file($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');
if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '') system($inst->getinitcommand($conf['ufw']['init_script'], 'restart').' &> /dev/null');
+ if($conf['xmpp']['installed'] == true && $conf['xmpp']['init_script'] != '') system($inst->getinitcommand($conf['xmpp']['init_script'], 'restart').' &> /dev/null');
} else {
@@ -408,6 +416,7 @@
$conf['services']['db'] = true;
$conf['services']['firewall'] = false;
$conf['services']['proxy'] = false;
+ $conf['services']['xmpp'] = false;
//** Get Server ID
@@ -639,6 +648,16 @@
$inst->configure_firewall();
}*/
+ //** Configure XMPP
+ if($conf['xmpp']['installed'] == true){
+ if(strtolower($inst->simple_query('Configure Metronome XMPP Server', array('y', 'n'), 'y', 'configure_xmpp')) == 'y'){
+ $conf['services']['xmpp'] = true;
+ swriteln('Configuring Metronome XMPP Server');
+ $inst->configure_xmpp();
+ if($conf['xmpp']['installed'] == true && $conf['xmpp']['init_script'] != '') system($inst->getinitcommand($conf['xmpp']['init_script'], 'restart').' &> /dev/null');
+ }
+ }
+
//** Configure ISPConfig :-)
$install_ispconfig_interface_default = ($conf['mysql']['master_slave_setup'] == 'y')?'n':'y';
if(strtolower($inst->simple_query('Install ISPConfig Web Interface', array('y', 'n'), $install_ispconfig_interface_default,'install_ispconfig_web_interface')) == 'y') {
--
Gitblit v1.9.1