From f964bf7e7403578e787ce5519d9e63c074967242 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 23 Mar 2016 03:12:16 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
install/lib/installer_base.lib.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index bbf8cfd..481c3e7 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -172,9 +172,9 @@
if(is_installed('squid')) $conf['squid']['installed'] = true;
if(is_installed('nginx')) $conf['nginx']['installed'] = true;
if(is_installed('iptables') && is_installed('ufw')) $conf['ufw']['installed'] = true;
+ if(is_installed('iptables') && is_installed('bastille-netfilter')) $conf['firewall']['installed'] = true;
if(is_installed('fail2ban-server')) $conf['fail2ban']['installed'] = true;
if(is_installed('vzctl')) $conf['openvz']['installed'] = true;
- if(is_installed('iptables') && is_installed('bastille-netfilter')) $conf['bastille']['installed'] = true;
if(is_installed('metronome') && is_installed('metronomectl')) $conf['xmpp']['installed'] = true;
if(is_installed('spamassassin')) $conf['spamassassin']['installed'] = true;
if(is_installed('vlogger')) $conf['vlogger']['installed'] = true;
--
Gitblit v1.9.1