diff --git a/hosts/eva-down b/hosts/eva-down new file mode 100755 index 0000000..0d86976 --- /dev/null +++ b/hosts/eva-down @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd) +source "$SCRIPT_DIR/../lib/core.bash" +source "$SCRIPT_DIR/../lib/route.bash" + +remove_route6 "$INTERFACE" "fc00::" "7" "fe80::2" diff --git a/hosts/eva-up b/hosts/eva-up new file mode 100755 index 0000000..31a9086 --- /dev/null +++ b/hosts/eva-up @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd) +source "$SCRIPT_DIR/../lib/core.bash" +source "$SCRIPT_DIR/../lib/route.bash" + +add_route6 "$INTERFACE" "fc00::" "7" "fe80::2" diff --git a/hosts/eve-down b/hosts/eve-down new file mode 100755 index 0000000..c63e095 --- /dev/null +++ b/hosts/eve-down @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd) +source "$SCRIPT_DIR/../lib/core.bash" +source "$SCRIPT_DIR/../lib/route.bash" + +remove_route6 "$INTERFACE" "fc00::" "8" "fe80::1" +remove_route6 "$INTERFACE" "fd00::" "8" "fe80::1" diff --git a/hosts/eve-up b/hosts/eve-up new file mode 100755 index 0000000..0d432a3 --- /dev/null +++ b/hosts/eve-up @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd) +source "$SCRIPT_DIR/../lib/core.bash" +source "$SCRIPT_DIR/../lib/route.bash" + +add_route6 "$INTERFACE" "fc00::" "8" "fe80::1" +add_route6 "$INTERFACE" "fd00::" "8" "fe80::1" diff --git a/tinc-up b/tinc-up index 7c6d257..03c5e16 100755 --- a/tinc-up +++ b/tinc-up @@ -35,8 +35,7 @@ MAC_ADDRESS="" SUBNET="" DHCP="yes" ULA_IP6_TEMPLATE="fdc0:4992:6a6d:a:%x%x:%x%x::1" -PUBLIC_IP6_PREFIX="2a01:4f8:210:31fd" -PUBLIC_IP6_TEMPLATE="$PUBLIC_IP6_PREFIX:1:%x%x:%x%x:1" +PUBLIC_IP6_TEMPLATE="2a01:4f8:210:31fd:1:%x%x:%x%x:1" source "${TINCRC}" || true @@ -52,9 +51,6 @@ ula_ip6="$(format_ip6_from_mac $ULA_IP6_TEMPLATE $MAC_ADDRESS)" add_ip6 "$INTERFACE" "$public_ip6" "80" add_ip6 "$INTERFACE" "$ula_ip6" "64" -add_route6 "$INTERFACE" "fc00::" "fe80::3" "7" -add_route6 "$INTERFACE" "$PUBLIC_IP6_PREFIX::" "fe80::3" "64" - if [ -n "$SUBNET" ]; then IFS=' ' read ip netmask <<< "$SUBNET" [ -z "$ip" ] && die "no ip set in SUBNET"