X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=ImmaeEu-up;h=e9a4c9fc5063474478c6dda885a7ed73658de359;hb=HEAD;hp=a3784aabf054b17efaa6ced8500b10ce7986f742;hpb=bd3711f0bb5022f389e2cbe1110b185da700ee6d;p=perso%2FImmae%2FConfig%2Ftinc%2Fhosts.git diff --git a/ImmaeEu-up b/ImmaeEu-up index a3784aa..006b86f 100755 --- a/ImmaeEu-up +++ b/ImmaeEu-up @@ -8,6 +8,7 @@ # Give it the right ip and netmask. Remember, the subnet of the # tap device must be larger than that of the individual Subnets # as defined in the host configuration file! +SCRIPT_DIR=$(dirname -- "$( readlink -f -- "$0"; )") SUBDOMAIN=$(echo "$NAME" | sed -e "s/\([A-Z][a-z0-9]*\)/\L\1 /g;" | awk '{ for (i=NF; i>1; i--) printf("%s.",$i); print $1; }') while [ -z "$MYIPS" -o -z "$GWIP" ]; do MYIPS=`getent hosts ${SUBDOMAIN}.immae.eu | cut -d' ' -f1 | tr "\\n" ' '` @@ -18,9 +19,9 @@ rm -f /run/tinc_$NETNAME.vars echo -e "MYIPS=\"$MYIPS\"\nGWIP=\"$GWIP\"" > /run/tinc_$NETNAME.vars ip -6 link set $INTERFACE up mtu 1280 for MYIP in $MYIPS; do - ip -6 addr add $MYIP/80 dev $INTERFACE - ip -6 rule add from $MYIP/80 table 655 - ip -6 rule add to $MYIP/80 table 655 + ip -6 addr add $MYIP/96 dev $INTERFACE + ip -6 rule add from $MYIP/96 table 655 + ip -6 rule add to $MYIP/96 table 655 done ip -6 route add default via $GWIP dev $INTERFACE table 655 -(cd /etc/tinc/$NETNAME/hosts && git pull -q origin master) || true +(cd "$SCRIPT_DIR" && git pull -q origin master) || true