From 8cf78b31b28b9183579c7939b947e1f7e9f5c2fa Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 12 Jan 2012 04:54:19 -0500
Subject: [PATCH] Merged revisions 2812-2883 from staböe branch.

---
 server/conf/bastille-firewall.cfg.master |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/server/conf/bastille-firewall.cfg.master b/server/conf/bastille-firewall.cfg.master
index b9658c9..b2b6536 100644
--- a/server/conf/bastille-firewall.cfg.master
+++ b/server/conf/bastille-firewall.cfg.master
@@ -75,7 +75,7 @@
 # use the "\" continuation character (so Bastille can change the
 # values if it is run more than once)
 TRUSTED_IFACES="lo"                                        # MINIMAL/SAFEST
-PUBLIC_IFACES="eth+ ppp+ slip+ venet+"                        # SAFEST
+PUBLIC_IFACES="eth+ ppp+ slip+ venet+ bond+"                        # SAFEST
 INTERNAL_IFACES=""                                # SAFEST
 
 

--
Gitblit v1.9.1