From dec0dfa3a81e23a5a123be56ae8b36e0f1ed9137 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 22 Feb 2012 09:47:32 -0500
Subject: [PATCH] Merged revisions 2916-2941 from stable branch.

---
 install/install.php |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/install/install.php b/install/install.php
index 0255c12..46c313e 100644
--- a/install/install.php
+++ b/install/install.php
@@ -281,7 +281,10 @@
 	swriteln('Installing ISPConfig');
 	
 	//** Customize the port ISPConfig runs on
-	$conf['apache']['vhost_port'] = $inst->free_query('ISPConfig Port', '8080');
+	$ispconfig_vhost_port = $inst->free_query('ISPConfig Port', '8080');
+	if($conf['apache']['installed'] == true) $conf['apache']['vhost_port']  = $ispconfig_vhost_port;
+	if($conf['nginx']['installed'] == true) $conf['nginx']['vhost_port']  = $ispconfig_vhost_port;
+	unset($ispconfig_vhost_port);
 
 	if(strtolower($inst->simple_query('Do you want a secure (SSL) connection to the ISPConfig web interface',array('y','n'),'y')) == 'y') {
 	  $inst->make_ispconfig_ssl_cert();

--
Gitblit v1.9.1