From 32a79b12736b9d0b14bc71852caaeaf813d19cae Mon Sep 17 00:00:00 2001
From: Martin Geno <geno+dev@fireorbit.de>
Date: Tue, 28 Jun 2016 11:54:59 +0200
Subject: [PATCH] first try

---
 modules   |  3 ++-
 site.conf | 30 ++++++++++++++++++------------
 site.mk   | 23 +++--------------------
 3 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/modules b/modules
index afcc78f..f4e1295 100644
--- a/modules
+++ b/modules
@@ -1,4 +1,5 @@
 GLUON_SITE_FEEDS='ffhb'
 
 PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
-PACKAGES_FFHB_COMMIT=93bfe6b062c89ab4bedb132ca4d75e432598fabb
+PACKAGES_FFHB_BRANCH=breminale2016
+PACKAGES_FFHB_COMMIT=5020b35f0494cace699b02e7474aba07ee7d5ad1
diff --git a/site.conf b/site.conf
index 57070ca..c695c94 100644
--- a/site.conf
+++ b/site.conf
@@ -1,8 +1,14 @@
 {
+	authorized_keys = {
+		'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAB+wDB2igl2t36Z8KlmnCuiA7V8mTjo3qYtOeoCQv4Xq9zN8xC9B4LEZObJ0InRQz7CLODMNFyWGwU4nfcwvVspIunOTrP3eCg8UfW/AVbWzmuCe8RNzvMF32f6Bj7RZ+bOJ5Xk/WuFkXZUjhBgCUZ+WoYuBjEjbXxlIkrofGqbQv0Kh7eJhMNioN+z6jVPh3S83RzMqSGWjD/GyN0znzjOSNQwY9oyCrBzBY1E0npTvfwT7VjbpzTkknu++YL5cg8DvnrjbQcTX7JEoigAruL3m025T1b2Ti2YPO+NHmeO2SDZq5PVn+2RDo1lVMtJDTwv5+fuaLaRlKI2gT596LttrvYsXBhW6ZmElCoq+1I2EQR2plSj/0ritm6NjHHFCPnjoqVU6kH0VKEuR02Jv14TtBCsJQ7rod36BkYFp7RIGOAAsJwnARUH/b6ObQj9000i0/wKF1V0VMFmLoVQs7EP6y952Ka7K1fZT08cl2FqWwSexSB+Ql8A79736xX4RjrzZMY4qP8V32lDXUsWhAoc3zyuy94gqsKCGqeB6aWBkisiRICYyOxGO1imRLrzn9XA+ttvofgmG7pDHTVYuGRuuwhPbmqJ4wWO5FJ61Bn+SW/BWWe1Ivn+mmTnghRNlFfFA8Da55APdKxhKPnJ60fjjePQqGvfcJ0NLEPGw== genofire@fireThink',
+		'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDOO25b/uRIpbNRxw5/1JSKYcH2kQtcOYpj4V4STjzW386smi0nlQcJGsiCYxvxwBadlHmVgqgIGV+rYdcjvUTWpG1fWxRPLR1haxZ7znWBabpL5oeUYmOkE9uMxsdJYHgGF1fSv8rX3VZaSS6pW33k+RzWsOa7VaXT1Uxp/A3bJf07HsTxpN4XZE2rrjDUL22CwCDDySayrJvyIMRTtwwpt/ipi64QjI8aMUtaqov72cK5sVWsBAFhEQDUM3hl1myHHh+byqXePeyE9N9NoLHljRvZE/iRhGQL9RoyrUINl76Ui5MlSR9yzocopm9FtVSHGWawR/hrU1Bx5p34DuaaOa3AQzWx91vQLIAZDDXwQkfdzM9sxPocmiYDtlcePQ2aRMxTE0txFj0isr5mlxFY5Ypr3K5PJMKdVeMEOZIMqhCvjY0yJGV+DMMQpgOMAUPOWw2LmZ/T3FwnekiCun/aYcd1BPE+JLzmqIaRMwaYG5f4LcaVDw87QGRUeSHaTrEv28qTP2n0AONT1U1YqmrJsyM9D3f1B1hdR/m5odNtQSYLVj8GiWUaXMJghRbg3r46IRgxSCNKGPjNl/vBNN8axa4WCggavOCgkaGwfOEOloi9rlUr53iPYDf01Kil1LRJeu+KaaZD2Uy0TNs10Dv0QElIHvr4fKFzpEn6UnIfhQ== breminale2016: respond-collector',
+		'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDi0/Hg4GwG++2kCNv2cr5z94+xFOStXDz8cJEuGJskNaURaugXcJr6tvhEYHdRnQKtFP2TU9WWNMh+OknJITtQNJIWQ3Efv9fU2u4mgn37ds9XBjY7Xl+lm1zjxf+bTAr8rJ4K5qVs+hclP+wNeDN0I/h00YX9qAhfl0Uj2K6WdUjAf+JhHbWi4NVu0n0fqbt072i0xWcR0XLxjS0DP4q9XCo3kDJl4+eAXMgXhLklnA2MqzJMzHes5VywgjDEuwH5ApFRnde/YBkNkQB/BjtuxrnxFhcNXpK4OwajT1xoMjLvXSIBP+ygztt+xb10GqkAJDe27iSrBxkbogL5cLcT8Lm8QaxYW/ZZbp45Qw/SxbpIVhrybgpG/JRrkds2njyyhR7mp9CBQoP5yh0Pz6GrH/RjyMA+aMQBfmRw6CQnilmuHbk9kIEUj9AtmBySh7oG1fUkCff7H+A10drMcjPQCrr8MEuyWsOC438b9yM9FUz3SO/aoeA5saehiY94anJ1db8GKFuvcJdh+Fi+3iFYjNU4rUAc8spDAVEp6aSu6VDQlQyRT4asr5wKHudMtCMeyjqXwWS7gjBW1l1Iloh8/TDmkFsQrm80xqHeNgBbtpgL6QoWZFNX1GArjjYHn97hcHI7QmwZhjicZiS+FX5miDBEqpDK/gK0VVNXUevl0w== breminale2016',
+	},
+	hostname_prefix = 'breminale-',
 	site_name = 'Freifunk Bremen',
 	site_code = 'ffhb',
 
-	prefix4 = '10.196.0.0/17',
+	prefix4 = '10.196.128.0/17',
 	prefix6 = '2a06:8782:ffbb:1337::/64',
 
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
@@ -22,11 +28,11 @@
 		ap = {
 			ssid = 'bremen.freifunk.net',
 		},
-		ibss = {
-			ssid = 'mesh.ffhb.de',
-			bssid = '32:06:1C:1F:B9:E8',
-			mcast_rate = 6000,
-		},
+		--ibss = {
+		--	ssid = 'mesh.ffhb.de',
+		--	bssid = '32:06:1C:1F:B9:E8',
+		--	mcast_rate = 6000,
+		--},
 		--mesh = {
 		--	id = 'mesh.ffhb.de',
 		--	mcast_rate = 6000,
@@ -38,11 +44,11 @@
 		ap = {
 			ssid = 'bremen.freifunk.net',
 		},
-		ibss = {
-			ssid = 'mesh.ffhb.de',
-			bssid = '32:06:1C:1F:B9:E8',
-			mcast_rate = 6000,
-		},
+		--ibss = {
+		--	ssid = 'mesh.ffhb.de',
+		--	bssid = '32:06:1C:1F:B9:E8',
+		--	mcast_rate = 6000,
+		--},
 		--mesh = {
 		--	id = 'mesh.ffhb.de',
 		--	mcast_rate = 6000,
@@ -50,7 +56,7 @@
 	},
 
 	next_node = {
-		ip4 = '10.196.0.127',
+		ip4 = '10.196.128.127',
 		ip6 = '2a06:8782:ffbb:1337::127',
 		mac = '16:41:95:40:f7:dc',
 	},
diff --git a/site.mk b/site.mk
index b810679..195a266 100644
--- a/site.mk
+++ b/site.mk
@@ -1,33 +1,16 @@
 GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-14 \
 	gluon-alfred \
 	gluon-respondd \
-	gluon-autoupdater \
-	gluon-config-mode-core \
-	gluon-config-mode-hostname \
-	gluon-config-mode-autoupdater \
-	gluon-config-mode-mesh-vpn \
-	gluon-config-mode-geo-location \
-	gluon-config-mode-contact-info \
+	gluon-respondd-wifisettings \
 	gluon-ebtables-filter-ra-dhcp \
-	gluon-luci-admin \
-	gluon-luci-autoupdater \
-	gluon-luci-portconfig \
-	gluon-luci-private-wifi \
-	gluon-luci-wifi-config \
-	gluon-mesh-vpn-fastd \
-	gluon-next-node \
-	gluon-radvd \
-	gluon-setup-mode \
-	gluon-speedtest \
-	gluon-status-page \
-	gluon-wan-dnsmasq-static \
+	gluon-authorized-keys \
 	iputils-ping6 \
 	iwinfo \
 	iptables \
 	firewall \
 	haveged
 
+DEFAULT_GLUON_RELEASE := 2016-breminale1
 DEFAULT_GLUON_PRIORITY := 0
 
 # Allow overriding the release number and languages from the command line