X-Git-Url: https://tinc-vpn.org/git/browse?p=wiki;a=blobdiff_plain;f=examples%2Fipv6-network.mdwn;h=6fa788de2d74c74f13b284670fd89a635c036593;hp=6a33e1b673edc4f5aee4688123da048ffa2bcfce;hb=4a8ff30c03c43d74b2870a9a4b8c832768f994e1;hpb=efe7cc888710b8bd054556c8345f3a0c82afb786

diff --git a/examples/ipv6-network.mdwn b/examples/ipv6-network.mdwn
index 6a33e1b..6fa788d 100644
--- a/examples/ipv6-network.mdwn
+++ b/examples/ipv6-network.mdwn
@@ -12,7 +12,7 @@ This document is to highlight an example setup for using tinc to create an IPv6
 ### Example Layout
 
 [[!img examples/fig-ipv6-network.png link=examples/fig-ipv6-network.dia]]
-*Click on the image for the original [DIA](http://en.wikipedia.org/wiki/Dia_(software)) file.*
+*Click on the image for the original [DIA](https://en.wikipedia.org/wiki/Dia_(software)) file.*
 
 ### Scenario Parameters
 
@@ -25,73 +25,82 @@ This document is to highlight an example setup for using tinc to create an IPv6
 
 ### Configuration Files
 
-1. On Debian/Ubuntu systems, an entry in "/etc/network/interfaces" can be used to statically assign the ::1 address for the local LAN. Example:
-	iface eth1 inet6 static
-	address 2001:db8:beef::1::1
-	netmask 64
-	mtu 1280
-  On non Debian/Ubuntu systems, a line can be put in a boot script, such as "ip -6 addr add 2001:db8:beef:1::1/64 dev eth1".
+1. On Debian/Ubuntu systems, an entry in `/etc/network/interfaces` can be used to statically assign the ::1 address for the local LAN. Example:
+<pre>
+iface eth1 inet6 static
+address 2001:db8:beef::1::1
+netmask 64
+mtu 1280
+<pre>
+On non Debian/Ubuntu systems, a line can be put in a boot script, such as `ip -6 addr add 2001:db8:beef:1::1/64 dev eth1`.
 
-2. IPv6 forwarding needs to be enabled: put "echo "1" >/proc/sys/net/ipv6/conf/all/forwarding" in a boot script, or "net.ipv6.conf.all.forwarding = 1" in "/etc/sysctl.conf".
+2. IPv6 forwarding needs to be enabled: put `echo "1" >/proc/sys/net/ipv6/conf/all/forwarding` in a boot script, or `net.ipv6.conf.all.forwarding = 1` in `/etc/sysctl.conf`.
 
 3. This setup uses tinc's "switch" mode: subnets are not assigned in the host files; only Address (for ConnectTo targets only) and the key are required in host files.
 
-4. It is assumed that the config files go into something like "/etc/tinc/link" and "/etc/tinc/nets.boot" has an entry for "link". The following table can be used to guide configuration of routers:
-  * "routera" configuration for tinc (the master router):
-	>cat tinc.conf
-	Name = routera
-	Mode = switch
-	Interface = vpn6
-	
-	>cat tinc-up
-	#!/bin/sh
-	#Enable tinc
-	ip -6 link set $INTERFACE up mtu 1280 txqueuelen 1000
-	ip -6 addr add 2001:db8:beef::1/64 dev $INTERFACE
-	ip -6 route add 2001:db8:beef::/48 dev $INTERFACE
-	#Static routing table
-	ip -6 route add 2001:db8:beef:2::/64 via 2001:db8:beef::2
-	ip -6 route add 2001:db8:beef:3::/64 via 2001:db8:beef::3
-	ip -6 route add 2001:db8:beef:4::/64 via 2001:db8:beef::4
-	
-	>cat tinc-down
-	#!/bin/sh
-	#Static routing table
-	ip -6 route del 2001:db8:beef:2::/64 via 2001:db8:beef:::2
-	ip -6 route del 2001:db8:beef:3::/64 via 2001:db8:beef:::3
-	ip -6 route del 2001:db8:beef:4::/64 via 2001:db8:beef:::4
-	#Disable tinc
-	ip -6 route del 2001:db8:beef::/48 dev $INTERFACE
-	ip -6 addr del 2001:db8:beef::1/64 dev $INTERFACE
-	ip -6 link set $INTERFACE down
-  * "routerb" configuration for tinc (the other non-master routers will be like this one):
-	>cat tinc.conf
-	Name=routerb
-	Mode = switch
-	ConnectTo = routera
-	Interface = vpn6
-	
-	>cat tinc-up
-	#!/bin/sh
-	ip -6 link set $INTERFACE up mtu 1280
-	ip -6 addr add 2001:db8:beef::2/64 dev $INTERFACE
-	ip -6 route add default via 2001:db8:beef::1
-	
-	>cat tinc-down
-	#!/bin/sh
-	ip -6 route del default via 2001:db8:beef::1
-	ip -6 addr del 2001:db8:beef::2/64 dev $INTERFACE
-	ip -6 link set $INTERFACE down
-
-5. You can use [radvd](http://www.litech.org/radvd/) or [Quagga](http://www.quagga.net/) to perform [stateless address autoconfiguration](http://www.ietf.org/rfc/rfc2462.txt) on your LAN. This is an example zebra.conf for LAN autoconfiguration (don't forget to enable the zebra daemon):
-	ipv6 forwarding
-	!
-	interface eth1
-	no ipv6 nd suppress-ra
-	ipv6 address 2001:db8:beef:1::1/64
-	ipv6 nd prefix 2001:db8:beef:1::/64
-	ipv6 nd ra-interval 10
-	!
-	interface vpn6
-	!
-	interface lo
+4. It is assumed that the config files go into something like `/etc/tinc/link` and `/etc/tinc/nets.boot` has an entry for "link". The following table can be used to guide configuration of routers.
+
+The "routera" configuration for tinc (the master router):
+<pre>
+>cat tinc.conf
+Name = routera
+Mode = switch
+Interface = vpn6
+
+>cat tinc-up
+#!/bin/sh
+#Enable tinc
+ip -6 link set $INTERFACE up mtu 1280 txqueuelen 1000
+ip -6 addr add 2001:db8:beef::1/64 dev $INTERFACE
+ip -6 route add 2001:db8:beef::/48 dev $INTERFACE
+#Static routing table
+ip -6 route add 2001:db8:beef:2::/64 via 2001:db8:beef::2
+ip -6 route add 2001:db8:beef:3::/64 via 2001:db8:beef::3
+ip -6 route add 2001:db8:beef:4::/64 via 2001:db8:beef::4
+
+>cat tinc-down
+#!/bin/sh
+#Static routing table
+ip -6 route del 2001:db8:beef:2::/64 via 2001:db8:beef:::2
+ip -6 route del 2001:db8:beef:3::/64 via 2001:db8:beef:::3
+ip -6 route del 2001:db8:beef:4::/64 via 2001:db8:beef:::4
+#Disable tinc
+ip -6 route del 2001:db8:beef::/48 dev $INTERFACE
+ip -6 addr del 2001:db8:beef::1/64 dev $INTERFACE
+ip -6 link set $INTERFACE down
+</pre>
+The "routerb" configuration for tinc (the other non-master routers will be like this one):
+<pre>
+>cat tinc.conf
+Name=routerb
+Mode = switch
+ConnectTo = routera
+Interface = vpn6
+
+>cat tinc-up
+#!/bin/sh
+ip -6 link set $INTERFACE up mtu 1280
+ip -6 addr add 2001:db8:beef::2/64 dev $INTERFACE
+ip -6 route add default via 2001:db8:beef::1
+
+>cat tinc-down
+#!/bin/sh
+ip -6 route del default via 2001:db8:beef::1
+ip -6 addr del 2001:db8:beef::2/64 dev $INTERFACE
+ip -6 link set $INTERFACE down
+</pre>
+
+5. You can use [radvd](http://www.litech.org/radvd/) or [Quagga](http://www.quagga.net/) to perform [stateless address autoconfiguration](https://www.ietf.org/rfc/rfc2462.txt) on your LAN. This is an example zebra.conf for LAN autoconfiguration (don't forget to enable the zebra daemon):
+<pre>
+ipv6 forwarding
+!
+interface eth1
+no ipv6 nd suppress-ra
+ipv6 address 2001:db8:beef:1::1/64
+ipv6 nd prefix 2001:db8:beef:1::/64
+ipv6 nd ra-interval 10
+!
+interface vpn6
+!
+interface lo
+</pre>