From 3282afe85c29fddc3d1c5a07e859f6b9fe897ec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20M=C3=A4user?= <bmaeuser@rogator.de>
Date: Wed, 24 Jan 2018 00:13:06 +0100
Subject: [PATCH 1/4] fix missing {

---
 roles/radvd/templates/radvd.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/radvd/templates/radvd.conf.j2 b/roles/radvd/templates/radvd.conf.j2
index 3cadda5..a751dd9 100644
--- a/roles/radvd/templates/radvd.conf.j2
+++ b/roles/radvd/templates/radvd.conf.j2
@@ -7,7 +7,7 @@ interface br-{{ site_code }} {
   AdvOtherConfigFlag on;
   MaxRtrAdvInterval 200;
   AdvLinkMTU {{ mtu }};
-  prefix {{ batman_ipv6 | ipaddr('address') | ipsubnet(64) }}
+  prefix {{ batman_ipv6 | ipaddr('address') | ipsubnet(64) }} {
     AdvOnLink on;
     AdvAutonomous on;
     AdvRouterAddr on;

From 8dca968108ce3751cec7ad06a9a4bccbf255152e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20M=C3=A4user?= <bmaeuser@rogator.de>
Date: Wed, 24 Jan 2018 00:14:18 +0100
Subject: [PATCH 2/4] re-added missing roles

---
 site.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/site.yml b/site.yml
index f7244a8..a0a908a 100644
--- a/site.yml
+++ b/site.yml
@@ -10,17 +10,17 @@
 - name: Setup gateway servers
   hosts: [gw11.regensburg.freifunk.net, gw21.regensburg.freifunk.net, gw31.regensburg.freifunk.net]
   roles:
-#  - batman
-#  - bird
-#  - fastd
-#  - mesh-interfaces
-#  - exit-ipv4
-#  - dns
+   - batman
+   - bird
+   - fastd
+   - mesh-interfaces
+   - exit-ipv4
+   - dns
    - radvd
-#  - dhcpd
-#  - respondd
-#  - yanic
-#  - web-gw
+   - dhcpd
+   - respondd
+   - yanic
+   - web-gw
 
 - name: Setup confluence server
   hosts: confluence.regensburg.freifunk.net

From 9bd490092ff9bb9261060dfdef88b4f29f1bb73a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20M=C3=A4user?= <bmaeuser@rogator.de>
Date: Wed, 24 Jan 2018 00:30:43 +0100
Subject: [PATCH 3/4] Enable IPV6 Routing for Bird

---
 roles/bird/tasks/main.yml      | 3 +++
 roles/exit-ipv4/tasks/main.yml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/roles/bird/tasks/main.yml b/roles/bird/tasks/main.yml
index 4581749..2a744eb 100644
--- a/roles/bird/tasks/main.yml
+++ b/roles/bird/tasks/main.yml
@@ -3,6 +3,9 @@
 - name: Install bird
   apt: package=bird
 
+- name: Enable IPv6 routing
+  sysctl: name=net.ipv6.ip_forward value=1 state=present
+
 - name: Configure bird
   template: src=bird.conf.j2 dest=/etc/bird/bird.conf
   notify: Restart bird
diff --git a/roles/exit-ipv4/tasks/main.yml b/roles/exit-ipv4/tasks/main.yml
index d94bbaf..9a3105e 100644
--- a/roles/exit-ipv4/tasks/main.yml
+++ b/roles/exit-ipv4/tasks/main.yml
@@ -12,7 +12,7 @@
 - name: Enable nf_conntrack during boot
   lineinfile: dest=/etc/modules line=nf_conntrack
 
-- name: Increas conntrack limit
+- name: Increase conntrack limit
   sysctl: name=net.netfilter.nf_conntrack_max value={{ conntrack_max }} state=present
 
 - name: Configure iptables

From 7b416078398a150e95832a6b9df74c39acec0dff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20M=C3=A4user?= <bmaeuser@rogator.de>
Date: Wed, 24 Jan 2018 00:49:46 +0100
Subject: [PATCH 4/4] Small fix

---
 roles/bird/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/bird/tasks/main.yml b/roles/bird/tasks/main.yml
index 2a744eb..ab01b04 100644
--- a/roles/bird/tasks/main.yml
+++ b/roles/bird/tasks/main.yml
@@ -4,7 +4,7 @@
   apt: package=bird
 
 - name: Enable IPv6 routing
-  sysctl: name=net.ipv6.ip_forward value=1 state=present
+  sysctl: name=net.ipv6.conf.all.forwarding value=1 state=present
 
 - name: Configure bird
   template: src=bird.conf.j2 dest=/etc/bird/bird.conf