diff options
| author | makefu <github@syntax-fehler.de> | 2013-12-29 19:51:38 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2013-12-29 19:51:38 +0100 |
| commit | 1cbd74d5ff6f298af6543839f1f2429d2cc8a868 (patch) | |
| tree | 2847823a103865a536e6a52200318b3e14fdb537 /retiolum/scripts/tinc_setup | |
| parent | 299afb456b31f5d326153723f43a092d7a4a95d9 (diff) | |
| parent | 75f19c77fb0e59e8298b784cdeaceb8cc3bd4931 (diff) | |
Merge branch 'master' of ssh://github.com/krebscode/painload
Diffstat (limited to 'retiolum/scripts/tinc_setup')
| -rwxr-xr-x | retiolum/scripts/tinc_setup/new_install.sh | 2 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/tinc-up | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh index 1ebde38b..50fbc3b5 100755 --- a/retiolum/scripts/tinc_setup/new_install.sh +++ b/retiolum/scripts/tinc_setup/new_install.sh @@ -218,6 +218,8 @@ EOF echo "addr4=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET4[.][^ ]*\\) *\$|\\\\1|p\" \$host)" >> tinc-up echo 'ip -4 addr add $addr4 dev $INTERFACE' >> tinc-up echo "ip -4 route add $FULLSUBNET/$MASK4 dev \$INTERFACE" >> tinc-up + #TODO: variable for network announced + echo "ip -4 route add 172.22.0.0/15 dev \$INTERFACE" >> tinc-up echo '' >> tinc-up echo "addr6=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET6[:][^ ]*\\) *\$|\\\\1|p\" \$host)" >> tinc-up echo 'ip -6 addr add $addr6 dev $INTERFACE' >> tinc-up diff --git a/retiolum/scripts/tinc_setup/tinc-up b/retiolum/scripts/tinc_setup/tinc-up index a829528d..043e1e46 100755 --- a/retiolum/scripts/tinc_setup/tinc-up +++ b/retiolum/scripts/tinc_setup/tinc-up @@ -11,14 +11,9 @@ host=$dirname/hosts/$name ip link set $INTERFACE up addr4=`sed -n 's|^ *Subnet *= *\(10[.][^ ]*\) *$|\1|p' $host` -if [ "$addr4" != '' ];then - ip -4 addr add $addr4 dev $INTERFACE - ip -4 route add 10.243.0.0/16 dev $INTERFACE -else - addr4=`sed -n 's|^ *Subnet *= *\(42[.][^ ]*\) *$|\1|p' $host` - ip -4 addr add $addr4 dev $INTERFACE - ip -4 route add 42.0.0.0/16 dev $INTERFACE -fi +ip -4 addr add $addr4 dev $INTERFACE +ip -4 route add 10.243.0.0/16 dev $INTERFACE +ip -4 route add 172.22.0.0/15 dev $INTERFACE addr6=`sed -n 's|^ *Subnet *= *\(42[:][^ ]*\) *$|\1|p' $host` ip -6 addr add $addr6 dev $INTERFACE |