From 8eb646a8abd3c39d37adb64d3908cd6ee6b1e5a8 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 24 Jun 2011 04:09:53 -0400
Subject: [PATCH] Fixed a firewall configuration problem.
---
install/install.php | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/install/install.php b/install/install.php
index e657f69..f84c5d8 100644
--- a/install/install.php
+++ b/install/install.php
@@ -229,19 +229,17 @@
$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
--
Gitblit v1.9.1