From e3be9b0e0f867e196f08b9a7bbaff52790c0e7ed Mon Sep 17 00:00:00 2001 From: Ansible Admin Date: Tue, 17 May 2016 23:50:08 +0200 Subject: [PATCH] newn-new-net --- files/named.conf.fftdf | 6 ------ files/radvd.conf.j2 | 3 +-- files/sn_startup.exit.sh.j2 | 4 ++-- 3 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 files/named.conf.fftdf diff --git a/files/named.conf.fftdf b/files/named.conf.fftdf deleted file mode 100644 index 0807a3e..0000000 --- a/files/named.conf.fftdf +++ /dev/null @@ -1,6 +0,0 @@ -zone "fftdf" { - type slave; - masters { 10.188.1.100; }; - file "/var/lib/bind/db.fftdf"; -}; - diff --git a/files/radvd.conf.j2 b/files/radvd.conf.j2 index 6951b8e..10737a0 100644 --- a/files/radvd.conf.j2 +++ b/files/radvd.conf.j2 @@ -3,8 +3,7 @@ interface bat0 { IgnoreIfMissing on; MaxRtrAdvInterval 200; RDNSS {{ sn_mesh_IPv6 }} {}; -# prefix fda0:747e:ab29:7405::/64 { - prefix 2a03:2260:121::/64 { + prefix {{ sn_mesh_IPv6_net }} { AdvOnLink on; AdvAutonomous on; AdvRouterAddr on; diff --git a/files/sn_startup.exit.sh.j2 b/files/sn_startup.exit.sh.j2 index 9c44143..51ce325 100644 --- a/files/sn_startup.exit.sh.j2 +++ b/files/sn_startup.exit.sh.j2 @@ -19,11 +19,11 @@ curl -X POST --data-urlencode 'payload={"text": "{{ sn_hostname }} is rebooted", # Set mark 4 to Freifunk traffic /sbin/iptables -t mangle -A PREROUTING -s 10.0.0.0/8 ! -d 10.0.0.0/8 -j MARK --set-mark 4 -/sbin/ip6tables -t mangle -A PREROUTING -s 2a03:2260:121::/64 ! -d 2a03:2260:121::/64 -j MARK --set-mark 4 +/sbin/ip6tables -t mangle -A PREROUTING -s 2a03:2260:121::/48 ! -d 2a03:2260:121::/48 -j MARK --set-mark 4 # All from FF IPv4 via routing table 42 /bin/ip rule add from {{ sn_ffrl_IPv4 }}/32 lookup 42 -/bin/ip -6 rule add from 2a03:2260:121::/64 lookup 42 +/bin/ip -6 rule add from {{ sn_mesh_IPv6_net }} lookup 42 # Allow MAC address spoofing /sbin/sysctl net.ipv4.conf.bat0.rp_filter=0