Forward Firewall: rules for collectd now in firewall-policy instead of /etc/init...

diff --git a/config/forwardfw/firewall-policy b/config/forwardfw/firewall-policy
index 9af835cc9cc92261f6333572a1ad855a7bf4f9d3..0a5cd14b0c9366938f57434daaa780b54627433d 100755 (executable)
--- a/config/forwardfw/firewall-policy
+++ b/config/forwardfw/firewall-policy
@@ -31,6 +31,7 @@ else
                /sbin/iptables -A POLICYFWD -i blue0 ! -o $IFACE -j DROP 
        fi
        /sbin/iptables -A POLICYFWD -j ACCEPT 
                /sbin/iptables -A POLICYFWD -i blue0 ! -o $IFACE -j DROP 
        fi
        /sbin/iptables -A POLICYFWD -j ACCEPT 

+       /sbin/iptables -A POLICYFWD -m comment --comment "DROP_FORWARD" -j DROP

 fi
 
 #OUTGOINGFW
 fi
 
 #OUTGOINGFW


@@ -49,6 +50,7 @@ if [ "$POLICY1" == "MODE1" ]; then
        fi
 else
        /sbin/iptables -A POLICYOUT -j ACCEPT 
        fi
 else
        /sbin/iptables -A POLICYOUT -j ACCEPT 

+       /sbin/iptables -A POLICYOUT -m comment --comment "DROP_OUTPUT" -j DROP

 fi
 #INPUT
 if [ "$FWPOLICY2" == "REJECT" ]; then
 fi
 #INPUT
 if [ "$FWPOLICY2" == "REJECT" ]; then


@@ -63,3 +65,5 @@ if [ "$FWPOLICY2" == "DROP" ]; then
        fi
        /sbin/iptables -A POLICYIN -j DROP -m comment --comment "DROP_INPUT"
 fi
        fi
        /sbin/iptables -A POLICYIN -j DROP -m comment --comment "DROP_INPUT"
 fi

+
+exit 0

diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index 3d14143b458d78eeb72c230a7cd5c0787dd791a3..0888145e28a752769c952a2cbfbdc38d38a9011b 100644 (file)
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -276,10 +276,6 @@ case "$1" in
        /sbin/iptables -A OUTPUT -j POLICYOUT
 
        /usr/sbin/firewall-policy
        /sbin/iptables -A OUTPUT -j POLICYOUT
 
        /usr/sbin/firewall-policy

-       
-       #Only for firewall Hits statistik
-       /sbin/iptables -A POLICYFWD -j DROP  -m comment --comment "DROP_FORWARD"
-       /sbin/iptables -A POLICYOUT -j DROP  -m comment --comment "DROP_OUTPUT"

        ;;
   startovpn)  
        # run openvpn
        ;;
   startovpn)  
        # run openvpn


@@ -317,12 +313,6 @@ case "$1" in
        fi
        /sbin/iptables -A FORWARD -j DROP -m comment --comment "DROP_FORWARD"
        
        fi
        /sbin/iptables -A FORWARD -j DROP -m comment --comment "DROP_FORWARD"
        

-       #Only for firewall Hits statistik
-       #/sbin/iptables -A POLICYFWD -j DROP  -m comment --comment "DROP_FORWARD"
-       #/sbin/iptables -A POLICYOUT -j DROP  -m comment --comment "DROP_OUTPUT"
-       
-       
-       

        ;;
   stopovpn)
        # stop openvpn
        ;;
   stopovpn)
        # stop openvpn