From ed30c60150ffda0301eb1f8d30c93cac94de41df Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 25 Jul 2011 10:38:22 -0400
Subject: [PATCH] Fixed some warnings in the installer.
---
install/install.php | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/install/install.php b/install/install.php
index 9bd13f1..f84c5d8 100644
--- a/install/install.php
+++ b/install/install.php
@@ -229,25 +229,24 @@
$inst->configure_apps_vhost();
//* Configure Firewall
- //swriteln('Configuring Firewall');
- //$inst->configure_firewall();
//** Configure Firewall
- if($conf['bastille']['installed'] == true) {
+ if($conf['ufw']['installed'] == true) {
+ //* Configure UFW Firewall
+ $conf['services']['firewall'] = true;
+ swriteln('Configuring UFW Firewall');
+ $inst->configure_ufw_firewall();
+ } else {
//* Configure Bastille Firewall
$conf['services']['firewall'] = true;
swriteln('Configuring Bastille Firewall');
$inst->configure_firewall();
- } elseif($conf['ufw']['installed'] == true) {
- //* Configure Ubuntu Firewall
- $conf['services']['firewall'] = true;
- swriteln('Configuring Ubuntu Firewall');
- $inst->configure_ufw_firewall();
}
//* Configure Fail2ban
if($conf['fail2ban']['installed'] == true) {
swriteln('Configuring Fail2ban');
$inst->configure_fail2ban();
+ }
if($conf['squid']['installed'] == true) {
$conf['services']['proxy'] = true;
--
Gitblit v1.9.1