From bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 08:49:59 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master
---
install/update.php | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/install/update.php b/install/update.php
index 1999bc0..3fd346a 100644
--- a/install/update.php
+++ b/install/update.php
@@ -344,10 +344,15 @@
if($conf['services']['firewall']) {
- if($conf['bastille']['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
swriteln('Configuring Bastille Firewall');
- $inst->configure_firewall();
+ $inst->configure_bastille_firewall();
}
}
@@ -429,7 +434,7 @@
}
if($conf['services']['firewall']) {
- //if($conf['ufw']['installed'] == true && $conf['ufw']['init_script'] != '' && is_executable($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_executable($conf['init_scripts'].'/'.$conf['ufw']['init_script'])) system($conf['init_scripts'].'/'.$conf['ufw']['init_script'].' restart &> /dev/null');
}
}
--
Gitblit v1.9.1