From 2de9fd788dff049bd9c154e2ccea37707229fc05 Mon Sep 17 00:00:00 2001
From: hellkat <hellkat@ispconfig3>
Date: Thu, 10 Jan 2013 15:13:04 -0500
Subject: [PATCH] FS#2615 - Fix up ufw installation code - This makes ufw the default if it's found
---
install/install.php | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/install/install.php b/install/install.php
index a3b5708..96c164c 100644
--- a/install/install.php
+++ b/install/install.php
@@ -257,10 +257,17 @@
$inst->configure_apps_vhost();
//* Configure Firewall
- //* Configure Bastille Firewall
- $conf['services']['firewall'] = true;
- swriteln('Configuring Bastille Firewall');
- $inst->configure_firewall();
+ if($conf['ufw']['installed'] == true) {
+ //* Configure Ubuntu Firewall
+ $conf['services']['firewall'] = true;
+ swriteln('Configuring Ubuntu Firewall');
+ $inst->configure_ufw_firewall();
+ } else {
+ //* Configure Bastille Firewall
+ $conf['services']['firewall'] = true;
+ swriteln('Configuring Bastille Firewall');
+ $inst->configure_bastille_firewall();
+ }
//* Configure Fail2ban
if($conf['fail2ban']['installed'] == true) {
@@ -328,7 +335,7 @@
if($conf['bind']['installed'] == true && $conf['bind']['init_script'] != '' && is_executable($conf['init_scripts'].'/'.$conf['bind']['init_script'])) system($conf['init_scripts'].'/'.$conf['bind']['init_script'].' restart &> /dev/null');
//if($conf['squid']['installed'] == true && $conf['squid']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['squid']['init_script'])) system($conf['init_scripts'].'/'.$conf['squid']['init_script'].' restart &> /dev/null');
if($conf['nginx']['installed'] == true && $conf['nginx']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['nginx']['init_script'])) system($conf['init_scripts'].'/'.$conf['nginx']['init_script'].' restart &> /dev/null');
- //if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
+ if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_file($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
}else{
//* In expert mode, we select the services in the following steps, only db is always available
@@ -544,18 +551,17 @@
//** Configure Firewall
if(strtolower($inst->simple_query('Configure Firewall Server',array('y','n'),'y')) == 'y') {
- //if($conf['bastille']['installed'] == true) {
- //* Configure Bastille Firewall
- $conf['services']['firewall'] = true;
- swriteln('Configuring Bastille Firewall');
- $inst->configure_firewall();
- /*} elseif($conf['ufw']['installed'] == true) {
+ if($conf['ufw']['installed'] == true) {
//* Configure Ubuntu Firewall
$conf['services']['firewall'] = true;
swriteln('Configuring Ubuntu Firewall');
$inst->configure_ufw_firewall();
+ } else {
+ //* Configure Bastille Firewall
+ $conf['services']['firewall'] = true;
+ swriteln('Configuring Bastille Firewall');
+ $inst->configure_bastille_firewall();
}
- */
}
//** Configure Firewall
@@ -622,4 +628,4 @@
echo "Installation completed.\n";
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1