D2216.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D2216.diff
View Options

	diff --git a/roles/core/network/files/dwellers_ipv6.sh.jinja b/roles/core/network/files/dwellers_ipv6.sh.jinja
	--- a/roles/core/network/files/dwellers_ipv6.sh.jinja
	+++ b/roles/core/network/files/dwellers_ipv6.sh.jinja
	@@ -16,22 +16,19 @@
	# and will be lost if the state is redeployed.
	# </auto-generated>

	-IP=/sbin/ip
	-
	# -------------------------------------------------------------
	# Hurricane Electric tunnel
	# nasqueron-2.tunnel.tserv10.par1.ipv6.he.net
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	-$IP tunnel del he-ipv6
	-
	-$IP tunnel add he-ipv6 mode sit remote 216.66.84.42 local 51.255.124.11 ttl 255
	-$IP link set he-ipv6 up
	-$IP addr add 2001:470:1f12:ce7::2/64 dev he-ipv6
	-$IP route change ::/0 dev he-ipv6
	+ifconfig sit0 up
	+ifconfig sit0 inet6 tunnel ::216.66.84.42
	+ifconfig sit1 up
	+ifconfig sit1 inet6 add 2001:470:1f12:ce7::2/64
	+route -A inet6 add ::/0 dev sit1

	# -------------------------------------------------------------
	# Canonical IP
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	-$IP addr add 2001:470:1f13:ce7:ca5:cade:fab:1e/64 dev he-ipv6
	+ifconfig sit1 inet6 add 2001:470:1f13:ce7:ca5:cade:fab:1e/64
	diff --git a/roles/core/userland-software/init.sls b/roles/core/userland-software/init.sls
	--- a/roles/core/userland-software/init.sls
	+++ b/roles/core/userland-software/init.sls
	@@ -95,6 +95,7 @@
	- wget
	{% if grains['os'] != 'FreeBSD' %}
	- {{ packages.netcat }}
	+ - net-tools
	{% endif %}
	{% if grains['os_family'] == 'RedHat' %}
	- psmisc