From c78d99f943d078581e88a81da05b819c9aee6701 Mon Sep 17 00:00:00 2001
From: Martin/Geno <geno+dev@fireorbit.de>
Date: Wed, 5 Jun 2019 09:49:44 +0200
Subject: [PATCH] first breminale build 2019

---
 modules   |  3 ++-
 site.conf | 32 ++++++++++++++++++++++----------
 site.mk   | 10 ++++++----
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/modules b/modules
index b5e974d..e820096 100644
--- a/modules
+++ b/modules
@@ -6,7 +6,8 @@ PACKAGES_GLUON_BRANCH=genofire-clientcount
 PACKAGES_GLUON_COMMIT=a559097e8c138e7ffa45696446be34f8acf83b85
 
 PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
-PACKAGES_FFHB_COMMIT=e314a51ebbd5e8b6da3ab2744354869b7740913a
+PACKAGES_FFHB_COMMIT=3245f2657691e58bda3fe0f1f6fd38bc8886c860
+PACKAGES_FFHB_BRANCH=events
 
 PACKAGES_FFFFMPACKAGES_REPO=git://github.com/freifunk-ffm/packages.git
 PACKAGES_FFFFMPACKAGES_COMMIT=10ede5aab68eb22c30b0f01fd34f61714ffc0f0b
diff --git a/site.conf b/site.conf
index 2b55126..f2c9c74 100644
--- a/site.conf
+++ b/site.conf
@@ -1,4 +1,16 @@
 {
+	-- breminale spezifisch start
+	authorized_keys = {
+		'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDI9U3PPxW4l3vn8D5scxPSo4wwRg/XEntqR9K3upVpkAhLJZ6mxYH8Rx+YBQh6PRPWyalVTrZhbk7OrU9jOQggNeTGebAwkciDwU7GwyPZTlY0ynIu3SAiCyKBWO1mg18zMkTOLb97rDDfxdJeqhAXeXHS8DRNC6mfe9XZIfMclBdqJTuooUSmTLszLYlXjOtYca7wamOVitnjcPOQC06jgqfwoyTknuFm7X39+VkAqpRJtE3TML7eydFy5gMqG+Q4QHkLdSodlBYyBp8T/hYHGmITV9g96+fRtkcSzTOXyHpywh9qt4OjU98RoOJdhxsp4Noolf81Sz25JFGKUiiEVcp1eQ7ai+9++gcq94jHltZuKpiCeUmqdldy/2r59HBGmTc2pu0cJIWlHnku+rNjcdMbuEM16KKomKb2NUu+u/UMg23hyU0JUp7OYABvZeE/fk3q2x2bMPoWI9xHDkvvf4c9FsWeKYoS44ZG7TFUJ8sEGrwWvI5KWw6u1w0l4rYoMxsnQbqmX696WtONQDQqTN9j14fQxq/FXOwsRcIYlZvteEuqrh0GU13dS5MEAg7ZLMk4HUiBrF+nffI8mijp0TQQGcRoZkhoUcK/09qa8+0kqErQoBVJZZ0toCndt79Uigpkp5wq6d3kZPCGwIIdoyrJaG6DyCu2bnqHEbo+SQ== genofire',
+	},
+	mesh_on_lan = true,
+	mesh_on_wan = true,
+	poe_passthrough = true,
+	setup_mode = {
+		skip = true,
+	},
+	-- breminale spezifisch ende
+  
 	site_name = 'Freifunk Bremen',
 	site_code = 'ffhb',
 	domain_seed = '9c689a5be0e7610716aa9952d3c186345bd8d72dfa8950977e255e26ea24d978',
@@ -17,22 +29,22 @@
 	wifi24 = {
 		channel = 5,
 		ap = {
-			ssid = 'next.bremen.freifunk.net',
-		},
-		mesh = {
-			id = 'mesh.n.ffhb.de',
-			mcast_rate = 12000,
+			ssid = 'freifunk.net',
 		},
+		-- mesh = {
+		-- 	id = 'meshb.ffhb.de',
+		-- 	mcast_rate = 12000,
+		-- },
 	},
 	wifi5 = {
 		channel = 48,
 		ap = {
-			ssid = 'next.bremen.freifunk.net',
-		},
-		mesh = {
-			id = 'mesh.n.ffhb.de',
-			mcast_rate = 12000,
+			ssid = 'bremen.freifunk.net',
 		},
+		-- mesh = {
+		-- 	id = 'meshb.ffhb.de',
+		-- 	mcast_rate = 12000,
+		-- },
 	},
 
 	next_node = {
diff --git a/site.mk b/site.mk
index 5aa90f2..2603770 100755
--- a/site.mk
+++ b/site.mk
@@ -12,10 +12,8 @@ GLUON_SITE_PACKAGES := \
 	gluon-config-mode-contact-info \
 	gluon-web-admin \
 	gluon-web-autoupdater \
-	gluon-web-network \
-	gluon-web-private-wifi \
 	gluon-web-wifi-config \
-	gluon-mesh-vpn-wireguard \
+	gluon-web-network \
 	gluon-client-bridge \
 	gluon-radvd \
 	gluon-setup-mode \
@@ -25,7 +23,11 @@ GLUON_SITE_PACKAGES := \
 	iwinfo \
 	iptables \
 	gluon-iptables-clamp-mss-to-pmtu \
-	babeldev
+	babeldev \
+	haveged \
+	gluon-authorized-keys \
+	respondd-module-wifisettings \
+	reghack
 
 # Allow overriding the these variables from the command line
 GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+))