suricata: Change midstream policy to "pass-flow"

[people/pmueller/ipfire-2.x.git] / src / ppp / ip-up

diff --git a/src/ppp/ip-up b/src/ppp/ip-up
index e62ae3fab8d748c28417915ce19c65ff9c25ad4c..2e636e72d934d3c98bbdd9468f5a38f770f61af2 100644 (file)
--- a/src/ppp/ip-up
+++ b/src/ppp/ip-up
@@ -22,37 +22,18 @@
 . /etc/sysconfig/rc
 . $rc_functions
 
-PRIMARY_DNS=$DNS1
-SECONDARY_DNS=$DNS2
-
 eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
 
-if [ "$DNS" == "Automatic" ]; then
-       if [ "$TYPE" == "isdn" ]; then
-               echo -n "$MS_DNS1" > /var/ipfire/red/dns1
-               echo -n "$MS_DNS2" > /var/ipfire/red/dns2
-       else
-               if [ "$PRIMARY_DNS" == "10.11.12.13" ]; then
-                       echo -n "$DNS1" > /var/ipfire/red/dns1
-               else
-                       echo -n "$PRIMARY_DNS" > /var/ipfire/red/dns1
-               fi
-               if [ "$SECONDARY_DNS" == "10.11.12.14" ]; then
-                       echo -n "$DNS2" > /var/ipfire/red/dns2
-               else
-                       echo -n "$SECONDARY_DNS" > /var/ipfire/red/dns2
-               fi
-       fi
-else
-       echo -n "$DNS1" > /var/ipfire/red/dns1
-       echo -n "$DNS2" > /var/ipfire/red/dns2
-fi
-7
+# Write DNS servers to configuration
+echo "${DNS1}" > /var/run/dns1
+echo "${DNS2}" > /var/run/dns2
+
 echo -n "$1" > /var/ipfire/red/iface
 echo -n "$4" > /var/ipfire/red/local-ipaddress
 echo -n "$5" > /var/ipfire/red/remote-ipaddress
 touch /var/ipfire/red/active
 
+/sbin/ip route replace default via ${IPREMOTE} dev ppp0
 run_subdir ${rc_base}/init.d/networking/red.up/
 
 #Check if gateway has answerd to ping, if not replace with ping.ipfire.org
@@ -73,11 +54,8 @@ else
            echo "$FIRE gateway" >> /tmp/hosts
        else
            #DNS lookup failed use direct ip
-           echo "85.88.28.125  gateway" >> /tmp/hosts
+           echo "81.3.27.38    gateway" >> /tmp/hosts
        fi
 fi
 mv /tmp/hosts /etc/hosts
 
-[ -e "/var/ipfire/ppp/nobeeps" ] || /etc/rc.d/init.d/beep up
-
-/sbin/ip route replace default via ${IPREMOTE} dev ppp0