Forward Firewall: some changes in firewall script to make collectd work

[people/teissler/ipfire-2.x.git] / config / forwardfw / firewall-policy

diff --git a/config/forwardfw/firewall-policy b/config/forwardfw/firewall-policy
index 55287dd074518f3185c8f31241adcb13d12f2bf9..9af835cc9cc92261f6333572a1ad855a7bf4f9d3 100755 (executable)
--- a/config/forwardfw/firewall-policy
+++ b/config/forwardfw/firewall-policy
@@ -2,11 +2,15 @@
 
 eval $(/usr/local/bin/readhash /var/ipfire/forward/settings)
 eval $(/usr/local/bin/readhash /var/ipfire/optionsfw/settings)
+eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
 
 iptables -F POLICYFWD
 iptables -F POLICYOUT
 iptables -F POLICYIN
-IFACE=`cat /var/ipfire/red/iface`
+
+if [ -f "/var/ipfire/red/iface" ]; then
+       IFACE=`cat /var/ipfire/red/iface`
+fi
 
 #FORWARDFW
 if [ "$POLICY" == "MODE1" ]; then
@@ -23,8 +27,10 @@ if [ "$POLICY" == "MODE1" ]; then
                        /sbin/iptables -A POLICYFWD -j DROP -m comment --comment "DROP_FORWARD"
                fi
 else
-       /sbin/iptables -A POLICYFWD -i blue0 ! -o $IFACE -j DROP -m comment --comment "DROP_FORWARD_BLUE"
-       /sbin/iptables -A POLICYFWD -j ACCEPT -m comment --comment "DROP_FORWARD"
+       if [  "$BLUE_DEV" ] && [ "$IFACE" ]; then
+               /sbin/iptables -A POLICYFWD -i blue0 ! -o $IFACE -j DROP 
+       fi
+       /sbin/iptables -A POLICYFWD -j ACCEPT 
 fi
 
 #OUTGOINGFW
@@ -42,7 +48,7 @@ if [ "$POLICY1" == "MODE1" ]; then
                        /sbin/iptables -A POLICYOUT -j DROP -m comment --comment "DROP_OUTPUT"
        fi
 else
-       /sbin/iptables -A POLICYOUT -j ACCEPT -m comment --comment "DROP_OUTPUT"
+       /sbin/iptables -A POLICYOUT -j ACCEPT 
 fi
 #INPUT
 if [ "$FWPOLICY2" == "REJECT" ]; then