From cffef25940ced035a5bf9a4537f1ec31ae31f4b8 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Fri, 29 Jan 2016 20:08:34 +0100
Subject: [PATCH] fixed reconfigure services during update

---
 install/update.php | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/install/update.php b/install/update.php
index 60cd81b2e6..04c5289bf3 100644
--- a/install/update.php
+++ b/install/update.php
@@ -177,9 +177,6 @@ $inst = new installer();
 if (!$inst->get_php_version()) die('ISPConfig requieres PHP '.$inst->min_php."\n");
 $inst->is_update = true;
 
-//** Detect the installed applications
-$inst->find_installed_apps();
-
 echo "This application will update ISPConfig 3 on your server.\n\n";
 
 //* Make a backup before we start the update
@@ -304,6 +301,18 @@ if($reconfigure_master_database_rights_answer == 'yes') {
 }
 //}
 
+//** Detect the installed applications
+$inst->find_installed_apps();
+
+$conf['services']['mail'] = $conf['postfix']['installed'];
+if ($conf['powerdns']['installed'] || $conf['bind']['installed'] || $conf['mydns']['installed']) $conf['services']['dns'] = true;
+if ($conf['apache']['installed'] || $conf['nginx']['installed']) $conf['services']['web'] = true;
+$conf['services']['xmpp'] =  $conf['xmpp']['installed'];;
+if ($conf['ufw']['installed'] || $conf['firewall']['installed']) $conf['services']['firewall'] = true;
+$conf['services']['vserver'] = $conf['services']['vserver'];
+$conf['services']['db'] = true;
+
+
 //** Shall the services be reconfigured during update
 $reconfigure_services_answer = $inst->simple_query('Reconfigure Services?', array('yes', 'no', 'selected'), 'yes','reconfigure_services');
 
@@ -323,12 +332,6 @@ if($reconfigure_services_answer == 'yes' || $reconfigure_services_answer == 'sel
 			$inst->configure_mailman('update');
 		}
 
-		//* Configure Jailkit
-		if($inst->reconfigure_app('Jailkit', $reconfigure_services_answer)) {
-			swriteln('Configuring Jailkit');
-			$inst->configure_jailkit();
-		}
-
 		if($conf['dovecot']['installed'] == true && $inst->reconfigure_app('Dovecot', $reconfigure_services_answer)) {
 			//* Configure dovecot
 			swriteln('Configuring Dovecot');
@@ -407,6 +410,13 @@ if($reconfigure_services_answer == 'yes' || $reconfigure_services_answer == 'sel
 			swriteln('Configuring Apps vhost');
 			$inst->configure_apps_vhost();
 			}
+	
+			//* Configure Jailkit
+			if($inst->reconfigure_app('Jailkit', $reconfigure_services_answer)) {
+				swriteln('Configuring Jailkit');
+				$inst->configure_jailkit();
+			}
+
 		}
 
     if($conf['services']['xmpp'] && $inst->reconfigure_app('XMPP', $reconfigure_services_answer)) {
-- 
GitLab