From 8cf955c1e06bd450342fbf742da4d2031646f23a Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 29 Sep 2011 08:50:17 -0400
Subject: [PATCH] Fixed: Vserver enabled on servers where openvz is not installed.

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

diff --git a/install/install.php b/install/install.php
index 4a04ec3..a31efbc 100644
--- a/install/install.php
+++ b/install/install.php
@@ -531,17 +531,18 @@
 	
 	//** Configure Firewall
 	if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') {	
-		if($conf['bastille']['installed'] == true) {
+		//if($conf['bastille']['installed'] == true) {
 			//* Configure Bastille Firewall
 			$conf['services']['firewall'] = true;
 			swriteln('Configuring Bastille Firewall');
 			$inst->configure_firewall();
-		} elseif($conf['ufw']['installed'] == true) {
+		/*} elseif($conf['ufw']['installed'] == true) {
 			//* Configure Ubuntu Firewall
 			$conf['services']['firewall'] = true;
 			swriteln('Configuring Ubuntu Firewall');
 			$inst->configure_ufw_firewall();
 		}
+		*/
 	}
 	
 	//** Configure Firewall

--
Gitblit v1.9.1