From c43417bdeadc95f4ae570839817b08ef63083ee9 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Tue, 28 Nov 2017 18:47:56 +0100
Subject: [PATCH] gw01-new hatte einen falschen key

(cherry picked from commit c7f81cc3b31c7bba333adef9a421a3da15717584)
---
 config/ffhh-nowe.erb | 42 ++++++++++++++++++++++++++++++++++++++++++
 config/ffhh-ost.erb  | 42 ++++++++++++++++++++++++++++++++++++++++++
 config/ffhh-sued.erb |  2 +-
 config/ffhh-west.erb | 42 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 127 insertions(+), 1 deletion(-)
 create mode 100644 config/ffhh-nowe.erb
 create mode 100644 config/ffhh-ost.erb
 create mode 100644 config/ffhh-west.erb

diff --git a/config/ffhh-nowe.erb b/config/ffhh-nowe.erb
new file mode 100644
index 0000000..f7d3f61
--- /dev/null
+++ b/config/ffhh-nowe.erb
@@ -0,0 +1,42 @@
+<%
+site_name = 'Freifunk Hamburg Nordwest'
+site_code = 'ffhh-nowe'
+
+gluon_site_packages += %w( gluon-mesh-batman-adv-15 )
+gluon_ath10k_mesh = "11s"
+
+prefix4 = '10.112.192.0/19'
+prefix6 = '2a03:2267:3::/64'
+
+next_node_ipv4 = '10.112.192.1'
+next_node_ipv6 = '2a03:2267:3::1'
+
+mtu = 1312
+
+gateways = {
+	"gateway01" => {
+		"key" => "aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b",
+		"remotes" => [ '"gw01-new.hamburg.freifunk.net" port 10007' ]
+	},
+	"gateway02" => {
+		"key" => "462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0",
+		"remotes" => [ '"gw02-new.hamburg.freifunk.net" port 10007' ]
+	},
+	"gateway03" => {
+		"key" => "e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546",
+		"remotes" => [ '"gw03-new.hamburg.freifunk.net" port 10007' ]
+	},
+	"gateway04" => {
+		"key" => "a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669",
+		"remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10008' ]
+	},
+	"gateway05" => {
+		"key" => "291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f",
+		"remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10008' ]
+	},
+	"gateway06" => {
+		"key" => "8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43",
+		"remotes" => [ '"gw06-new.hamburg.freifunk.net" port 10008' ]
+	},
+}
+-%>
diff --git a/config/ffhh-ost.erb b/config/ffhh-ost.erb
new file mode 100644
index 0000000..53052c8
--- /dev/null
+++ b/config/ffhh-ost.erb
@@ -0,0 +1,42 @@
+<%
+site_name = 'Freifunk Hamburg Ost'
+site_code = 'ffhh-ost'
+
+gluon_site_packages += %w( gluon-mesh-batman-adv-15 )
+gluon_ath10k_mesh = "11s"
+
+prefix4 = '10.112.224.0/19'
+prefix6 = '2a03:2267:4::/64'
+
+next_node_ipv4 = '10.112.224.1'
+next_node_ipv6 = '2a03:2267:4::1'
+
+mtu = 1312
+
+gateways = {
+	"gateway01" => {
+		"key" => "aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b",
+		"remotes" => [ '"gw01-new.hamburg.freifunk.net" port 10009' ]
+	},
+	"gateway02" => {
+		"key" => "462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0",
+		"remotes" => [ '"gw02-new.hamburg.freifunk.net" port 10009' ]
+	},
+	"gateway03" => {
+		"key" => "e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546",
+		"remotes" => [ '"gw03-new.hamburg.freifunk.net" port 10009' ]
+	},
+	"gateway04" => {
+		"key" => "a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669",
+		"remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10010' ]
+	},
+	"gateway05" => {
+		"key" => "291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f",
+		"remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10010' ]
+	},
+	"gateway06" => {
+		"key" => "8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43",
+		"remotes" => [ '"gw06-new.hamburg.freifunk.net" port 10010' ]
+	},
+}
+-%>
diff --git a/config/ffhh-sued.erb b/config/ffhh-sued.erb
index cc64d7f..65e09f2 100644
--- a/config/ffhh-sued.erb
+++ b/config/ffhh-sued.erb
@@ -15,7 +15,7 @@ mtu = 1312
 
 gateways = {
 	"gateway01" => {
-		"key" => "cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58",
+		"key" => "aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b",
 		"remotes" => [ '"gw01-new.hamburg.freifunk.net" port 10003' ]
 	},
 	"gateway02" => {
diff --git a/config/ffhh-west.erb b/config/ffhh-west.erb
new file mode 100644
index 0000000..428199e
--- /dev/null
+++ b/config/ffhh-west.erb
@@ -0,0 +1,42 @@
+<%
+site_name = 'Freifunk Hamburg West'
+site_code = 'ffhh-west'
+
+gluon_site_packages += %w( gluon-mesh-batman-adv-15 )
+gluon_ath10k_mesh = "11s"
+
+prefix4 = '10.112.96.0/19'
+prefix6 = '2a03:2267:2::/64'
+
+next_node_ipv4 = '10.112.96.1'
+next_node_ipv6 = '2a03:2267:2::1'
+
+mtu = 1312
+
+gateways = {
+	"gateway01" => {
+		"key" => "aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b",
+		"remotes" => [ '"gw01-new.hamburg.freifunk.net" port 10005' ]
+	},
+	"gateway02" => {
+		"key" => "462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0",
+		"remotes" => [ '"gw02-new.hamburg.freifunk.net" port 10005' ]
+	},
+	"gateway03" => {
+		"key" => "e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546",
+		"remotes" => [ '"gw03-new.hamburg.freifunk.net" port 10005' ]
+	},
+	"gateway04" => {
+		"key" => "a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669",
+		"remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10006' ]
+	},
+	"gateway05" => {
+		"key" => "291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f",
+		"remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10006' ]
+	},
+	"gateway06" => {
+		"key" => "8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43",
+		"remotes" => [ '"gw06-new.hamburg.freifunk.net" port 10006' ]
+	},
+}
+-%>