From 7290bd76183539ddb774cab9b77e921fb3c9ab7f Mon Sep 17 00:00:00 2001
From: bdobe <bdobe@users.noreply.github.com>
Date: Mon, 10 Apr 2017 19:29:56 +0200
Subject: [PATCH 01/44] Release v0.8.2

---
 README.md | 2 ++
 site.mk   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 50a73cf..2887bb0 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,8 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- 0.8.2: v2016.2.5
+- 0.8.1: v2016.2.4 (ffhh-sued only)
 - 0.8: v2016.1.4
 - 0.7.1: v2015.1.2
 - 0.7: v2015.1
diff --git a/site.mk b/site.mk
index 4d22bed..5ab2da2 100644
--- a/site.mk
+++ b/site.mk
@@ -26,7 +26,7 @@ GLUON_SITE_PACKAGES := \
 	haveged
 
 
-DEFAULT_GLUON_RELEASE := 0.8+exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 0.8.2
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)

From 2ca0605cf45ae4a4245eb18312f76959702c8051 Mon Sep 17 00:00:00 2001
From: Daniel Frank <github-523@danielfrank.net>
Date: Mon, 4 Sep 2017 19:30:10 +0200
Subject: [PATCH 02/44] Update site.conf

---
 site.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/site.conf b/site.conf
index 9352061..8399090 100644
--- a/site.conf
+++ b/site.conf
@@ -127,6 +127,7 @@
 					'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
 					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
 					'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
+					'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
 				},
 			},
 			beta = {
@@ -139,6 +140,7 @@
 					'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
 					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
 					'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
+					'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
 				},
 			},
 			experimental = {

From 075459e28e6c2387ed0bbe680a2b4a1e2ade585b Mon Sep 17 00:00:00 2001
From: Daniel Frank <github-523@danielfrank.net>
Date: Mon, 4 Sep 2017 19:48:33 +0200
Subject: [PATCH 03/44] Preparation 0.8.3

---
 site.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site.mk b/site.mk
index 5ab2da2..bfcd7e3 100644
--- a/site.mk
+++ b/site.mk
@@ -26,7 +26,7 @@ GLUON_SITE_PACKAGES := \
 	haveged
 
 
-DEFAULT_GLUON_RELEASE := 0.8.2
+DEFAULT_GLUON_RELEASE := 0.8.3
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)

From ac9a0cd277ee90ea24490787a71cad2c9c0629d6 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 15 Sep 2017 21:16:49 +0200
Subject: [PATCH 04/44] Struktur fuer mehrere Sites anlegen

---
 .gitignore                        |  3 +++
 Makefile                          | 18 ++++++++++++++++++
 README.md                         |  3 +++
 modules => sites/ffhh/modules     |  0
 site.conf => sites/ffhh/site.conf |  0
 site.mk => sites/ffhh/site.mk     |  0
 6 files changed, 24 insertions(+)
 create mode 100644 Makefile
 rename modules => sites/ffhh/modules (100%)
 rename site.conf => sites/ffhh/site.conf (100%)
 rename site.mk => sites/ffhh/site.mk (100%)

diff --git a/.gitignore b/.gitignore
index b25c15b..865a98f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 *~
+site.conf
+site.mk
+modules
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..5d45c2b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,18 @@
+all: check_site site.mk site.conf modules
+
+.PHONY: check_site
+check_site:
+	if test -z "${SITE}"; then echo Usage: make SITE=ffhh; exit 1; else true; fi
+
+.PHONY: clean
+clean:
+	rm -f site.mk site.conf modules
+
+modules:
+	cp sites/${SITE}/$@ $@
+
+site.conf:
+	cp sites/${SITE}/$@ $@
+
+site.mk:
+	cp sites/${SITE}/$@ $@
diff --git a/README.md b/README.md
index 2887bb0..570c1e1 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,9 @@
     git clone https://github.com/freifunk-gluon/gluon.git            # Get the official Gluon repository
     cd gluon
     git clone https://github.com/freifunkhamburg/site-ffhh.git site  # Get the Freifunk Hamburg site repository
+    cd site
+    make SITE=ffhh
+    cd ..
     make update                                                    # Get other repositories used by Gluon
     make                                                           # Build Gluon
 
diff --git a/modules b/sites/ffhh/modules
similarity index 100%
rename from modules
rename to sites/ffhh/modules
diff --git a/site.conf b/sites/ffhh/site.conf
similarity index 100%
rename from site.conf
rename to sites/ffhh/site.conf
diff --git a/site.mk b/sites/ffhh/site.mk
similarity index 100%
rename from site.mk
rename to sites/ffhh/site.mk

From 19f81f963525922ad0ed6584d0baf56fb3ca0270 Mon Sep 17 00:00:00 2001
From: bdobe <bdobe@users.noreply.github.com>
Date: Fri, 15 Sep 2017 21:55:34 +0200
Subject: [PATCH 05/44] Update gitignore

---
 .gitignore | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 865a98f..0acb982 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 *~
-site.conf
-site.mk
-modules
+/site.conf
+/site.mk
+/modules

From a8a7797831c1e124974f289fe1c4e774d207e659 Mon Sep 17 00:00:00 2001
From: bdobe <bdobe@users.noreply.github.com>
Date: Fri, 15 Sep 2017 21:56:46 +0200
Subject: [PATCH 06/44] Add site ffhh-sued config

---
 sites/ffhh-sued/modules   |   5 ++
 sites/ffhh-sued/site.conf | 134 ++++++++++++++++++++++++++++++++++++++
 sites/ffhh-sued/site.mk   |  40 ++++++++++++
 3 files changed, 179 insertions(+)
 create mode 100644 sites/ffhh-sued/modules
 create mode 100644 sites/ffhh-sued/site.conf
 create mode 100644 sites/ffhh-sued/site.mk

diff --git a/sites/ffhh-sued/modules b/sites/ffhh-sued/modules
new file mode 100644
index 0000000..6416262
--- /dev/null
+++ b/sites/ffhh-sued/modules
@@ -0,0 +1,5 @@
+GLUON_SITE_FEEDS='ffhh_packages'
+
+PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
+PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c
+
diff --git a/sites/ffhh-sued/site.conf b/sites/ffhh-sued/site.conf
new file mode 100644
index 0000000..42f6c0d
--- /dev/null
+++ b/sites/ffhh-sued/site.conf
@@ -0,0 +1,134 @@
+{
+	hostname_prefix = 'GibMirEinenNamen',
+	site_name = 'Freifunk Hamburg Sued',
+	site_code = 'ffhh-sued',
+
+	opkg = {
+		openwrt = 'http://opkg.services.ffhh/%n/%v/%S/packages',
+		extra = {
+			modules = 'http://updates.hamburg.freifunk.net/%GR/stable/archive/modules/gluon-%GS-%GR/%S',
+		},
+	},
+
+	prefix4 = '10.112.64.0/19',
+	prefix6 = '2a03:2267:1::/64',
+
+	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
+	ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh'},
+	regdom = 'DE',
+
+	wifi24 = {
+		channel = 1,
+
+		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+		basic_rate = {6000, 9000, 18000, 36000, 54000},
+
+		ap = {
+			ssid = 'hamburg.freifunk.net',
+		},
+		mesh = {
+			id = '6668682D73756564',
+			mcast_rate = 12000,
+		},
+	},
+
+	wifi5 = {
+		channel = 44,
+		ap = {
+			ssid = 'hamburg.freifunk.net',
+		},
+		mesh = {
+			id = '6668682D73756564',
+			mcast_rate = 12000,
+		},
+	},
+
+	next_node = {
+		ip4 = '10.112.64.1',
+		ip6 = '2a03:2267:1::1',
+
+		mac = '16:41:95:40:f7:dc',
+	},
+
+	fastd_mesh_vpn = {
+		enabled = true,
+		methods = {'salsa2012+umac'},
+		mtu = 1312,
+		groups = {
+			backbone = {
+				limit = 1,
+				peers = {
+					gateway01 = {
+						key = 'cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58',
+						remotes = {'"gw01-new.hamburg.freifunk.net" port 10003'},
+					},
+					gateway02 = {
+						key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
+						remotes = {'"gw02-new.hamburg.freifunk.net" port 10003'},
+					},
+					gateway03 = {
+						key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
+						remotes = {'"gw03-new.hamburg.freifunk.net" port 10003'},
+					},
+					gateway04 = {
+						key = 'fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf',
+						remotes = {'"gw04-new.hamburg.freifunk.net" port 10004'},
+					},
+					gateway05 = {
+						key = '84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5',
+						remotes = {'"gw05-new.hamburg.freifunk.net" port 10004'},
+					},
+					gateway06 = {
+						key = 'fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6',
+						remotes = {'"gw06-new.hamburg.freifunk.net" port 10004'},
+					},
+				},
+			},
+		},
+		bandwidth_limit = {
+			enabled = false,
+			ingress = 8096,
+			egress = 1024,
+		},
+	},
+
+	autoupdater = {
+		branch = 'experimental',
+		branches = {
+			stable = {
+				name = 'stable',
+				mirrors = {'http://1.updates.services.ffhh/ffhh-sued/stable/sysupgrade','http://2.updates.services.ffhh/ffhh-sued/stable/sysupgrade'},
+				good_signatures = 2,
+				pubkeys = {
+					'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
+					'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
+					'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
+					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
+					'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
+				},
+			},
+			beta = {
+				name = 'beta',
+				mirrors = {'http://1.updates.services.ffhh/ffhh-sued/beta/sysupgrade','http://2.updates.services.ffhh/ffhh-sued/beta/sysupgrade'},
+				good_signatures = 2,
+				pubkeys = {
+					'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
+					'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
+					'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
+					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
+					'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
+				},
+			},
+			experimental = {
+				name = 'experimental',
+				mirrors = {'http://1.updates.services.ffhh/ffhh-sued/experimental/sysupgrade','http://2.updates.services.ffhh/ffhh-sued/experimental/sysupgrade'},
+				good_signatures = 1,
+				pubkeys = {
+					'1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', -- 1.builder
+				},
+			},
+		},
+	},
+
+	poe_passthrough = false,
+}
diff --git a/sites/ffhh-sued/site.mk b/sites/ffhh-sued/site.mk
new file mode 100644
index 0000000..3a57deb
--- /dev/null
+++ b/sites/ffhh-sued/site.mk
@@ -0,0 +1,40 @@
+GLUON_SITE_PACKAGES := \
+	gluon-mesh-batman-adv-15 \
+	gluon-autoupdater \
+	gluon-config-mode-autoupdater \
+	gluon-config-mode-core \
+	gluon-config-mode-hostname \
+	gluon-config-mode-mesh-vpn \
+	gluon-config-mode-reboot-ffhh \
+	gluon-ebtables-filter-multicast \
+	gluon-ebtables-filter-ra-dhcp \
+	gluon-ebtables-segment-mld \
+	gluon-luci-admin \
+	gluon-luci-autoupdater \
+	gluon-luci-portconfig \
+	gluon-luci-private-wifi \
+	gluon-luci-wifi-config \
+	gluon-next-node \
+	gluon-mesh-vpn-fastd \
+	gluon-radvd \
+	gluon-respondd \
+	gluon-setup-mode \
+	gluon-status-page \
+	iwinfo \
+	iptables \
+	haveged
+
+
+DEFAULT_GLUON_RELEASE := 0.8.3
+
+# Allow overriding the release number from the command line
+GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
+
+GLUON_PRIORITY ?= 0
+
+# Region code required for some images; supported values: us eu
+GLUON_REGION ?= eu
+
+GLUON_ATH10K_MESH ?= 11s
+
+GLUON_LANGS ?= en de

From 6afc2a9358580bbace653a746f7a8fc0647cf3f2 Mon Sep 17 00:00:00 2001
From: bdobe <bdobe@users.noreply.github.com>
Date: Fri, 15 Sep 2017 22:14:34 +0200
Subject: [PATCH 07/44] ffhh-sued, site.conf: Add signing key for tokudan

---
 sites/ffhh-sued/site.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sites/ffhh-sued/site.conf b/sites/ffhh-sued/site.conf
index 42f6c0d..f6568a7 100644
--- a/sites/ffhh-sued/site.conf
+++ b/sites/ffhh-sued/site.conf
@@ -105,6 +105,7 @@
 					'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
 					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
 					'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
+					'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
 				},
 			},
 			beta = {
@@ -117,6 +118,7 @@
 					'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
 					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
 					'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
+					'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
 				},
 			},
 			experimental = {

From a108efaf18e31001027322335372bdc6ea77500d Mon Sep 17 00:00:00 2001
From: bdobe <bdobe@users.noreply.github.com>
Date: Fri, 15 Sep 2017 23:10:20 +0200
Subject: [PATCH 08/44] ffhh-sued, site.conf: Fix opkg repository url

---
 sites/ffhh-sued/site.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sites/ffhh-sued/site.conf b/sites/ffhh-sued/site.conf
index f6568a7..f4a189e 100644
--- a/sites/ffhh-sued/site.conf
+++ b/sites/ffhh-sued/site.conf
@@ -6,7 +6,7 @@
 	opkg = {
 		openwrt = 'http://opkg.services.ffhh/%n/%v/%S/packages',
 		extra = {
-			modules = 'http://updates.hamburg.freifunk.net/%GR/stable/archive/modules/gluon-%GS-%GR/%S',
+			modules = 'http://updates.hamburg.freifunk.net/%GS/stable/archive/modules/gluon-%GS-%GR/%S',
 		},
 	},
 

From 22fb01a84f25440bc20eb64afaf1fdc830eb742e Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 2 Oct 2017 21:59:31 +0200
Subject: [PATCH 09/44] 0.8.4 experimental

---
 sites/ffhh-sued/site.mk | 2 +-
 sites/ffhh/site.mk      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sites/ffhh-sued/site.mk b/sites/ffhh-sued/site.mk
index 3a57deb..49258c1 100644
--- a/sites/ffhh-sued/site.mk
+++ b/sites/ffhh-sued/site.mk
@@ -25,7 +25,7 @@ GLUON_SITE_PACKAGES := \
 	haveged
 
 
-DEFAULT_GLUON_RELEASE := 0.8.3
+DEFAULT_GLUON_RELEASE := 0.8.4+exp$(shell date '+%Y%m%d')
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
diff --git a/sites/ffhh/site.mk b/sites/ffhh/site.mk
index bfcd7e3..36fb46c 100644
--- a/sites/ffhh/site.mk
+++ b/sites/ffhh/site.mk
@@ -26,7 +26,7 @@ GLUON_SITE_PACKAGES := \
 	haveged
 
 
-DEFAULT_GLUON_RELEASE := 0.8.3
+DEFAULT_GLUON_RELEASE := 0.8.4+exp$(shell date '+%Y%m%d')
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)

From dbdde1f30a8e2a7591e202d429b8af227192ade1 Mon Sep 17 00:00:00 2001
From: Daniel Frank <github-523@danielfrank.net>
Date: Fri, 6 Oct 2017 21:00:03 +0200
Subject: [PATCH 10/44] 0.8.4 experimental -> stable

---
 sites/ffhh/site.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sites/ffhh/site.mk b/sites/ffhh/site.mk
index 36fb46c..1607319 100644
--- a/sites/ffhh/site.mk
+++ b/sites/ffhh/site.mk
@@ -26,7 +26,7 @@ GLUON_SITE_PACKAGES := \
 	haveged
 
 
-DEFAULT_GLUON_RELEASE := 0.8.4+exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 0.8.4
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)

From f427c1023a35943e3c93552b1cb75369f279836b Mon Sep 17 00:00:00 2001
From: Daniel Frank <github-523@danielfrank.net>
Date: Fri, 6 Oct 2017 21:00:37 +0200
Subject: [PATCH 11/44] 0.8.4 experimental -> stable

---
 sites/ffhh-sued/site.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sites/ffhh-sued/site.mk b/sites/ffhh-sued/site.mk
index 49258c1..203f8a2 100644
--- a/sites/ffhh-sued/site.mk
+++ b/sites/ffhh-sued/site.mk
@@ -25,7 +25,7 @@ GLUON_SITE_PACKAGES := \
 	haveged
 
 
-DEFAULT_GLUON_RELEASE := 0.8.4+exp$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 0.8.4
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)

From 4ba875f5cd3756ad5f7518bf5955164a8b158bf5 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sat, 7 Oct 2017 11:45:50 +0200
Subject: [PATCH 12/44] Update README.md with details about firmware versions

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 570c1e1..342364e 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,8 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- 0.8.4: v2016.2.7 (updated openwrt/package/network/services/dnsmasq/Makefile: PKG\_VERSION:=2.78 & PKG\_MD5SUM:=6d0241b72c79d2b510776ccc4ed69ca4)
+- 0.8.3: v2016.2.6 (ffhh-sued only)
 - 0.8.2: v2016.2.5
 - 0.8.1: v2016.2.4 (ffhh-sued only)
 - 0.8: v2016.1.4

From 6e8ed7993755caab536621e5ef87332459f79faa Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Tue, 3 Oct 2017 18:00:04 +0200
Subject: [PATCH 13/44] =?UTF-8?q?Templates=20f=C3=BCr=20ffhh=20und=20ffhh-?=
 =?UTF-8?q?sued?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit f508264c84ba4a839b0e48c3945328ecf32b4414)
---
 Makefile                                      |  12 +-
 sites/defaults.erb                            |  46 +++++
 sites/ffhh-sued.erb                           |  42 +++++
 sites/ffhh-sued/site.conf                     | 136 ---------------
 sites/ffhh-sued/site.mk                       |  40 -----
 sites/ffhh.erb                                |  54 ++++++
 sites/ffhh/modules                            |   5 -
 sites/ffhh/site.conf                          | 158 ------------------
 sites/ffhh/site.mk                            |  41 -----
 .../ffhh-sued/modules => template/modules.erb |   0
 template/site.conf.erb                        | 130 ++++++++++++++
 template/site.mk.erb                          |  17 ++
 12 files changed, 294 insertions(+), 387 deletions(-)
 create mode 100644 sites/defaults.erb
 create mode 100644 sites/ffhh-sued.erb
 delete mode 100644 sites/ffhh-sued/site.conf
 delete mode 100644 sites/ffhh-sued/site.mk
 create mode 100644 sites/ffhh.erb
 delete mode 100644 sites/ffhh/modules
 delete mode 100644 sites/ffhh/site.conf
 delete mode 100644 sites/ffhh/site.mk
 rename sites/ffhh-sued/modules => template/modules.erb (100%)
 create mode 100644 template/site.conf.erb
 create mode 100644 template/site.mk.erb

diff --git a/Makefile b/Makefile
index 5d45c2b..7b8676b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,16 @@
-all: check_site site.mk site.conf modules
+SITE ?= ffhh
 
-.PHONY: check_site
-check_site:
-	if test -z "${SITE}"; then echo Usage: make SITE=ffhh; exit 1; else true; fi
+all: clean site.mk site.conf modules
 
 .PHONY: clean
 clean:
 	rm -f site.mk site.conf modules
 
 modules:
-	cp sites/${SITE}/$@ $@
+	erb -T- sites/defaults.erb sites/${SITE}.erb template/$@.erb >$@
 
 site.conf:
-	cp sites/${SITE}/$@ $@
+	erb -T- sites/defaults.erb sites/${SITE}.erb template/$@.erb >$@
 
 site.mk:
-	cp sites/${SITE}/$@ $@
+	erb -T- sites/defaults.erb sites/${SITE}.erb template/$@.erb >$@
diff --git a/sites/defaults.erb b/sites/defaults.erb
new file mode 100644
index 0000000..bf7d1f5
--- /dev/null
+++ b/sites/defaults.erb
@@ -0,0 +1,46 @@
+<%
+#gluon_release = "0.8.4+exp" + Time.new.strftime("%Y%m%d")
+gluon_release = "0.8.4"
+gluon_branch = "stable"
+
+gluon_site_packages = %w(
+	gluon-autoupdater
+	gluon-config-mode-autoupdater
+	gluon-config-mode-core
+	gluon-config-mode-hostname
+	gluon-config-mode-mesh-vpn
+	gluon-config-mode-reboot-ffhh
+	gluon-ebtables-filter-multicast
+	gluon-ebtables-filter-ra-dhcp
+	gluon-ebtables-segment-mld
+	gluon-luci-admin
+	gluon-luci-autoupdater
+	gluon-luci-portconfig
+	gluon-luci-private-wifi
+	gluon-luci-wifi-config
+	gluon-next-node
+	gluon-mesh-vpn-fastd
+	gluon-radvd
+	gluon-respondd
+	gluon-setup-mode
+	gluon-status-page
+	iwinfo
+	iptables
+	haveged
+)
+
+gluon_ath10k_mesh = "11s"
+
+signing_keys = [
+		'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', # baldo
+		'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', # leo
+		'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', # andre
+		'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', # gernot
+		'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', # bjoern
+		'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', # daniel
+]
+signing_keys_experimental = [
+		'1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', # 1.builder
+]
+
+-%>
diff --git a/sites/ffhh-sued.erb b/sites/ffhh-sued.erb
new file mode 100644
index 0000000..cc64d7f
--- /dev/null
+++ b/sites/ffhh-sued.erb
@@ -0,0 +1,42 @@
+<%
+site_name = 'Freifunk Hamburg Sued'
+site_code = 'ffhh-sued'
+
+gluon_site_packages += %w( gluon-mesh-batman-adv-15 )
+gluon_ath10k_mesh = "11s"
+
+prefix4 = '10.112.64.0/19'
+prefix6 = '2a03:2267:1::/64'
+
+next_node_ipv4 = '10.112.64.1'
+next_node_ipv6 = '2a03:2267:1::1'
+
+mtu = 1312
+
+gateways = {
+	"gateway01" => {
+		"key" => "cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58",
+		"remotes" => [ '"gw01-new.hamburg.freifunk.net" port 10003' ]
+	},
+	"gateway02" => {
+		"key" => "462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0",
+		"remotes" => [ '"gw02-new.hamburg.freifunk.net" port 10003' ]
+	},
+	"gateway03" => {
+		"key" => "e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546",
+		"remotes" => [ '"gw03-new.hamburg.freifunk.net" port 10003' ]
+	},
+	"gateway04" => {
+		"key" => "fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf",
+		"remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10004' ]
+	},
+	"gateway05" => {
+		"key" => "84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5",
+		"remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10004' ]
+	},
+	"gateway06" => {
+		"key" => "fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6",
+		"remotes" => [ '"gw06-new.hamburg.freifunk.net" port 10004' ]
+	},
+}
+-%>
diff --git a/sites/ffhh-sued/site.conf b/sites/ffhh-sued/site.conf
deleted file mode 100644
index f4a189e..0000000
--- a/sites/ffhh-sued/site.conf
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-	hostname_prefix = 'GibMirEinenNamen',
-	site_name = 'Freifunk Hamburg Sued',
-	site_code = 'ffhh-sued',
-
-	opkg = {
-		openwrt = 'http://opkg.services.ffhh/%n/%v/%S/packages',
-		extra = {
-			modules = 'http://updates.hamburg.freifunk.net/%GS/stable/archive/modules/gluon-%GS-%GR/%S',
-		},
-	},
-
-	prefix4 = '10.112.64.0/19',
-	prefix6 = '2a03:2267:1::/64',
-
-	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-	ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh'},
-	regdom = 'DE',
-
-	wifi24 = {
-		channel = 1,
-
-		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-		basic_rate = {6000, 9000, 18000, 36000, 54000},
-
-		ap = {
-			ssid = 'hamburg.freifunk.net',
-		},
-		mesh = {
-			id = '6668682D73756564',
-			mcast_rate = 12000,
-		},
-	},
-
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'hamburg.freifunk.net',
-		},
-		mesh = {
-			id = '6668682D73756564',
-			mcast_rate = 12000,
-		},
-	},
-
-	next_node = {
-		ip4 = '10.112.64.1',
-		ip6 = '2a03:2267:1::1',
-
-		mac = '16:41:95:40:f7:dc',
-	},
-
-	fastd_mesh_vpn = {
-		enabled = true,
-		methods = {'salsa2012+umac'},
-		mtu = 1312,
-		groups = {
-			backbone = {
-				limit = 1,
-				peers = {
-					gateway01 = {
-						key = 'cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58',
-						remotes = {'"gw01-new.hamburg.freifunk.net" port 10003'},
-					},
-					gateway02 = {
-						key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
-						remotes = {'"gw02-new.hamburg.freifunk.net" port 10003'},
-					},
-					gateway03 = {
-						key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
-						remotes = {'"gw03-new.hamburg.freifunk.net" port 10003'},
-					},
-					gateway04 = {
-						key = 'fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf',
-						remotes = {'"gw04-new.hamburg.freifunk.net" port 10004'},
-					},
-					gateway05 = {
-						key = '84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5',
-						remotes = {'"gw05-new.hamburg.freifunk.net" port 10004'},
-					},
-					gateway06 = {
-						key = 'fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6',
-						remotes = {'"gw06-new.hamburg.freifunk.net" port 10004'},
-					},
-				},
-			},
-		},
-		bandwidth_limit = {
-			enabled = false,
-			ingress = 8096,
-			egress = 1024,
-		},
-	},
-
-	autoupdater = {
-		branch = 'experimental',
-		branches = {
-			stable = {
-				name = 'stable',
-				mirrors = {'http://1.updates.services.ffhh/ffhh-sued/stable/sysupgrade','http://2.updates.services.ffhh/ffhh-sued/stable/sysupgrade'},
-				good_signatures = 2,
-				pubkeys = {
-					'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
-					'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
-					'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
-					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
-					'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
-					'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
-				},
-			},
-			beta = {
-				name = 'beta',
-				mirrors = {'http://1.updates.services.ffhh/ffhh-sued/beta/sysupgrade','http://2.updates.services.ffhh/ffhh-sued/beta/sysupgrade'},
-				good_signatures = 2,
-				pubkeys = {
-					'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
-					'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
-					'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
-					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
-					'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
-					'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
-				},
-			},
-			experimental = {
-				name = 'experimental',
-				mirrors = {'http://1.updates.services.ffhh/ffhh-sued/experimental/sysupgrade','http://2.updates.services.ffhh/ffhh-sued/experimental/sysupgrade'},
-				good_signatures = 1,
-				pubkeys = {
-					'1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', -- 1.builder
-				},
-			},
-		},
-	},
-
-	poe_passthrough = false,
-}
diff --git a/sites/ffhh-sued/site.mk b/sites/ffhh-sued/site.mk
deleted file mode 100644
index 203f8a2..0000000
--- a/sites/ffhh-sued/site.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-15 \
-	gluon-autoupdater \
-	gluon-config-mode-autoupdater \
-	gluon-config-mode-core \
-	gluon-config-mode-hostname \
-	gluon-config-mode-mesh-vpn \
-	gluon-config-mode-reboot-ffhh \
-	gluon-ebtables-filter-multicast \
-	gluon-ebtables-filter-ra-dhcp \
-	gluon-ebtables-segment-mld \
-	gluon-luci-admin \
-	gluon-luci-autoupdater \
-	gluon-luci-portconfig \
-	gluon-luci-private-wifi \
-	gluon-luci-wifi-config \
-	gluon-next-node \
-	gluon-mesh-vpn-fastd \
-	gluon-radvd \
-	gluon-respondd \
-	gluon-setup-mode \
-	gluon-status-page \
-	iwinfo \
-	iptables \
-	haveged
-
-
-DEFAULT_GLUON_RELEASE := 0.8.4
-
-# Allow overriding the release number from the command line
-GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
-
-GLUON_PRIORITY ?= 0
-
-# Region code required for some images; supported values: us eu
-GLUON_REGION ?= eu
-
-GLUON_ATH10K_MESH ?= 11s
-
-GLUON_LANGS ?= en de
diff --git a/sites/ffhh.erb b/sites/ffhh.erb
new file mode 100644
index 0000000..4edaff8
--- /dev/null
+++ b/sites/ffhh.erb
@@ -0,0 +1,54 @@
+<%
+site_name = 'Freifunk Hamburg'
+site_code = 'ffhh'
+
+gluon_site_packages += %w( gluon-mesh-batman-adv-14 gluon-alfred )
+gluon_ath10k_mesh = "ibss"
+
+prefix4 = '10.112.0.0/18'
+prefix6 = '2a03:2267::/64'
+
+next_node_ipv4 = '10.112.0.1'
+next_node_ipv6 = '2a03:2267::1'
+
+mtu = 1280
+
+gateways = {
+	"gateway01" => {
+		"key" => "cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58",
+		"remotes" => [ '"gw01.hamburg.freifunk.net" port 10001' ]
+	},
+	"gateway02" => {
+		"key" => "462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0",
+		"remotes" => [ '"gw02.hamburg.freifunk.net" port 10001' ]
+	},
+	"gateway03" => {
+		"key" => "e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546",
+		"remotes" => [ '"gw03.hamburg.freifunk.net" port 10001' ]
+	},
+	"gateway04" => {
+		"key" => "fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf",
+		"remotes" => [ '"gw04.hamburg.freifunk.net" port 10000' ]
+	},
+	"gateway05" => {
+		"key" => "84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5",
+		"remotes" => [ '"gw05.hamburg.freifunk.net" port 10001' ]
+	},
+	"gateway06" => {
+		"key" => "fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6",
+		"remotes" => [ '"gw06.hamburg.freifunk.net" port 10000' ]
+	},
+	"gateway08" => {
+		"key" => "67e9b215248ada3f4ffcc9db0bdf897128f6236a0d4e8d660762b77bebc914d4",
+		"remotes" => [ '"gw08.hamburg.freifunk.net" port 10001' ]
+	},
+	"gateway09" => {
+		"key" => "5f483f6d26ac9106d86c0edcd08cf92c18caf67933719a394915ab809d1fb2bc",
+		"remotes" => [ '"gw09.hamburg.freifunk.net" port 10001' ]
+	},
+	"gateway12" => {
+		"key" => "facbbfb07525782fcde22b929f36ea508a295619eca35782003d9ca2dd3cc524",
+		"remotes" => [ '"gw12.hamburg.freifunk.net" port 10001' ]
+	}
+}
+-%>
diff --git a/sites/ffhh/modules b/sites/ffhh/modules
deleted file mode 100644
index 6416262..0000000
--- a/sites/ffhh/modules
+++ /dev/null
@@ -1,5 +0,0 @@
-GLUON_SITE_FEEDS='ffhh_packages'
-
-PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
-PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c
-
diff --git a/sites/ffhh/site.conf b/sites/ffhh/site.conf
deleted file mode 100644
index 8399090..0000000
--- a/sites/ffhh/site.conf
+++ /dev/null
@@ -1,158 +0,0 @@
-{
-	hostname_prefix = 'GibMirEinenNamen',
-	site_name = 'Freifunk Hamburg',
-	site_code = 'ffhh',
-
-	opkg = {
-		openwrt = 'http://opkg.services.ffhh/%n/%v/%S/packages',
-		extra = {
-			modules = 'http://updates.hamburg.freifunk.net/stable/archive/modules/gluon-%GS-%GR/%S',
-		},
-	},
-
-	prefix4 = '10.112.0.0/18',
-	prefix6 = '2a03:2267::/64',
-
-	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-	ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh'},
-	regdom = 'DE',
-
-	wifi24 = {
-		channel = 1,
-
-		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
-		basic_rate = {6000, 9000, 18000, 36000, 54000},
-
-		ap = {
-			ssid = 'hamburg.freifunk.net',
-		},
-		ibss = {
-			ssid = 'f8:d1:11:87:52:2e',
-			bssid = 'f8:d1:11:87:52:2e',
-			mcast_rate = 12000,
-		},
-		--[[ mesh = {
-			id = 'ffhh-mesh',
-			mcast_rate = 12000,
-		}, --]]
-	},
-
-	wifi5 = {
-		channel = 44,
-		ap = {
-			ssid = 'hamburg.freifunk.net',
-		},
-		ibss = {
-			ssid = 'f8:d1:11:87:52:2e',
-			bssid = 'f8:d1:11:87:52:2e',
-			mcast_rate = 12000,
-		},
-		--[[ mesh = {
-			id = 'ffhh-mesh',
-			mcast_rate = 12000,
-		}, --]]
-	},
-
-	next_node = {
-		ip4 = '10.112.0.1',
-		ip6 = '2a03:2267::1',
-
-		mac = '16:41:95:40:f7:dc',
-	},
-
-	fastd_mesh_vpn = {
-		enabled = true,
-		methods = {'salsa2012+umac'},
-		mtu = 1280,
-		groups = {
-			backbone = {
-				limit = 1,
-				peers = {
-					gateway01 = {
-						key = 'cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58',
-						remotes = {'"gw01.hamburg.freifunk.net" port 10001'},
-					},
-					gateway02 = {
-						key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0',
-						remotes = {'"gw02.hamburg.freifunk.net" port 10001'},
-					},
-					gateway03 = {
-						key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546',
-						remotes = {'"gw03.hamburg.freifunk.net" port 10001'},
-					},
-					gateway04 = {
-						key = 'fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf',
-						remotes = {'"gw04.hamburg.freifunk.net" port 10000'},
-					},
-					gateway05 = {
-						key = '84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5',
-						remotes = {'"gw05.hamburg.freifunk.net" port 10001'},
-					},
-					gateway06 = {
-						key = 'fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6',
-						remotes = {'"gw06.hamburg.freifunk.net" port 10000'},
-					},
-						gateway08 = {
-						key = '67e9b215248ada3f4ffcc9db0bdf897128f6236a0d4e8d660762b77bebc914d4',
-						remotes = {'"gw08.hamburg.freifunk.net" port 10001'},
-					},
-					gateway09 = {
-						key = '5f483f6d26ac9106d86c0edcd08cf92c18caf67933719a394915ab809d1fb2bc',
-						remotes = {'"gw09.hamburg.freifunk.net" port 10001'},
-					},
-					gateway12 = {
-						key = 'facbbfb07525782fcde22b929f36ea508a295619eca35782003d9ca2dd3cc524',
-						remotes = {'"gw12.hamburg.freifunk.net" port 10001'},
-					},
-				},
-			},
-		},
-		bandwidth_limit = {
-			enabled = false,
-			ingress = 8096,
-			egress = 1024,
-		},
-	},
-
-	autoupdater = {
-		branch = 'experimental',
-		branches = {
-			stable = {
-				name = 'stable',
-				mirrors = {'http://1.updates.services.ffhh/stable/sysupgrade','http://2.updates.services.ffhh/stable/sysupgrade'},
-				good_signatures = 2,
-				pubkeys = {
-					'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
-					'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
-					'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
-					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
-					'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
-					'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
-				},
-			},
-			beta = {
-				name = 'beta',
-				mirrors = {'http://1.updates.services.ffhh/beta/sysupgrade','http://2.updates.services.ffhh/beta/sysupgrade'},
-				good_signatures = 2,
-				pubkeys = {
-					'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', -- baldo
-					'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', -- leo
-					'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', -- andre
-					'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
-					'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', -- bjoern
-					'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', -- daniel
-				},
-			},
-			experimental = {
-				name = 'experimental',
-				mirrors = {'http://1.updates.services.ffhh/experimental/sysupgrade','http://2.updates.services.ffhh/experimental/sysupgrade'},
-				good_signatures = 1,
-				pubkeys = {
-					'1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', -- 1.builder
-				},
-			},
-		},
-	},
-
-	poe_passthrough = false,
-}
diff --git a/sites/ffhh/site.mk b/sites/ffhh/site.mk
deleted file mode 100644
index 1607319..0000000
--- a/sites/ffhh/site.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-14 \
-	gluon-alfred \
-	gluon-autoupdater \
-	gluon-config-mode-autoupdater \
-	gluon-config-mode-core \
-	gluon-config-mode-hostname \
-	gluon-config-mode-mesh-vpn \
-	gluon-config-mode-reboot-ffhh \
-	gluon-ebtables-filter-multicast \
-	gluon-ebtables-filter-ra-dhcp \
-	gluon-ebtables-segment-mld \
-	gluon-luci-admin \
-	gluon-luci-autoupdater \
-	gluon-luci-portconfig \
-	gluon-luci-private-wifi \
-	gluon-luci-wifi-config \
-	gluon-next-node \
-	gluon-mesh-vpn-fastd \
-	gluon-radvd \
-	gluon-respondd \
-	gluon-setup-mode \
-	gluon-status-page \
-	iwinfo \
-	iptables \
-	haveged
-
-
-DEFAULT_GLUON_RELEASE := 0.8.4
-
-# Allow overriding the release number from the command line
-GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
-
-GLUON_PRIORITY ?= 0
-
-# Region code required for some images; supported values: us eu
-GLUON_REGION ?= eu
-
-GLUON_ATH10K_MESH ?= ibss
-
-GLUON_LANGS ?= en de
diff --git a/sites/ffhh-sued/modules b/template/modules.erb
similarity index 100%
rename from sites/ffhh-sued/modules
rename to template/modules.erb
diff --git a/template/site.conf.erb b/template/site.conf.erb
new file mode 100644
index 0000000..da0bae7
--- /dev/null
+++ b/template/site.conf.erb
@@ -0,0 +1,130 @@
+{
+	hostname_prefix = 'GibMirEinenNamen',
+	site_name = '<%= site_name %>',
+	site_code = '<%= site_code %>',
+
+	opkg = {
+		openwrt = 'http://opkg.services.ffhh/%n/%v/%S/packages',
+		extra = {
+			modules = 'http://updates.hamburg.freifunk.net/%GS/stable/archive/modules/gluon-%GS-%GR/%S',
+		},
+	},
+
+	prefix4 = '<%= prefix4 %>',
+	prefix6 = '<%= prefix6 %>',
+
+	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
+	ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh'},
+	regdom = 'DE',
+
+	wifi24 = {
+		channel = 1,
+
+		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
+		basic_rate = {6000, 9000, 18000, 36000, 54000},
+
+		ap = {
+			ssid = 'hamburg.freifunk.net',
+		},
+<% if gluon_ath10k_mesh == "11s" -%>
+		mesh = {
+			id = '6668682D73756564',
+			mcast_rate = 12000,
+		},
+<% else -%>
+		ibss = {
+			ssid = 'f8:d1:11:87:52:2e',
+			bssid = 'f8:d1:11:87:52:2e',
+			mcast_rate = 12000,
+		},
+<% end -%>
+	},
+
+	wifi5 = {
+		channel = 44,
+		ap = {
+			ssid = 'hamburg.freifunk.net',
+		},
+<% if gluon_ath10k_mesh == "11s" -%>
+		mesh = {
+			id = '6668682D73756564',
+			mcast_rate = 12000,
+		},
+<% else -%>
+		ibss = {
+			ssid = 'f8:d1:11:87:52:2e',
+			bssid = 'f8:d1:11:87:52:2e',
+			mcast_rate = 12000,
+		},
+<% end -%>
+	},
+
+	next_node = {
+		ip4 = '<%= next_node_ipv4 %>',
+		ip6 = '<%= next_node_ipv6 %>',
+
+		mac = '16:41:95:40:f7:dc',
+	},
+
+	fastd_mesh_vpn = {
+		enabled = true,
+		methods = {'salsa2012+umac'},
+		mtu = <%= mtu %>,
+		groups = {
+			backbone = {
+				limit = 1,
+				peers = {
+<% gateways.each_pair do | name, gw_data | -%>
+					<%= name %> = {
+						key = '<%= gw_data['key'] %>',
+						remotes = { '<%= gw_data['remotes'].join("', '") %>' },
+					},
+<% end -%>
+				},
+			},
+		},
+		bandwidth_limit = {
+			enabled = false,
+			ingress = 8096,
+			egress = 1024,
+		},
+	},
+
+	autoupdater = {
+		branch = '<%= gluon_branch %>',
+		branches = {
+			stable = {
+				name = 'stable',
+				mirrors = {'http://1.updates.services.ffhh/<%= site_code %>/stable/sysupgrade','http://2.updates.services.ffhh/<%= site_code %>/stable/sysupgrade'},
+				good_signatures = 2,
+				pubkeys = {
+<% signing_keys.each do | key | -%>
+					'<%= key %>',
+<% end -%>
+				},
+			},
+			beta = {
+				name = 'beta',
+				mirrors = {'http://1.updates.services.ffhh/<%= site_code %>/beta/sysupgrade','http://2.updates.services.ffhh/<%= site_code %>/beta/sysupgrade'},
+				good_signatures = 2,
+				pubkeys = {
+<% signing_keys.each do | key | -%>
+					'<%= key %>',
+<% end -%>
+				},
+			},
+			experimental = {
+				name = 'experimental',
+				mirrors = {'http://1.updates.services.ffhh/<%= site_code %>/experimental/sysupgrade','http://2.updates.services.ffhh/<%= site_code %>/experimental/sysupgrade'},
+				good_signatures = 1,
+				pubkeys = {
+<% signing_keys_experimental.each do | key | -%>
+					'<%= key %>',
+<% end -%>
+				},
+			},
+		},
+	},
+
+	poe_passthrough = false,
+}
diff --git a/template/site.mk.erb b/template/site.mk.erb
new file mode 100644
index 0000000..48d48b7
--- /dev/null
+++ b/template/site.mk.erb
@@ -0,0 +1,17 @@
+GLUON_SITE_PACKAGES :=<% gluon_site_packages.each do | p | -%>
+<%= " " + p -%>
+<% end -%>
+
+DEFAULT_GLUON_RELEASE := <%= gluon_release %>
+
+# Allow overriding the release number from the command line
+GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
+
+GLUON_PRIORITY ?= 0
+
+# Region code required for some images; supported values: us eu
+GLUON_REGION ?= eu
+
+GLUON_ATH10K_MESH ?= <%= gluon_ath10k_mesh %>
+
+GLUON_LANGS ?= en de

From ebddb7d986a815d1cb2839e86cdf6c741c2ff33d Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 13 Oct 2017 23:47:33 +0200
Subject: [PATCH 14/44] rework the site repo layout again for fun (and easier
 building)

---
 .gitignore                      |  1 +
 Makefile                        | 14 +++++++++-----
 README.md                       |  6 +++---
 {sites => config}/defaults.erb  |  0
 {sites => config}/ffhh-sued.erb |  0
 {sites => config}/ffhh.erb      |  0
 6 files changed, 13 insertions(+), 8 deletions(-)
 rename {sites => config}/defaults.erb (100%)
 rename {sites => config}/ffhh-sued.erb (100%)
 rename {sites => config}/ffhh.erb (100%)

diff --git a/.gitignore b/.gitignore
index 0acb982..e2d3142 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /site.conf
 /site.mk
 /modules
+sites/
diff --git a/Makefile b/Makefile
index 7b8676b..892c020 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,20 @@
-SITE ?= ffhh
+sites: sites/ffhh sites/ffhh-sued
 
-all: clean site.mk site.conf modules
+sites/%: config/%.erb
+	mkdir -p $@
+	cd $@ && $(MAKE) -f ../../Makefile site SITE=$(@F)
+
+site: clean site.mk site.conf modules
 
 .PHONY: clean
 clean:
 	rm -f site.mk site.conf modules
 
 modules:
-	erb -T- sites/defaults.erb sites/${SITE}.erb template/$@.erb >$@
+	erb -T- ../../config/defaults.erb ../../config/$(SITE).erb ../../template/$@.erb >$@
 
 site.conf:
-	erb -T- sites/defaults.erb sites/${SITE}.erb template/$@.erb >$@
+	erb -T- ../../config/defaults.erb ../../config/$(SITE).erb ../../template/$@.erb >$@
 
 site.mk:
-	erb -T- sites/defaults.erb sites/${SITE}.erb template/$@.erb >$@
+	erb -T- ../../config/defaults.erb ../../config/$(SITE).erb ../../template/$@.erb >$@
diff --git a/README.md b/README.md
index 342364e..8952b85 100644
--- a/README.md
+++ b/README.md
@@ -4,10 +4,10 @@
     cd gluon
     git clone https://github.com/freifunkhamburg/site-ffhh.git site  # Get the Freifunk Hamburg site repository
     cd site
-    make SITE=ffhh
+    make
     cd ..
-    make update                                                    # Get other repositories used by Gluon
-    make                                                           # Build Gluon
+    make update                                                      # Get other repositories used by Gluon
+    make GLUON_SITEDIR=site/sites/ffhh                               # Build Gluon
 
 Please see [the official Gluon repository](https://github.com/freifunk-gluon/gluon) for an in-depth explanation of the build process.
 
diff --git a/sites/defaults.erb b/config/defaults.erb
similarity index 100%
rename from sites/defaults.erb
rename to config/defaults.erb
diff --git a/sites/ffhh-sued.erb b/config/ffhh-sued.erb
similarity index 100%
rename from sites/ffhh-sued.erb
rename to config/ffhh-sued.erb
diff --git a/sites/ffhh.erb b/config/ffhh.erb
similarity index 100%
rename from sites/ffhh.erb
rename to config/ffhh.erb

From 3f89fe6df35a64113cd7014442ddbafdd9578820 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sat, 14 Oct 2017 20:06:00 +0200
Subject: [PATCH 15/44] bump version to 0.8.5 experimental and some more build
 system updates

---
 .gitignore          |  6 +----
 Makefile            | 16 +++++++++---
 build.sh            | 62 +++++++++++++++++++++++++++++++++++++++++++++
 config/defaults.erb | 17 ++++++++++---
 template/info.erb   |  3 +++
 5 files changed, 92 insertions(+), 12 deletions(-)
 create mode 100755 build.sh
 create mode 100644 template/info.erb

diff --git a/.gitignore b/.gitignore
index e2d3142..5502124 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-*~
-/site.conf
-/site.mk
-/modules
-sites/
+info
diff --git a/Makefile b/Makefile
index 892c020..3d87a6f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,21 @@
-sites: sites/ffhh sites/ffhh-sued
+sites: clean info sites/ffhh sites/ffhh-sued
+
+info: config/defaults.erb template/info.erb
+	erb -T- config/defaults.erb template/$@.erb >$@
+
+.PHONY: clean
+clean:
+	rm -rf sites
+	rm -f info
 
 sites/%: config/%.erb
 	mkdir -p $@
 	cd $@ && $(MAKE) -f ../../Makefile site SITE=$(@F)
 
-site: clean site.mk site.conf modules
+site: siteclean site.mk site.conf modules
 
-.PHONY: clean
-clean:
+.PHONY: siteclean
+siteclean:
 	rm -f site.mk site.conf modules
 
 modules:
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..ae18bbc
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,62 @@
+#!/bin/bash -e
+
+function announce () {
+	echo '############################' $* >&2
+}
+
+proc=$(nproc)
+
+while getopts g:bj:v opt; do
+	case "$opt" in
+		g) gluon_path="$OPTARG" ;;
+		b) export BROKEN=1 ;;
+		j) proc="$OPTARG" ;;
+		v) verbose=V=s ;;
+	esac
+done
+if [ -z "${gluon_path}" ]; then
+	echo "Usage: $0 -g GLUON_PATH" >&2
+	echo "       GLUON_PATH      Path to a checkout of the gluon repository." >&2
+	echo "       -b              BROKEN=1" >&2
+	echo "       -j JOBS         Run build with -jJOBS. Default: ${proc}" >&2
+	exit 1
+fi
+
+gluon_path=$(realpath $gluon_path)
+site_path=$(realpath $(dirname $BASH_SOURCE))
+
+announce GLUON: $gluon_path >&2
+announce FFHH SITES: $site_path >&2
+
+# Build the site repo and generate all site configs
+announce Building site repo and reading data >&2
+pushd $site_path > /dev/null
+make
+. info
+export GLUON_RELEASE
+export GLUON_BRANCH
+# get the available sites...
+sites=""
+for s in sites/*; do sites="${sites} ${s##*/}"; done
+announce Gluon will be built for the following sites:$sites >&2
+announce The following targets will be generated: $targets >&2
+popd >/dev/null
+
+pushd "${gluon_path}" >/dev/null
+announce Starting make update...
+for s in $sites; do
+	export GLUON_SITEDIR="${site_path}/sites/${s}"
+	export GLUON_OUTPUTDIR="${HOME}/firmware/${s}/${GLUON_BRANCH}/${GLUON_RELEASE}"
+	export GLUON_IMAGEDIR="${GLUON_OUTPUTDIR}/images"
+	export GLUON_MODULEDIR="${GLUON_OUTPUTDIR}/modules"
+	rm -rf "${GLUON_OUTPUTDIR}"
+	mkdir -p "${GLUON_IMAGEDIR}" "${GLUON_MODULEDIR}"
+	make update
+	for t in $targets; do
+		announce Starting build for $s/$t... >&2
+		make -j$(nproc) GLUON_TARGET=$t $verbose
+	done
+	announce Building manifest...
+	make manifest
+done
+popd >/dev/null
diff --git a/config/defaults.erb b/config/defaults.erb
index bf7d1f5..6b6bbd0 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -1,7 +1,18 @@
 <%
-#gluon_release = "0.8.4+exp" + Time.new.strftime("%Y%m%d")
-gluon_release = "0.8.4"
-gluon_branch = "stable"
+#gluon_branch = "stable"
+gluon_branch = "experimental"
+gluon_release = "0.8.5"
+
+# Add the +exp and current date if this is an experimental release
+gluon_release += "+exp" + Time.new.strftime("%Y%m%d") if gluon_branch == "experimental"
+
+gluon_targets = %w(
+	ar71xx-generic
+	ar71xx-nand
+	mpc85xx-generic
+	x86-generic
+	x86-64
+)
 
 gluon_site_packages = %w(
 	gluon-autoupdater
diff --git a/template/info.erb b/template/info.erb
new file mode 100644
index 0000000..685d4a9
--- /dev/null
+++ b/template/info.erb
@@ -0,0 +1,3 @@
+GLUON_RELEASE="<%= gluon_release %>"
+GLUON_BRANCH="<%= gluon_branch %>"
+targets="<%= gluon_targets.join(" ") %>"

From c4aec4eaee9d1cd3a67abadc37a48c9c60cd3901 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 16 Oct 2017 21:51:06 +0200
Subject: [PATCH 16/44] some updates to the build.sh

---
 build.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index ae18bbc..2d6cf5a 100755
--- a/build.sh
+++ b/build.sh
@@ -5,10 +5,12 @@ function announce () {
 }
 
 proc=$(nproc)
+gluon_out="${HOME}/firmware"
 
 while getopts g:bj:v opt; do
 	case "$opt" in
 		g) gluon_path="$OPTARG" ;;
+		o) gluon_out="$OPTARG" ;;
 		b) export BROKEN=1 ;;
 		j) proc="$OPTARG" ;;
 		v) verbose=V=s ;;
@@ -16,13 +18,16 @@ while getopts g:bj:v opt; do
 done
 if [ -z "${gluon_path}" ]; then
 	echo "Usage: $0 -g GLUON_PATH" >&2
-	echo "       GLUON_PATH      Path to a checkout of the gluon repository." >&2
+	echo "       -g GLUON_PATH   Path to a checkout of the gluon repository." >&2
+	echo "       -o OUT_PATH     Path to a checkout of the gluon repository." >&2
 	echo "       -b              BROKEN=1" >&2
+	echo "       -v              verbose" >&2
 	echo "       -j JOBS         Run build with -jJOBS. Default: ${proc}" >&2
 	exit 1
 fi
 
 gluon_path=$(realpath $gluon_path)
+gluon_out=$(realpath $gluon_out)
 site_path=$(realpath $(dirname $BASH_SOURCE))
 
 announce GLUON: $gluon_path >&2
@@ -46,7 +51,7 @@ pushd "${gluon_path}" >/dev/null
 announce Starting make update...
 for s in $sites; do
 	export GLUON_SITEDIR="${site_path}/sites/${s}"
-	export GLUON_OUTPUTDIR="${HOME}/firmware/${s}/${GLUON_BRANCH}/${GLUON_RELEASE}"
+	export GLUON_OUTPUTDIR="${gluon_out}/${s}/${GLUON_BRANCH}/${GLUON_RELEASE}"
 	export GLUON_IMAGEDIR="${GLUON_OUTPUTDIR}/images"
 	export GLUON_MODULEDIR="${GLUON_OUTPUTDIR}/modules"
 	rm -rf "${GLUON_OUTPUTDIR}"

From ba24c852fba48110e91301bd09b3d4614cb9fdba Mon Sep 17 00:00:00 2001
From: builder2 <builder2>
Date: Wed, 18 Oct 2017 22:26:03 +0200
Subject: [PATCH 17/44] yet more updates...

---
 build.sh                       |  10 +-
 patches/0001-dnsmasq2.78.patch | 236 +++++++++++++++++++++++++++++++++
 2 files changed, 245 insertions(+), 1 deletion(-)
 create mode 100644 patches/0001-dnsmasq2.78.patch

diff --git a/build.sh b/build.sh
index 2d6cf5a..2d8f476 100755
--- a/build.sh
+++ b/build.sh
@@ -19,7 +19,7 @@ done
 if [ -z "${gluon_path}" ]; then
 	echo "Usage: $0 -g GLUON_PATH" >&2
 	echo "       -g GLUON_PATH   Path to a checkout of the gluon repository." >&2
-	echo "       -o OUT_PATH     Path to a checkout of the gluon repository." >&2
+	echo "       -o OUT_PATH     Path to a checkout of the gluon repository. Default: ${gluon_out}" >&2
 	echo "       -b              BROKEN=1" >&2
 	echo "       -v              verbose" >&2
 	echo "       -j JOBS         Run build with -jJOBS. Default: ${proc}" >&2
@@ -57,6 +57,14 @@ for s in $sites; do
 	rm -rf "${GLUON_OUTPUTDIR}"
 	mkdir -p "${GLUON_IMAGEDIR}" "${GLUON_MODULEDIR}"
 	make update
+	# Try to install patches. I wasn't able to figure out how patches in gluon/site/patches work.
+	for p in ${site_path}/patches/*.patch; do
+		if [ -e "$p" -a ! -f "${gluon_path}/${p##*/}" ]; then
+			announce Installing patch $p
+			patch -p1 < $p
+			touch "${gluon_path}/${p##*/}"
+		fi
+	done
 	for t in $targets; do
 		announce Starting build for $s/$t... >&2
 		make -j$(nproc) GLUON_TARGET=$t $verbose
diff --git a/patches/0001-dnsmasq2.78.patch b/patches/0001-dnsmasq2.78.patch
new file mode 100644
index 0000000..b2f1fd4
--- /dev/null
+++ b/patches/0001-dnsmasq2.78.patch
@@ -0,0 +1,236 @@
+diff -Naur a/openwrt/package/network/services/dnsmasq/Makefile b/openwrt/package/network/services/dnsmasq/Makefile
+--- a/openwrt/package/network/services/dnsmasq/Makefile	2017-10-18 22:57:32.713534131 +0200
++++ b/openwrt/package/network/services/dnsmasq/Makefile	2017-10-18 22:58:50.228018635 +0200
+@@ -8,12 +8,12 @@
+ include $(TOPDIR)/rules.mk
+ 
+ PKG_NAME:=dnsmasq
+-PKG_VERSION:=2.73
++PKG_VERSION:=2.78
+ PKG_RELEASE:=1
+ 
+ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+ PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
+-PKG_MD5SUM:=b8bfe96d22945c8cf4466826ba9b21bd
++PKG_MD5SUM:=6d0241b72c79d2b510776ccc4ed69ca4
+ 
+ PKG_LICENSE:=GPL-2.0
+ PKG_LICENSE_FILES:=COPYING
+diff -Naur a/openwrt/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch b/openwrt/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch
+--- a/openwrt/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch	2017-10-18 22:57:32.713534131 +0200
++++ b/openwrt/package/network/services/dnsmasq/patches/100-fix-dhcp-no-address-warning.patch	1970-01-01 01:00:00.000000000 +0100
+@@ -1,47 +0,0 @@
+---- a/src/dhcp.c
+-+++ b/src/dhcp.c
+-@@ -146,7 +146,7 @@ void dhcp_packet(time_t now, int pxe_fd)
+-   struct iovec iov;
+-   ssize_t sz; 
+-   int iface_index = 0, unicast_dest = 0, is_inform = 0;
+--  struct in_addr iface_addr;
+-+  struct in_addr iface_addr, *addrp = NULL;
+-   struct iface_param parm;
+- #ifdef HAVE_LINUX_NETWORK
+-   struct arpreq arp_req;
+-@@ -272,11 +272,9 @@ void dhcp_packet(time_t now, int pxe_fd)
+-     {
+-       ifr.ifr_addr.sa_family = AF_INET;
+-       if (ioctl(daemon->dhcpfd, SIOCGIFADDR, &ifr) != -1 )
+--	iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
+--      else
+- 	{
+--	  my_syslog(MS_DHCP | LOG_WARNING, _("DHCP packet received on %s which has no address"), ifr.ifr_name);
+--	  return;
+-+	  addrp = &iface_addr;
+-+	  iface_addr = ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr;
+- 	}
+-       
+-       for (tmp = daemon->dhcp_except; tmp; tmp = tmp->next)
+-@@ -295,7 +293,7 @@ void dhcp_packet(time_t now, int pxe_fd)
+-       parm.relay_local.s_addr = 0;
+-       parm.ind = iface_index;
+-       
+--      if (!iface_check(AF_INET, (struct all_addr *)&iface_addr, ifr.ifr_name, NULL))
+-+      if (!iface_check(AF_INET, (struct all_addr *)addrp, ifr.ifr_name, NULL))
+- 	{
+- 	  /* If we failed to match the primary address of the interface, see if we've got a --listen-address
+- 	     for a secondary */
+-@@ -315,6 +313,12 @@ void dhcp_packet(time_t now, int pxe_fd)
+- 	  complete_context(match.addr, iface_index, NULL, match.netmask, match.broadcast, &parm);
+- 	}    
+-       
+-+      if (!addrp)
+-+        {
+-+          my_syslog(MS_DHCP | LOG_WARNING, _("DHCP packet received on %s which has no address"), ifr.ifr_name);
+-+          return;
+-+        }
+-+
+-       if (!iface_enumerate(AF_INET, &parm, complete_context))
+- 	return;
+- 
+diff -Naur a/openwrt/package/network/services/dnsmasq/patches/110-ipset-remove-old-kernel-support.patch b/openwrt/package/network/services/dnsmasq/patches/110-ipset-remove-old-kernel-support.patch
+--- a/openwrt/package/network/services/dnsmasq/patches/110-ipset-remove-old-kernel-support.patch	2017-10-18 22:57:32.713534131 +0200
++++ b/openwrt/package/network/services/dnsmasq/patches/110-ipset-remove-old-kernel-support.patch	1970-01-01 01:00:00.000000000 +0100
+@@ -1,110 +0,0 @@
+---- a/src/ipset.c
+-+++ b/src/ipset.c
+-@@ -22,7 +22,6 @@
+- #include <errno.h>
+- #include <sys/types.h>
+- #include <sys/socket.h>
+--#include <sys/utsname.h>
+- #include <arpa/inet.h>
+- #include <linux/version.h>
+- #include <linux/netlink.h>
+-@@ -72,7 +71,7 @@ struct my_nfgenmsg {
+- 
+- #define NL_ALIGN(len) (((len)+3) & ~(3))
+- static const struct sockaddr_nl snl = { .nl_family = AF_NETLINK };
+--static int ipset_sock, old_kernel;
+-+static int ipset_sock;
+- static char *buffer;
+- 
+- static inline void add_attr(struct nlmsghdr *nlh, uint16_t type, size_t len, const void *data)
+-@@ -87,25 +86,7 @@ static inline void add_attr(struct nlmsg
+- 
+- void ipset_init(void)
+- {
+--  struct utsname utsname;
+--  int version;
+--  char *split;
+--  
+--  if (uname(&utsname) < 0)
+--    die(_("failed to find kernel version: %s"), NULL, EC_MISC);
+--  
+--  split = strtok(utsname.release, ".");
+--  version = (split ? atoi(split) : 0);
+--  split = strtok(NULL, ".");
+--  version = version * 256 + (split ? atoi(split) : 0);
+--  split = strtok(NULL, ".");
+--  version = version * 256 + (split ? atoi(split) : 0);
+--  old_kernel = (version < KERNEL_VERSION(2,6,32));
+--  
+--  if (old_kernel && (ipset_sock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) != -1)
+--    return;
+--  
+--  if (!old_kernel && 
+-+  if ( 
+-       (buffer = safe_malloc(BUFF_SZ)) &&
+-       (ipset_sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER)) != -1 &&
+-       (bind(ipset_sock, (struct sockaddr *)&snl, sizeof(snl)) != -1))
+-@@ -168,62 +149,16 @@ static int new_add_to_ipset(const char *
+- }
+- 
+- 
+--static int old_add_to_ipset(const char *setname, const struct all_addr *ipaddr, int remove)
+--{
+--  socklen_t size;
+--  struct ip_set_req_adt_get {
+--    unsigned op;
+--    unsigned version;
+--    union {
+--      char name[IPSET_MAXNAMELEN];
+--      uint16_t index;
+--    } set;
+--    char typename[IPSET_MAXNAMELEN];
+--  } req_adt_get;
+--  struct ip_set_req_adt {
+--    unsigned op;
+--    uint16_t index;
+--    uint32_t ip;
+--  } req_adt;
+--  
+--  if (strlen(setname) >= sizeof(req_adt_get.set.name)) 
+--    {
+--      errno = ENAMETOOLONG;
+--      return -1;
+--    }
+--  
+--  req_adt_get.op = 0x10;
+--  req_adt_get.version = 3;
+--  strcpy(req_adt_get.set.name, setname);
+--  size = sizeof(req_adt_get);
+--  if (getsockopt(ipset_sock, SOL_IP, 83, &req_adt_get, &size) < 0)
+--    return -1;
+--  req_adt.op = remove ? 0x102 : 0x101;
+--  req_adt.index = req_adt_get.set.index;
+--  req_adt.ip = ntohl(ipaddr->addr.addr4.s_addr);
+--  if (setsockopt(ipset_sock, SOL_IP, 83, &req_adt, sizeof(req_adt)) < 0)
+--    return -1;
+--  
+--  return 0;
+--}
+--
+--
+--
+- int add_to_ipset(const char *setname, const struct all_addr *ipaddr, int flags, int remove)
+- {
+-   int af = AF_INET;
+- 
+- #ifdef HAVE_IPV6
+-   if (flags & F_IPV6)
+--    {
+-       af = AF_INET6;
+--      /* old method only supports IPv4 */
+--      if (old_kernel)
+--	return -1;
+--    }
+- #endif
+-   
+--  return old_kernel ? old_add_to_ipset(setname, ipaddr, remove) : new_add_to_ipset(setname, ipaddr, af, remove);
+-+  return new_add_to_ipset(setname, ipaddr, af, remove);
+- }
+- 
+- #endif
+diff -Naur a/openwrt/package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch b/openwrt/package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch
+--- a/openwrt/package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch	2017-10-18 22:57:32.713534131 +0200
++++ b/openwrt/package/network/services/dnsmasq/patches/210-dnssec-improve-timestamp-heuristic.patch	1970-01-01 01:00:00.000000000 +0100
+@@ -1,49 +0,0 @@
+-From 79e60e145f8a595bca5a784c00b437216d51de68 Mon Sep 17 00:00:00 2001
+-From: Steven Barth <steven@midlink.org>
+-Date: Mon, 13 Apr 2015 09:45:20 +0200
+-Subject: [PATCH] dnssec: improve timestamp heuristic
+-
+-Signed-off-by: Steven Barth <steven@midlink.org>
+----
+- src/dnssec.c | 15 +++++++++++----
+- 1 file changed, 11 insertions(+), 4 deletions(-)
+-
+---- a/src/dnssec.c
+-+++ b/src/dnssec.c
+-@@ -432,17 +432,24 @@ static int back_to_the_future;
+- int setup_timestamp(void)
+- {
+-   struct stat statbuf;
+--  
+-+  time_t now;
+-+  time_t base = 1420070400; /* 1-1-2015 */
+-+
+-   back_to_the_future = 0;
+-   
+-   if (!daemon->timestamp_file)
+-     return 0;
+--  
+-+
+-+  now = time(NULL);
+-+
+-+  if (!stat("/proc/self/exe", &statbuf) && difftime(statbuf.st_mtime, base) > 0)
+-+    base = statbuf.st_mtime;
+-+
+-   if (stat(daemon->timestamp_file, &statbuf) != -1)
+-     {
+-       timestamp_time = statbuf.st_mtime;
+-     check_and_exit:
+--      if (difftime(timestamp_time, time(0)) <=  0)
+-+      if (difftime(now, base) >= 0 && difftime(timestamp_time, now) <=  0)
+- 	{
+- 	  /* time already OK, update timestamp, and do key checking from the start. */
+- 	  if (utime(daemon->timestamp_file, NULL) == -1)
+-@@ -463,7 +470,7 @@ int setup_timestamp(void)
+- 
+- 	  close(fd);
+- 	  
+--	  timestamp_time = timbuf.actime = timbuf.modtime = 1420070400; /* 1-1-2015 */
+-+	  timestamp_time = timbuf.actime = timbuf.modtime = base;
+- 	  if (utime(daemon->timestamp_file, &timbuf) == 0)
+- 	    goto check_and_exit;
+- 	}

From 346d6f7559b9bad8413338d523193c45a1d03770 Mon Sep 17 00:00:00 2001
From: builder2 <builder2>
Date: Mon, 23 Oct 2017 21:38:32 +0200
Subject: [PATCH 18/44] add symlink for i18n

---
 Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 3d87a6f..1b89a82 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ sites/%: config/%.erb
 	mkdir -p $@
 	cd $@ && $(MAKE) -f ../../Makefile site SITE=$(@F)
 
-site: siteclean site.mk site.conf modules
+site: siteclean site.mk site.conf modules i18n
 
 .PHONY: siteclean
 siteclean:
@@ -26,3 +26,6 @@ site.conf:
 
 site.mk:
 	erb -T- ../../config/defaults.erb ../../config/$(SITE).erb ../../template/$@.erb >$@
+
+i18n:
+	ln -s ../../i18n

From c877f452b5fc5005d75b671bbea91af791522a7c Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Tue, 24 Oct 2017 00:43:16 +0200
Subject: [PATCH 19/44] Add package feed for FreifunkHochstift and package
 ffho-ebtables-net-rules

---
 config/defaults.erb  | 1 +
 template/modules.erb | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/defaults.erb b/config/defaults.erb
index 6b6bbd0..0164fcc 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -38,6 +38,7 @@ gluon_site_packages = %w(
 	iwinfo
 	iptables
 	haveged
+	ffho-ebtables-net-rules
 )
 
 gluon_ath10k_mesh = "11s"
diff --git a/template/modules.erb b/template/modules.erb
index 6416262..4810c9b 100644
--- a/template/modules.erb
+++ b/template/modules.erb
@@ -1,5 +1,8 @@
-GLUON_SITE_FEEDS='ffhh_packages'
+GLUON_SITE_FEEDS='ffhh_packages ffho_packages'
 
 PACKAGES_FFHH_PACKAGES_REPO=git://github.com/freifunkhamburg/ffhh-packages.git
 PACKAGES_FFHH_PACKAGES_COMMIT=ef9fcc1222f74c3c045b1450537a4b8b80efb56c
 
+PACKAGES_FFHO_PACKAGES_REPO=git://github.com/FreifunkHochstift/ffho-packages.git
+PACKAGES_FFHO_PACKAGES_COMMIT=72ba236324fb538dc304695285fae059489365b9
+PACKAGES_FFHO_PACKAGES_BRANCH=v2016.2.x

From 355b5e6f1d4729e4f3d16a2ab70fa0d12bd62783 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 27 Oct 2017 20:41:59 +0200
Subject: [PATCH 20/44] add make clean

---
 build.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.sh b/build.sh
index 2d8f476..81d1088 100755
--- a/build.sh
+++ b/build.sh
@@ -66,6 +66,8 @@ for s in $sites; do
 		fi
 	done
 	for t in $targets; do
+		announce make clean for $s/$t... >&2
+		make -j1 clean GLUON_TARGET=$t
 		announce Starting build for $s/$t... >&2
 		make -j$(nproc) GLUON_TARGET=$t $verbose
 	done

From ba35c11afa5800b278748c0eebec43e2c76be4a2 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 27 Oct 2017 20:48:52 +0200
Subject: [PATCH 21/44] allow automatic signing

---
 build.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 81d1088..7312aea 100755
--- a/build.sh
+++ b/build.sh
@@ -7,10 +7,11 @@ function announce () {
 proc=$(nproc)
 gluon_out="${HOME}/firmware"
 
-while getopts g:bj:v opt; do
+while getopts g:j:o:s:bv opt; do
 	case "$opt" in
 		g) gluon_path="$OPTARG" ;;
 		o) gluon_out="$OPTARG" ;;
+		s) signature="$OPTARG" ;;
 		b) export BROKEN=1 ;;
 		j) proc="$OPTARG" ;;
 		v) verbose=V=s ;;
@@ -20,6 +21,7 @@ if [ -z "${gluon_path}" ]; then
 	echo "Usage: $0 -g GLUON_PATH" >&2
 	echo "       -g GLUON_PATH   Path to a checkout of the gluon repository." >&2
 	echo "       -o OUT_PATH     Path to a checkout of the gluon repository. Default: ${gluon_out}" >&2
+	echo "       -s SIGNATURE    Sign firmware with signature" >&2
 	echo "       -b              BROKEN=1" >&2
 	echo "       -v              verbose" >&2
 	echo "       -j JOBS         Run build with -jJOBS. Default: ${proc}" >&2
@@ -73,5 +75,14 @@ for s in $sites; do
 	done
 	announce Building manifest...
 	make manifest
+	if [ -n "${SIGNATURE}" ]; then
+		if [ "$GLUON_BRANCH" == "experimental" ]; then
+			announce Signing
+			"${gluon_path}/contrib/sign.sh" "${SIGNATURE}" "${GLUON_IMAGEDIR}/sysupgrade/experimental.manifest"
+		else
+			echo ERROR: can only sign experimental branch >&2
+			exit 1
+		fi
+	fi
 done
 popd >/dev/null

From 2b08a670a2b8d940da9be2366e170594f3649df3 Mon Sep 17 00:00:00 2001
From: Entil-Zha <entil_zha@hamburg.freifunk.net>
Date: Fri, 27 Oct 2017 21:31:42 +0200
Subject: [PATCH 22/44] add EXTRA_SOFTWARE_TOOLS_01 option in site.mk

---
 template/site.mk.erb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/template/site.mk.erb b/template/site.mk.erb
index 48d48b7..345d9a9 100644
--- a/template/site.mk.erb
+++ b/template/site.mk.erb
@@ -2,6 +2,26 @@ GLUON_SITE_PACKAGES :=<% gluon_site_packages.each do | p | -%>
 <%= " " + p -%>
 <% end -%>
 
+
+# EXTRA_SOFTWARE_TOOLS_01
+EXTRA_SOFTWARE_TOOLS_01 := \
+        nano \
+        htop \
+        ethtool
+
+# x86
+ifeq ($(GLUON_TARGET),x86-generic)
+GLUON_SITE_PACKAGES += \
+    $(EXTRA_SOFTWARE_TOOLS_01)
+endif
+
+# x86-64
+ifeq ($(GLUON_TARGET),x86-64)
+GLUON_SITE_PACKAGES += \
+    $(EXTRA_SOFTWARE_TOOLS_01)
+endif
+
+
 DEFAULT_GLUON_RELEASE := <%= gluon_release %>
 
 # Allow overriding the release number from the command line

From 985f728b7d08fd1fac2c847a84a9cb016ef7bb37 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 27 Oct 2017 22:53:50 +0200
Subject: [PATCH 23/44] =?UTF-8?q?ffhh-nowe,=20ost,=20west=20als=20sites=20?=
 =?UTF-8?q?hinzuf=C3=BCgen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile             |  2 +-
 config/ffhh-nowe.erb | 42 ++++++++++++++++++++++++++++++++++++++++++
 config/ffhh-ost.erb  | 42 ++++++++++++++++++++++++++++++++++++++++++
 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/Makefile b/Makefile
index 1b89a82..f6adc3d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-sites: clean info sites/ffhh sites/ffhh-sued
+sites: clean info sites/ffhh sites/ffhh-sued sites/ffhh-nowe sites/ffhh-west sites/ffhh-ost
 
 info: config/defaults.erb template/info.erb
 	erb -T- config/defaults.erb template/$@.erb >$@
diff --git a/config/ffhh-nowe.erb b/config/ffhh-nowe.erb
new file mode 100644
index 0000000..579ddbd
--- /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" => "cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58",
+		"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" => "fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf",
+		"remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10008' ]
+	},
+	"gateway05" => {
+		"key" => "84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5",
+		"remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10008' ]
+	},
+	"gateway06" => {
+		"key" => "fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6",
+		"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..1514614
--- /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" => "cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58",
+		"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" => "fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf",
+		"remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10010' ]
+	},
+	"gateway05" => {
+		"key" => "84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5",
+		"remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10010' ]
+	},
+	"gateway06" => {
+		"key" => "fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6",
+		"remotes" => [ '"gw06-new.hamburg.freifunk.net" port 10010' ]
+	},
+}
+-%>
diff --git a/config/ffhh-west.erb b/config/ffhh-west.erb
new file mode 100644
index 0000000..953eca9
--- /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" => "cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58",
+		"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" => "fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf",
+		"remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10006' ]
+	},
+	"gateway05" => {
+		"key" => "84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5",
+		"remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10006' ]
+	},
+	"gateway06" => {
+		"key" => "fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6",
+		"remotes" => [ '"gw06-new.hamburg.freifunk.net" port 10006' ]
+	},
+}
+-%>

From 8cc4ec82e31f15d2bd0d0778b0c968234ce09398 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sat, 28 Oct 2017 12:33:32 +0200
Subject: [PATCH 24/44] fix signature

---
 build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index 7312aea..1008a5f 100755
--- a/build.sh
+++ b/build.sh
@@ -75,10 +75,10 @@ for s in $sites; do
 	done
 	announce Building manifest...
 	make manifest
-	if [ -n "${SIGNATURE}" ]; then
+	if [ -n "${signature}" ]; then
 		if [ "$GLUON_BRANCH" == "experimental" ]; then
 			announce Signing
-			"${gluon_path}/contrib/sign.sh" "${SIGNATURE}" "${GLUON_IMAGEDIR}/sysupgrade/experimental.manifest"
+			"${gluon_path}/contrib/sign.sh" "${signature}" "${GLUON_IMAGEDIR}/sysupgrade/experimental.manifest"
 		else
 			echo ERROR: can only sign experimental branch >&2
 			exit 1

From 7f5f4476bdd98637867d6a237701de61e7d87e1d Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Sat, 28 Oct 2017 13:09:57 +0200
Subject: [PATCH 25/44] change default output path

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 1008a5f..c291eb6 100755
--- a/build.sh
+++ b/build.sh
@@ -53,7 +53,7 @@ pushd "${gluon_path}" >/dev/null
 announce Starting make update...
 for s in $sites; do
 	export GLUON_SITEDIR="${site_path}/sites/${s}"
-	export GLUON_OUTPUTDIR="${gluon_out}/${s}/${GLUON_BRANCH}/${GLUON_RELEASE}"
+	export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_BRANCH}/${GLUON_RELEASE}/${s}"
 	export GLUON_IMAGEDIR="${GLUON_OUTPUTDIR}/images"
 	export GLUON_MODULEDIR="${GLUON_OUTPUTDIR}/modules"
 	rm -rf "${GLUON_OUTPUTDIR}"

From 36c02b0081a7cede7cc441298b61c21bc05fcb63 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 30 Oct 2017 01:11:24 +0100
Subject: [PATCH 26/44] - change to the output path slightly to allow for
 easier uploading - allow specifying sites to build through environment
 variables

---
 .gitignore | 1 +
 build.sh   | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5502124..81b1ca8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 info
+sites
diff --git a/build.sh b/build.sh
index c291eb6..e3b29df 100755
--- a/build.sh
+++ b/build.sh
@@ -43,8 +43,9 @@ make
 export GLUON_RELEASE
 export GLUON_BRANCH
 # get the available sites...
-sites=""
-for s in sites/*; do sites="${sites} ${s##*/}"; done
+if [ "$sites" == "" ]; then
+	for s in sites/*; do sites="${sites} ${s##*/}"; done
+fi
 announce Gluon will be built for the following sites:$sites >&2
 announce The following targets will be generated: $targets >&2
 popd >/dev/null
@@ -53,7 +54,7 @@ pushd "${gluon_path}" >/dev/null
 announce Starting make update...
 for s in $sites; do
 	export GLUON_SITEDIR="${site_path}/sites/${s}"
-	export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_BRANCH}/${GLUON_RELEASE}/${s}"
+	export GLUON_OUTPUTDIR="${gluon_out}/${GLUON_RELEASE}/${GLUON_BRANCH}/${s}"
 	export GLUON_IMAGEDIR="${GLUON_OUTPUTDIR}/images"
 	export GLUON_MODULEDIR="${GLUON_OUTPUTDIR}/modules"
 	rm -rf "${GLUON_OUTPUTDIR}"

From 3d00c57e505401aa219337c6611994a8d5879f27 Mon Sep 17 00:00:00 2001
From: Daniel Frank <github-523@danielfrank.net>
Date: Mon, 30 Oct 2017 21:01:49 +0100
Subject: [PATCH 27/44] Fix path to the generated info file

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index e3b29df..b193a38 100755
--- a/build.sh
+++ b/build.sh
@@ -39,7 +39,7 @@ announce FFHH SITES: $site_path >&2
 announce Building site repo and reading data >&2
 pushd $site_path > /dev/null
 make
-. info
+. ./info
 export GLUON_RELEASE
 export GLUON_BRANCH
 # get the available sites...

From c25f21dc6a90ad20969d748792c68da370ab35b2 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 30 Oct 2017 23:47:34 +0100
Subject: [PATCH 28/44] new fastd keys for gw04,05,06

---
 config/ffhh-nowe.erb | 6 +++---
 config/ffhh-ost.erb  | 6 +++---
 config/ffhh-sued.erb | 6 +++---
 config/ffhh-west.erb | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config/ffhh-nowe.erb b/config/ffhh-nowe.erb
index 579ddbd..b851323 100644
--- a/config/ffhh-nowe.erb
+++ b/config/ffhh-nowe.erb
@@ -27,15 +27,15 @@ gateways = {
 		"remotes" => [ '"gw03-new.hamburg.freifunk.net" port 10007' ]
 	},
 	"gateway04" => {
-		"key" => "fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf",
+		"key" => "a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669",
 		"remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10008' ]
 	},
 	"gateway05" => {
-		"key" => "84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5",
+		"key" => "291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f",
 		"remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10008' ]
 	},
 	"gateway06" => {
-		"key" => "fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6",
+		"key" => "8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43",
 		"remotes" => [ '"gw06-new.hamburg.freifunk.net" port 10008' ]
 	},
 }
diff --git a/config/ffhh-ost.erb b/config/ffhh-ost.erb
index 1514614..624a50f 100644
--- a/config/ffhh-ost.erb
+++ b/config/ffhh-ost.erb
@@ -27,15 +27,15 @@ gateways = {
 		"remotes" => [ '"gw03-new.hamburg.freifunk.net" port 10009' ]
 	},
 	"gateway04" => {
-		"key" => "fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf",
+		"key" => "a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669",
 		"remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10010' ]
 	},
 	"gateway05" => {
-		"key" => "84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5",
+		"key" => "291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f",
 		"remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10010' ]
 	},
 	"gateway06" => {
-		"key" => "fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6",
+		"key" => "8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43",
 		"remotes" => [ '"gw06-new.hamburg.freifunk.net" port 10010' ]
 	},
 }
diff --git a/config/ffhh-sued.erb b/config/ffhh-sued.erb
index cc64d7f..76c1cae 100644
--- a/config/ffhh-sued.erb
+++ b/config/ffhh-sued.erb
@@ -27,15 +27,15 @@ gateways = {
 		"remotes" => [ '"gw03-new.hamburg.freifunk.net" port 10003' ]
 	},
 	"gateway04" => {
-		"key" => "fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf",
+		"key" => "a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669",
 		"remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10004' ]
 	},
 	"gateway05" => {
-		"key" => "84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5",
+		"key" => "291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f",
 		"remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10004' ]
 	},
 	"gateway06" => {
-		"key" => "fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6",
+		"key" => "8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43",
 		"remotes" => [ '"gw06-new.hamburg.freifunk.net" port 10004' ]
 	},
 }
diff --git a/config/ffhh-west.erb b/config/ffhh-west.erb
index 953eca9..8480d0a 100644
--- a/config/ffhh-west.erb
+++ b/config/ffhh-west.erb
@@ -27,15 +27,15 @@ gateways = {
 		"remotes" => [ '"gw03-new.hamburg.freifunk.net" port 10005' ]
 	},
 	"gateway04" => {
-		"key" => "fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf",
+		"key" => "a00e092c236c3b56043fb3b5d0b3da3da08d8325fb18e7bae6ed035d50d50669",
 		"remotes" => [ '"gw04-new.hamburg.freifunk.net" port 10006' ]
 	},
 	"gateway05" => {
-		"key" => "84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5",
+		"key" => "291197d88a5ed510a62fec87f30d13315c1e031c62c927c23e1643a72796708f",
 		"remotes" => [ '"gw05-new.hamburg.freifunk.net" port 10006' ]
 	},
 	"gateway06" => {
-		"key" => "fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6",
+		"key" => "8d400e8a9db05b145c36583d46b4170f6b66d1e16177540f8a2f9f5ad0dc4c43",
 		"remotes" => [ '"gw06-new.hamburg.freifunk.net" port 10006' ]
 	},
 }

From 0cb07093738a22d8ade19888c8b1a7573f7a2575 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Wed, 1 Nov 2017 21:38:24 +0100
Subject: [PATCH 29/44] 11s mesh id automatisch berechnen aus dem site_code
 kompatibel zu ffhh-sued

---
 template/site.conf.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/site.conf.erb b/template/site.conf.erb
index da0bae7..5ddc5d4 100644
--- a/template/site.conf.erb
+++ b/template/site.conf.erb
@@ -28,7 +28,7 @@
 		},
 <% if gluon_ath10k_mesh == "11s" -%>
 		mesh = {
-			id = '6668682D73756564',
+			id = '<%= site_code.prepend("00000000")[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>'
 			mcast_rate = 12000,
 		},
 <% else -%>
@@ -47,7 +47,7 @@
 		},
 <% if gluon_ath10k_mesh == "11s" -%>
 		mesh = {
-			id = '6668682D73756564',
+			id = '<%= site_code.prepend("00000000")[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>'
 			mcast_rate = 12000,
 		},
 <% else -%>

From a4e873bf09d48af2009f7d6ec04038c252ca2d5d Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Wed, 1 Nov 2017 22:41:39 +0100
Subject: [PATCH 30/44] zwei kommas fehlten

---
 template/site.conf.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/site.conf.erb b/template/site.conf.erb
index 5ddc5d4..a37f5aa 100644
--- a/template/site.conf.erb
+++ b/template/site.conf.erb
@@ -28,7 +28,7 @@
 		},
 <% if gluon_ath10k_mesh == "11s" -%>
 		mesh = {
-			id = '<%= site_code.prepend("00000000")[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>'
+			id = '<%= site_code.prepend("00000000")[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>',
 			mcast_rate = 12000,
 		},
 <% else -%>
@@ -47,7 +47,7 @@
 		},
 <% if gluon_ath10k_mesh == "11s" -%>
 		mesh = {
-			id = '<%= site_code.prepend("00000000")[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>'
+			id = '<%= site_code.prepend("00000000")[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>',
 			mcast_rate = 12000,
 		},
 <% else -%>

From af3b4c09ed279b84648c823857b1d699852e8cea Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Thu, 2 Nov 2017 09:33:08 +0100
Subject: [PATCH 31/44] =?UTF-8?q?Mehr=20Automatisierung=20und=20Flexibilit?=
 =?UTF-8?q?=C3=A4t=20in=20build.sh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.sh | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/build.sh b/build.sh
index b193a38..409ba8e 100755
--- a/build.sh
+++ b/build.sh
@@ -7,12 +7,15 @@ function announce () {
 proc=$(nproc)
 gluon_out="${HOME}/firmware"
 
-while getopts g:j:o:s:bv opt; do
+while getopts g:j:l:o:s:bmv opt; do
 	case "$opt" in
 		g) gluon_path="$OPTARG" ;;
+		l) sites="$OPTARG" ;;
 		o) gluon_out="$OPTARG" ;;
 		s) signature="$OPTARG" ;;
+		u) uploadscript="$OPTARG" ;;
 		b) export BROKEN=1 ;;
+		m) dont_make_sites=1 ;;
 		j) proc="$OPTARG" ;;
 		v) verbose=V=s ;;
 	esac
@@ -20,9 +23,12 @@ done
 if [ -z "${gluon_path}" ]; then
 	echo "Usage: $0 -g GLUON_PATH" >&2
 	echo "       -g GLUON_PATH   Path to a checkout of the gluon repository." >&2
+	echo "       -l SITES        Comma separated list of sites to build" >&2
 	echo "       -o OUT_PATH     Path to a checkout of the gluon repository. Default: ${gluon_out}" >&2
 	echo "       -s SIGNATURE    Sign firmware with signature" >&2
+	echo "       -u UPLOADSCRIPT Run UPLOADSCRIPT after building. Argument: $gluon_out/<GLUON_RELEASE>" >&2
 	echo "       -b              BROKEN=1" >&2
+	echo "       -m              Do not regenerate the sites" >&2
 	echo "       -v              verbose" >&2
 	echo "       -j JOBS         Run build with -jJOBS. Default: ${proc}" >&2
 	exit 1
@@ -33,16 +39,19 @@ gluon_out=$(realpath $gluon_out)
 site_path=$(realpath $(dirname $BASH_SOURCE))
 
 announce GLUON: $gluon_path >&2
-announce FFHH SITES: $site_path >&2
+announce FFHH SITE PATH: $site_path >&2
 
-# Build the site repo and generate all site configs
-announce Building site repo and reading data >&2
 pushd $site_path > /dev/null
-make
+if [ "$dont_make_sites" == "" ]; then
+	# Build the site repo and generate all site configs
+	announce Building site repo and reading data >&2
+	make
+fi
 . ./info
 export GLUON_RELEASE
 export GLUON_BRANCH
 # get the available sites...
+sites="$(echo "$sites" | sed -e 's_,_ _g')"
 if [ "$sites" == "" ]; then
 	for s in sites/*; do sites="${sites} ${s##*/}"; done
 fi
@@ -87,3 +96,7 @@ for s in $sites; do
 	fi
 done
 popd >/dev/null
+if [ -n "$uploadscript" ]; then
+		announce Starting upload. Executing: $uploadscript $gluon_out/$GLUON_RELEASE
+		"$uploadscript" "$gluon_out/$GLUON_RELEASE"
+fi

From ef8b330e324fcbf4a21e5c6228c9fcfec033a12e Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 3 Nov 2017 21:09:12 +0100
Subject: [PATCH 32/44] fix site_code

---
 template/site.conf.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/site.conf.erb b/template/site.conf.erb
index a37f5aa..0a506e6 100644
--- a/template/site.conf.erb
+++ b/template/site.conf.erb
@@ -28,7 +28,7 @@
 		},
 <% if gluon_ath10k_mesh == "11s" -%>
 		mesh = {
-			id = '<%= site_code.prepend("00000000")[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>',
+			id = '<%= ("00000000" + site_code)[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>',
 			mcast_rate = 12000,
 		},
 <% else -%>
@@ -47,7 +47,7 @@
 		},
 <% if gluon_ath10k_mesh == "11s" -%>
 		mesh = {
-			id = '<%= site_code.prepend("00000000")[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>',
+			id = '<%= ("00000000" + site_code)[-8..-1].each_byte.map { |b| b.to_s(16) }.join.upcase %>',
 			mcast_rate = 12000,
 		},
 <% else -%>

From afb92c49dbffb08b03ea0ee47023267f3c60b1c3 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 6 Nov 2017 21:32:40 +0100
Subject: [PATCH 33/44] fix build scripts

---
 build.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.sh b/build.sh
index 409ba8e..5205ce0 100755
--- a/build.sh
+++ b/build.sh
@@ -7,7 +7,7 @@ function announce () {
 proc=$(nproc)
 gluon_out="${HOME}/firmware"
 
-while getopts g:j:l:o:s:bmv opt; do
+while getopts g:j:l:o:s:u:bmv opt; do
 	case "$opt" in
 		g) gluon_path="$OPTARG" ;;
 		l) sites="$OPTARG" ;;
@@ -41,7 +41,7 @@ site_path=$(realpath $(dirname $BASH_SOURCE))
 announce GLUON: $gluon_path >&2
 announce FFHH SITE PATH: $site_path >&2
 
-pushd $site_path > /dev/null
+pushd $site_path
 if [ "$dont_make_sites" == "" ]; then
 	# Build the site repo and generate all site configs
 	announce Building site repo and reading data >&2
@@ -57,9 +57,9 @@ if [ "$sites" == "" ]; then
 fi
 announce Gluon will be built for the following sites:$sites >&2
 announce The following targets will be generated: $targets >&2
-popd >/dev/null
+popd
 
-pushd "${gluon_path}" >/dev/null
+pushd "${gluon_path}"
 announce Starting make update...
 for s in $sites; do
 	export GLUON_SITEDIR="${site_path}/sites/${s}"
@@ -95,7 +95,7 @@ for s in $sites; do
 		fi
 	fi
 done
-popd >/dev/null
+popd
 if [ -n "$uploadscript" ]; then
 		announce Starting upload. Executing: $uploadscript $gluon_out/$GLUON_RELEASE
 		"$uploadscript" "$gluon_out/$GLUON_RELEASE"

From e5bbdfdb5dce3d8ad0c9f4c7264bae1e531fb8d3 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 6 Nov 2017 21:40:37 +0100
Subject: [PATCH 34/44] 0.8.5 stable

---
 config/defaults.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/defaults.erb b/config/defaults.erb
index 0164fcc..d3c969a 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -1,6 +1,6 @@
 <%
-#gluon_branch = "stable"
-gluon_branch = "experimental"
+gluon_branch = "stable"
+#gluon_branch = "experimental"
 gluon_release = "0.8.5"
 
 # Add the +exp and current date if this is an experimental release

From bebf00c2aeef70ad501c21a60cd72b5e4303ba02 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Tue, 7 Nov 2017 21:20:56 +0100
Subject: [PATCH 35/44] Update readme for 0.8.5 and fix usage message in
 build.sh

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 5205ce0..55974cf 100755
--- a/build.sh
+++ b/build.sh
@@ -24,7 +24,7 @@ if [ -z "${gluon_path}" ]; then
 	echo "Usage: $0 -g GLUON_PATH" >&2
 	echo "       -g GLUON_PATH   Path to a checkout of the gluon repository." >&2
 	echo "       -l SITES        Comma separated list of sites to build" >&2
-	echo "       -o OUT_PATH     Path to a checkout of the gluon repository. Default: ${gluon_out}" >&2
+	echo "       -o OUT_PATH     Path to the firmware output directory. Default: ${gluon_out}" >&2
 	echo "       -s SIGNATURE    Sign firmware with signature" >&2
 	echo "       -u UPLOADSCRIPT Run UPLOADSCRIPT after building. Argument: $gluon_out/<GLUON_RELEASE>" >&2
 	echo "       -b              BROKEN=1" >&2

From 6691d804546666aa764bdfc94692154c54cfe4f2 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 20 Nov 2017 19:43:05 +0100
Subject: [PATCH 36/44] Baldo hat den Key nicht mehr

---
 config/defaults.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/defaults.erb b/config/defaults.erb
index d3c969a..b388f48 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -44,7 +44,6 @@ gluon_site_packages = %w(
 gluon_ath10k_mesh = "11s"
 
 signing_keys = [
-		'417ef22f886539ddbcffbad35e9f493195ca53e05f75bd8d8011a4999498b589', # baldo
 		'ef73bc52b929fd11efce9a5c8f0b5463f1766bb995c8a0b3b6bcd7ba45b8b1e6', # leo
 		'3f0fc50d4e5c893f9f58f98874bd21080b93c28ff5e4d4946352cada1b4e6441', # andre
 		'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', # gernot

From 32bd3430a43f465a0699e18100177db4fa0c1cc8 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 20 Nov 2017 19:43:30 +0100
Subject: [PATCH 37/44] .

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 8952b85..7428139 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- 0.8.5: v2016.2.7 Domain split, new package: ffho-ebtables-net-rules
 - 0.8.4: v2016.2.7 (updated openwrt/package/network/services/dnsmasq/Makefile: PKG\_VERSION:=2.78 & PKG\_MD5SUM:=6d0241b72c79d2b510776ccc4ed69ca4)
 - 0.8.3: v2016.2.6 (ffhh-sued only)
 - 0.8.2: v2016.2.5

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

---
 config/ffhh-nowe.erb | 2 +-
 config/ffhh-ost.erb  | 2 +-
 config/ffhh-sued.erb | 2 +-
 config/ffhh-west.erb | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/ffhh-nowe.erb b/config/ffhh-nowe.erb
index b851323..f7d3f61 100644
--- a/config/ffhh-nowe.erb
+++ b/config/ffhh-nowe.erb
@@ -15,7 +15,7 @@ mtu = 1312
 
 gateways = {
 	"gateway01" => {
-		"key" => "cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58",
+		"key" => "aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b",
 		"remotes" => [ '"gw01-new.hamburg.freifunk.net" port 10007' ]
 	},
 	"gateway02" => {
diff --git a/config/ffhh-ost.erb b/config/ffhh-ost.erb
index 624a50f..53052c8 100644
--- a/config/ffhh-ost.erb
+++ b/config/ffhh-ost.erb
@@ -15,7 +15,7 @@ mtu = 1312
 
 gateways = {
 	"gateway01" => {
-		"key" => "cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58",
+		"key" => "aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b",
 		"remotes" => [ '"gw01-new.hamburg.freifunk.net" port 10009' ]
 	},
 	"gateway02" => {
diff --git a/config/ffhh-sued.erb b/config/ffhh-sued.erb
index 76c1cae..a8b1ea4 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
index 8480d0a..428199e 100644
--- a/config/ffhh-west.erb
+++ b/config/ffhh-west.erb
@@ -15,7 +15,7 @@ mtu = 1312
 
 gateways = {
 	"gateway01" => {
-		"key" => "cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58",
+		"key" => "aa88fb5cc3e729c124589e3714b817a505d809f381d9b3494040c382edfd4f3b",
 		"remotes" => [ '"gw01-new.hamburg.freifunk.net" port 10005' ]
 	},
 	"gateway02" => {

From 0971a6125c5dcf54eb4854b4e7a3f67526c40b69 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 18 Dec 2017 20:07:15 +0100
Subject: [PATCH 39/44] Neuer NTP-Server 3.ntp.services.ffhh

---
 template/site.conf.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/site.conf.erb b/template/site.conf.erb
index 0a506e6..082b55d 100644
--- a/template/site.conf.erb
+++ b/template/site.conf.erb
@@ -14,7 +14,7 @@
 	prefix6 = '<%= prefix6 %>',
 
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-	ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh'},
+	ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh','3.ntp.services.ffhh'},
 	regdom = 'DE',
 
 	wifi24 = {

From 39052e5892f81e4f515b99a40e45e6ca7218e7ee Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 18 Dec 2017 20:56:07 +0100
Subject: [PATCH 40/44] start 0.8.6 experimental

---
 config/defaults.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/defaults.erb b/config/defaults.erb
index b388f48..1b7d27b 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -1,7 +1,7 @@
 <%
-gluon_branch = "stable"
-#gluon_branch = "experimental"
-gluon_release = "0.8.5"
+#gluon_branch = "stable"
+gluon_branch = "experimental"
+gluon_release = "0.8.6"
 
 # Add the +exp and current date if this is an experimental release
 gluon_release += "+exp" + Time.new.strftime("%Y%m%d") if gluon_branch == "experimental"

From 728b929aa46c51e674f4f4248005eb6fb98ae5a8 Mon Sep 17 00:00:00 2001
From: Alexander <7adietri@users.noreply.github.com>
Date: Mon, 18 Dec 2017 21:55:46 +0100
Subject: [PATCH 41/44] Add key for Alexander

---
 config/defaults.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/defaults.erb b/config/defaults.erb
index 1b7d27b..96efba9 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -49,6 +49,7 @@ signing_keys = [
 		'1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', # gernot
 		'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', # bjoern
 		'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', # daniel
+		'961495a04512e5ba1843fd3c216d8af6ef2fdb19f93055142803e2da26d670b9', # alexander
 ]
 signing_keys_experimental = [
 		'1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', # 1.builder

From f90ed57970e7bcaf853f52c92e657363d4c83af2 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Mon, 18 Dec 2017 22:01:55 +0100
Subject: [PATCH 42/44] Add key for Olli

---
 config/defaults.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/defaults.erb b/config/defaults.erb
index 96efba9..921bd43 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -50,6 +50,7 @@ signing_keys = [
 		'bd5a70d4c3df30eaa860d615c0e0526b0dda5bc60c09c20972bce4ffa7512659', # bjoern
 		'd9992853c0fe1a2e983cc222b6bd26e70d4fb2a53862ac099144e9e8142238d0', # daniel
 		'961495a04512e5ba1843fd3c216d8af6ef2fdb19f93055142803e2da26d670b9', # alexander
+		'ed6278f168f0382adf4f058cb9c31d8f1145abb968a8626045de7d6d87a0be40', # olli
 ]
 signing_keys_experimental = [
 		'1a0112fe489860068480c611c5dc56196c2f1a645db651ea2ed19ae0f0e8e1d1', # 1.builder

From 4c702f767f15f3b2685db315c5ded28cb908a1e4 Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Wed, 20 Dec 2017 23:12:29 +0100
Subject: [PATCH 43/44] Entfernen der alten ffhh-Domain

---
 Makefile        |  2 +-
 config/ffhh.erb | 54 -------------------------------------------------
 2 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 config/ffhh.erb

diff --git a/Makefile b/Makefile
index f6adc3d..08c41b8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-sites: clean info sites/ffhh sites/ffhh-sued sites/ffhh-nowe sites/ffhh-west sites/ffhh-ost
+sites: clean info sites/ffhh-nowe sites/ffhh-ost sites/ffhh-sued sites/ffhh-west
 
 info: config/defaults.erb template/info.erb
 	erb -T- config/defaults.erb template/$@.erb >$@
diff --git a/config/ffhh.erb b/config/ffhh.erb
deleted file mode 100644
index 4edaff8..0000000
--- a/config/ffhh.erb
+++ /dev/null
@@ -1,54 +0,0 @@
-<%
-site_name = 'Freifunk Hamburg'
-site_code = 'ffhh'
-
-gluon_site_packages += %w( gluon-mesh-batman-adv-14 gluon-alfred )
-gluon_ath10k_mesh = "ibss"
-
-prefix4 = '10.112.0.0/18'
-prefix6 = '2a03:2267::/64'
-
-next_node_ipv4 = '10.112.0.1'
-next_node_ipv6 = '2a03:2267::1'
-
-mtu = 1280
-
-gateways = {
-	"gateway01" => {
-		"key" => "cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58",
-		"remotes" => [ '"gw01.hamburg.freifunk.net" port 10001' ]
-	},
-	"gateway02" => {
-		"key" => "462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0",
-		"remotes" => [ '"gw02.hamburg.freifunk.net" port 10001' ]
-	},
-	"gateway03" => {
-		"key" => "e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546",
-		"remotes" => [ '"gw03.hamburg.freifunk.net" port 10001' ]
-	},
-	"gateway04" => {
-		"key" => "fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf",
-		"remotes" => [ '"gw04.hamburg.freifunk.net" port 10000' ]
-	},
-	"gateway05" => {
-		"key" => "84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5",
-		"remotes" => [ '"gw05.hamburg.freifunk.net" port 10001' ]
-	},
-	"gateway06" => {
-		"key" => "fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6",
-		"remotes" => [ '"gw06.hamburg.freifunk.net" port 10000' ]
-	},
-	"gateway08" => {
-		"key" => "67e9b215248ada3f4ffcc9db0bdf897128f6236a0d4e8d660762b77bebc914d4",
-		"remotes" => [ '"gw08.hamburg.freifunk.net" port 10001' ]
-	},
-	"gateway09" => {
-		"key" => "5f483f6d26ac9106d86c0edcd08cf92c18caf67933719a394915ab809d1fb2bc",
-		"remotes" => [ '"gw09.hamburg.freifunk.net" port 10001' ]
-	},
-	"gateway12" => {
-		"key" => "facbbfb07525782fcde22b929f36ea508a295619eca35782003d9ca2dd3cc524",
-		"remotes" => [ '"gw12.hamburg.freifunk.net" port 10001' ]
-	}
-}
--%>

From df8c26442f076ff71d20c22468a11e0d98337a3f Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Wed, 20 Dec 2017 23:14:40 +0100
Subject: [PATCH 44/44] README.md fuer 0.8.6 aktualisieren

---
 README.md           | 1 +
 config/defaults.erb | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7428139..1fe6667 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu
 
 #### Gluon versions used for specific Hamburg Freifunk Firmware builds
 
+- 0.8.6: v2016.2.7 Fix gw01-new key, add 3.ntp.services.ffhh to NTP servers, add Firmware signing keys for Alexander and Olli, remove old domain
 - 0.8.5: v2016.2.7 Domain split, new package: ffho-ebtables-net-rules
 - 0.8.4: v2016.2.7 (updated openwrt/package/network/services/dnsmasq/Makefile: PKG\_VERSION:=2.78 & PKG\_MD5SUM:=6d0241b72c79d2b510776ccc4ed69ca4)
 - 0.8.3: v2016.2.6 (ffhh-sued only)
diff --git a/config/defaults.erb b/config/defaults.erb
index 921bd43..3f9cb64 100644
--- a/config/defaults.erb
+++ b/config/defaults.erb
@@ -1,6 +1,6 @@
 <%
-#gluon_branch = "stable"
-gluon_branch = "experimental"
+gluon_branch = "stable"
+#gluon_branch = "experimental"
 gluon_release = "0.8.6"
 
 # Add the +exp and current date if this is an experimental release