From 0a1f027bd9b71d618376e1365c35d95d97b15782 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 07 Dec 2008 10:32:29 -0500
Subject: [PATCH] - Detect installed services - Update server.ini during install - Changed default vmail directory form /home/vmail to /var/vmail

---
 install/install.php |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/install/install.php b/install/install.php
index 1764188..c934555 100644
--- a/install/install.php
+++ b/install/install.php
@@ -89,6 +89,9 @@
 	die('This software can not be installed on a server wich runs ISPConfig 2.x.');
 }
 
+//** Detect the installed applications
+$inst->find_installed_apps();
+
 //** Select the language
 $conf['language'] = $inst->simple_query('Select language', array('en','de'), 'en');
 
@@ -222,7 +225,14 @@
 	if($conf['mydns']['init_script'] != '' && is_file($conf['mydns']['init_script']))					system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
 	
 }else{
-
+	
+	//* In expert mode, we select the services in the following steps, only db is always available
+	$conf['services']['mail'] = false;
+	$conf['services']['web'] = false;
+	$conf['services']['dns'] = false;
+	$conf['services']['db'] = true;
+	
+	
 	//** Get Server ID
 	// $conf['server_id'] = $inst->free_query('Unique Numeric ID of the server','1');
 	// Server ID is an autoInc value of the mysql database now
@@ -275,6 +285,8 @@
 	
 	if(strtolower($inst->simple_query('Configure Mail', array('y','n') ,'y') ) == 'y') {
 		
+		$conf['services']['mail'] = true;
+		
 		//* Configure Postfix
 		swriteln('Configuring Postfix');
 		$inst->configure_postfix();
@@ -325,6 +337,7 @@
 	
 	//** Configure MyDNS
 	if(strtolower($inst->simple_query('Configure DNS Server',array('y','n'),'y')) == 'y') {
+		$conf['services']['dns'] = true;
 		swriteln('Configuring MyDNS');
 		$inst->configure_mydns();
 		if($conf['mydns']['init_script'] != '')	system($conf['init_scripts'].'/'.$conf['mydns']['init_script'].' restart &> /dev/null');
@@ -333,6 +346,7 @@
 	//** Configure Apache
 	swriteln("\nHint: If this server shall run the ispconfig interface, select 'y' in the next option.\n");
 	if(strtolower($inst->simple_query('Configure Apache Server',array('y','n'),'y')) == 'y') {	
+		$conf['services']['web'] = true;
 		swriteln('Configuring Apache');
 		$inst->configure_apache();
 	}

--
Gitblit v1.9.1