Breminale: cleanup with minimals

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "gluon"]
 	path = gluon
-	url = https://github.com/freifunk-gluon/gluon.git
+	url = https://github.com/freifunk-ffm/gluon.git

gluon

@@ -1 +1 @@
-Subproject commit 0d2b078a1742c0f7f5860734d6783d7aee281a03
+Subproject commit 155d06cca2358fd5580f7298041ba4b03a6175e9

modules

@@ -1,4 +1,5 @@
 GLUON_SITE_FEEDS='ffhb'
 
 PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
-PACKAGES_FFHB_COMMIT=d3ec6bba927f755e1a6f43c132aae8c97217bd8d
+PACKAGES_FFHB_BRANCH=develop
+PACKAGES_FFHB_COMMIT=9df8aaaa6cf884de63c943fc727de4ca7e4bade1

site.conf

@@ -1,9 +1,21 @@
 {
-	site_name = 'Freifunk Bremen',
+	authorized_keys = {
-	site_code = 'ffhb',
+		'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDJNGF34YIiXhDaFEqPgEB5CdD3am4tZdPdva4DVkFkIVe3Uf62LhDrVRH9/9kwweeWPXb4CVI6f6B6JZNVEKtd7Kr9ftxW6cAZaIXTbrS3XHRO/ftI77nl2zowiaBAWQ8Oz6nVOHSHai8CgWtdFedplHtv7o/hc4/zTA/vXR9LISf7eMQOeIAXNxmPgmILNrCwvEavDIiLjRpE0kePIl49TOYuY8GLxDXYfWOcg9hsYyUlk6+RVH+ZpAvtgVptvkueQ3NmNh6DPgemIHdx01McAARTLGyficwMmQqKoQUyrpnWTIi6Dh5HJ6dgLlinaer2Pr0HS0ghtpr4dPdNGb/cT/GOBZdPY/qfo5W0rPvcrHIPEEvuQAQtKtA+B7/qudpo1dhRwWurl1cPA+SWdSIEXFKnoDR7FbRyd53zhZfFQZcg4nZx1oaCpUStNzI6mQi+og+VYlTYXTK9m5GVvvos6Hs5afuU+9t8yhrus0Zc3gUAatPeX39q4WvC0wdBPqEXhA+Td0v2Sphxv5iot6yoIBMW8/w+za3wfqEebKF5il09/tylkQtKCJEMdz718a0Iz5mCJU1kXAm7ZgUxnWPDtAK0juamlAd1pvNcbNcmykzRZu107SuUYi70+XFA9RHgz2f45RAVKys/HOiL+N6+gRJ+MgSSmW/SMGhBnGwA5Q== breminale2017-freifunk_bremen-freifunkmanager',
+		'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDpZG0mLG9rT4VZakvMROT5cjE2qokx/uwLtqaJlAOlTdNdZklsenfpA074CkXLyqbR8gwemT7k9lEMGgxkQQy1zk4HDKe650ZlLOnecRrhywJ7HikxN22Y8LvPfcLlAeg+HaK0U14AZeE5axOVpE2UH4/18HBFDMSDCER9Lax36DmPS/AaAscxC4VbcDtrqrY/JXyA3dGumu5u50yga/y60BybeGAr1vuUVBidFVv0qkT7Vz08QUcyiUD30UAFFn8FbLNfhPP4pPD1mv1MYVmf+T4efP7V+Q+6fVPxp3KWZSfzTKOM9Hf7D5kWiEZ8yxNkY4BwjDQVD2QxewtO1OrWinfEsAF6eDsSFK6DxdxzweQHgwaVc3z9r9BPePluNvQNCBmPD4+qBj3D5MdmPn543CJ9hw1sDv8JBiDK7FDYFAgxXwmpnWhhaDf96R/S0rLjcSx0trfLoX5rorWTjuT9an8C/0YP8Pe24kGIo7dT2lWh7YrdCgiaeVpE3ZmX3xqULVM/ftD2aqSn22KbXyM59DHi3ajtbZtUHfiWG416sBErHYKZ/8QBUwNs9Xfjy834he/2YJAlxf8T2yfHf0bsFqV0nPdQFL6s1hKTP9VPaLoIh6RZqs9ZdR26QLe/WXAGe04a8k0Hg4f7PbTfk7Gs4fOfq1Hyd7zM3DkQ6rh1YQ== breminale2017-freifunk_bremen',
+		'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 AAAAB3NzaC1yc2EAAAADAQABAAABAQDDFzBBVnkCMcMz+ieL36OcaxCwvukrsyu4czRM2u2+FZSTVjV3Pd3c3cJduAAVuQn+GgsIUatM79HyWsBW5S6/dr+2oE3u5Zlnv/n5XQEP0Bb2Hv7GGJcJptJxgmdGlqEnsBjtcW0ly/c91UForykZ4YiaUiZ+/ZVnEGxT6NGNVXhmWv6SLyGq7f+JUG4DbbcTunxrKpHSdlELpdiXuisBPU71/CDGAF77LHEbzWUwA58WdF0KVZtdvISWKUSuB6wsuoCX0mTHun6J/j5Du2QsELYYnGcJKv34nspRGGxLK0yOfe6YAsyVyS4vKgHH112OlzUKJJauF0LP6gaopMpD jplitza@smartcard',
+		'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwUGRhXBVOqx+gxsJHyMTz7eSYtN0nRIb5GGaMZLagorc4RHTyYRMSwpeiar2wAgV2nmJfM6Q/3xC6HA5WHofg9FBM1zYOsRWDnna65a5ZT6F/OqZQ4axChaUFylGiprEEISGUIn0/69FiYxx6KAKqwfp0JFn+oPSx5E0Potn2o8TbeJPbr4mTSkLj92of+hIybuiXQ4Z6qHaP6jTJg1DLFuBMhsg48dxB/SEUpBhV38Ken94pG4FJaQy3byucB8uyCc0dy0YQpzvfcuvz0YoxMMS8RJNUWoQ+YLWwEpQL/9xz5jOr2CqEFkYWSdj9GXiDf1zBI4mJ+udWfTf1z8d9 ollibaba@github1',
+		'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4uEIKbCdE7ruqNAok2Opp+zt78huZXpE9IFRJB2g45ptAKkRTqIfgDRhQ0NQNnG1RhjKUoPPXil6DL/xmJPBhwvvnzBE6LHsCIas7u/7MNiUVE8GiAkkGI/Dxn6ohwEiwY7lJtYln+WJ7cMPnQH4lV0jqsJRf6CCbd4mCn4DWu6uP899H+NMWTN/ZwmmflqyhxSaAJbGcGD1WDmG/8lsQVLvch2HuZALtRDBL2LQczkQN0NU8jpbksTZl3s43Sphxw1EhNF7v+36e44bkW64anITOr9cGQKxYqGG8NGcXyBW2RIeTdzEt1UXyKFtFhuqF4gte15qu1s22DUO9gIIh ollibaba@github2',
+	},
+	site_name = 'Freifunk Breminale',
+	site_code = 'breminale',
+	site_seed = '48a9de099ffe3b2d4410955afd65c33edec2f109a638393b9ee66d837f12c514',
+  babel_mesh = { prefix = '2a00:C380:DEAD:7338::/64', },
+	mesh_on_wan = true, -- breminale spezifisch
+	poe_passthrough = true,
 
-	prefix4 = '10.196.0.0/17',
+	prefix4 = '10.43.0.0/16',
-	prefix6 = 'fd2f:5119:0f2c::/64',
+	prefix6 = '2a00:C380:DEAD:7337::/64',
 
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
 	ntp_servers = {
@@ -13,7 +25,7 @@
 		'5.ntp.bremen.freifunk.net',
 		'6.ntp.bremen.freifunk.net',
 	},
-	regdom = 'DE',
+	regdom = 'US',
 
 	wifi24 = {
 		channel = 6,
@@ -22,77 +34,28 @@
 		ap = {
 			ssid = 'bremen.freifunk.net',
 		},
-		ibss = {
+		mesh = {
-			ssid = 'mesh.ffhb.de',
+			id = 'babel.ffhb.de',
-			bssid = '32:06:1C:1F:B9:E8',
+			mcast_rate = 12000,
-			mcast_rate = 6000,
 		},
-		--mesh = {
-		--	id = 'mesh.ffhb.de',
-		--	mcast_rate = 6000,
-		--},
 	},
 	wifi5 = {
 		channel = 44,
 		ap = {
 			ssid = 'bremen.freifunk.net',
 		},
-		ibss = {
+		mesh = {
-			ssid = 'mesh.ffhb.de',
+			id = 'babel.ffhb.de',
-			bssid = '32:06:1C:1F:B9:E8',
+			mcast_rate = 12000,
-			mcast_rate = 6000,
 		},
-		--mesh = {
-		--	id = 'mesh.ffhb.de',
-		--	mcast_rate = 6000,
-		--},
 	},
 
 	next_node = {
-		ip4 = '10.196.0.127',
+		ip4 = '10.43.0.127',
-		ip6 = 'fd2f:5119:0f2c::127',
+		ip6 = '2a00:C380:DEAD:7337::127',
 		mac = '16:41:95:40:f7:dc',
 	},
 
-	fastd_mesh_vpn = {
-		methods = {'salsa2012+umac'},
-		enabled = true,
-		configurable = true,
-		mtu = 1280,
-		groups = {
-			backbone = {
-				limit = 1,
-				peers = {
-					vpn01 = {
-						key = 'df444c4366880735d8101ec4e8bcd8288a7e617024c08f0f81027927ba794f9f',
-						remotes = {'"vpn01.bremen.freifunk.net" port 50000', '"vpn01.ffhb.de" port 50000'},
-					},
-					vpn02 = {
-						key = '93a15a14d85a165b86624c89d69c481043cb60542bfa3d2896615b66a57ab02c',
-						remotes = {'"vpn02.bremen.freifunk.net" port 50000', '"vpn02.ffhb.de" port 50000'},
-					},
-					vpn03 = {
-						key = '6c16136b58da06e3cc83bc92ef09bb19b7dfa787e390929a0ac0d4bbebddee2b',
-						remotes = {'"vpn03.bremen.freifunk.net" port 50000', '"vpn03.ffhb.de" port 50000'},
-					},
-					vpn05 = {
-						key = '6cff5957231ca2936aabaa75ae5a7985f4077246b8956273b2ce2da559f344a9',
-						remotes = {'"vpn05.bremen.freifunk.net" port 50000', '"vpn05.ffhb.de" port 50000'},
-					},
-					vpn06 = {
-						key = '99cb85ea2e6346b52abf5eb5ca824f7f037324d4e476f4f068c48b9da98f30e3',
-						remotes = {'"vpn06.bremen.freifunk.net" port 50000', '"vpn06.ffhb.de" port 50000'},
-					},
-				},
-			},
-		},
-		bandwidth_limit = {
-			enabled = false,
-			egress = 1800,
-			ingress = 14400,
-		},
-	},
-
 	opkg = {
 		openwrt = 'http://downloads.bremen.freifunk.net/opkg/openwrt/%n/%v/%S/packages',
 		extra = {
@@ -100,59 +63,6 @@
 		},
 	},
 
-	autoupdater = {
-		branch = 'stable',
-		branches = {
-			nightly = {
-				name = 'nightly',
-				mirrors = {
-					'http://downloads.bremen.freifunk.net/firmware/nightly/sysupgrade',
-				},
-				good_signatures = 1,
-				pubkeys = {
-					'4bc6c2c3f36f984a9c370558a453d8a91933323679dd6dbbf6568834133a6030', -- autobuilder
-				},
-			},
-			testing = {
-				name = 'testing',
-				mirrors = {
-					'http://downloads.bremen.freifunk.net/firmware/testing/sysupgrade',
-				},
-				good_signatures = 1,
-				pubkeys = {
-					'c3e3f0486664e4ae692fa8d773038eb7347b8ea1cd1cb670b33eff980ad65d62', -- jplitza
-					'5a83733dec4de52c238548194d85b5ff54a92836f7a5a75579f5ddcf8dd90ee8', -- corny
-					'99d180f2e3d5b0844ebbe4a4cee2b305e1d35e3112f0ab09f162c988ffc63131', -- SimJoSt
-					'd22449306f5e592a5554053714e40101c6a7b053acb715504d68ef82fce9ccbe', -- oliver
-					'b3d1fe3851f4c70b1eda7103fd835d56f3a5dc7f057b6730f83d895332a9caa2', -- janeric
-					'6758e2e1e67766176482f5cb579f432dfc97206f3bd4fa6c16df19d5569873b6', -- ec8or
-					'bb003a1748fcea1eab8974ec8cb61615fd4dc42fab1f5bcb8334243849561b2d', -- ProXyhb
-				},
-			},
-			stable = {
-				name = 'stable',
-				mirrors = {
-					'http://downloads.bremen.freifunk.net/firmware/stable/sysupgrade',
-				},
-				good_signatures = 2,
-				pubkeys = {
-					'c3e3f0486664e4ae692fa8d773038eb7347b8ea1cd1cb670b33eff980ad65d62', -- jplitza
-					'5a83733dec4de52c238548194d85b5ff54a92836f7a5a75579f5ddcf8dd90ee8', -- corny
-					'99d180f2e3d5b0844ebbe4a4cee2b305e1d35e3112f0ab09f162c988ffc63131', -- SimJoSt
-					'd22449306f5e592a5554053714e40101c6a7b053acb715504d68ef82fce9ccbe', -- oliver
-					'b3d1fe3851f4c70b1eda7103fd835d56f3a5dc7f057b6730f83d895332a9caa2', -- janeric
-					'6758e2e1e67766176482f5cb579f432dfc97206f3bd4fa6c16df19d5569873b6', -- ec8or
-					'bb003a1748fcea1eab8974ec8cb61615fd4dc42fab1f5bcb8334243849561b2d', -- ProXyhb
-				},
-			},
-		},
-	},
-
-	autoupdater_switcher = {
-		date = '20140324',
-		branch = 'testing',
-	},
-
 	config_mode = {
 		geo_location = {
 			show_altitude = false,

site.mk

@@ -1,34 +1,19 @@
 GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-14 \
+	gluon-mesh-babel \
+	gluon-l3roamd \
 	gluon-respondd \
 	respondd-module-airtime \
-	gluon-autoupdater \
+	respondd-module-wifisettings \
-	gluon-config-mode-core \
+	gluon-respondd-lldp \
-	gluon-config-mode-hostname \
+	gluon-client-bridge \
-	gluon-config-mode-autoupdater \
-	gluon-config-mode-mesh-vpn \
-	gluon-config-mode-geo-location \
-	gluon-config-mode-contact-info \
-	gluon-ebtables-filter-multicast \
-	gluon-ebtables-filter-ra-dhcp \
-	gluon-ebtables-segment-mld \
-	gluon-luci-admin \
-	gluon-luci-autoupdater \
-	gluon-luci-mesh-vpn-fastd \
-	gluon-luci-portconfig \
-	gluon-luci-private-wifi \
-	gluon-luci-wifi-config \
-	gluon-mesh-vpn-fastd \
-	gluon-next-node \
-	gluon-radv-filterd \
 	gluon-radvd \
-	gluon-setup-mode \
+	gluon-authorized-keys \
-	gluon-speedtest \
+	ffhb-breminale \
-	gluon-status-page \
 	iputils-ping6 \
 	iwinfo \
 	iptables \
 	firewall \
+	reghack \
 	haveged
 
 # Variables set with ?= can be overwritten from the command line
@@ -37,4 +22,4 @@ export GLUON_BRANCH ?= stable
 GLUON_PRIORITY ?= 7
 GLUON_LANGS ?= en de
 GLUON_REGION ?= eu
-GLUON_ATH10K_MESH ?= ibss
+GLUON_ATH10K_MESH ?= 11s