From 598cf2155b9849c0ccdf0f03ce97fef1bf0ab349 Mon Sep 17 00:00:00 2001
From: genofire <geno+dev@fireorbit.de>
Date: Thu, 26 May 2022 21:44:29 +0200
Subject: [PATCH] chore(site.conf): cleanup - add SSH-key for breminae2022

---
 site.conf | 71 ++-----------------------------------------------------
 site.mk   |  5 ----
 2 files changed, 2 insertions(+), 74 deletions(-)

diff --git a/site.conf b/site.conf
index 177159a..86094ea 100644
--- a/site.conf
+++ b/site.conf
@@ -1,9 +1,8 @@
 {
 	-- breminale spezifisch start
 	authorized_keys = {
-		'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCv2+k4ZD7NZ4aLPkZ92vPNvdG944VJib0KzU59zPTYXOZZul6bK1x0K+qpodW6vjigj+hyXVonNSvbBWvixmwqEXyPu6H/Oroi9YPXDqW+pTw0S0g+DMAeNm7yC+R3qnis5dBjut2uQGVFUBHxgm5zEUwAx0XcFH5b/BiqfTkNUTOhOdiSa0wC+PAqtwAHk1/IzHsIerIUUaF8zEBt0hKYb2jeq/JfrCaZ97BTR+rgo0r/0Zi5jp4wfSO+v1oC9d8CenS9QR/Ey68YJtG6Q5oxci68emXVUboK8eeKricyMfPV/NI/DV/By2AbO16XDACJVx0/KRXdAVCL2dpIUcaPcWUMy98AMaWNFA6eB4hJnh17U3Hg/PbAj8mfmdazAmNVaVlSaheBkXKzN1VIIBfEgY5DLVYnGr6nuxXZMXtuejQXL61Cv4wl9qPzCxvsUCHUzB6dLA4uac3zjxom9FCN5kHCa9GqCs83sR22xiSuu1Z8bUP3NcdfU/jsWuud7Tf+Y6OWzVsOHDUQWhR4FeTFaNl8eh4LRA0GHsB8uwrB6hKSsrOtJFn0sAS2i4ZIc1aN/MHDLgqmHWxOVHJgl2E+Xeiq74j/45IxGjaGt/Y26qO8qB6Qx9Z5jc/JHoWTZzckkxHsket44b+Tzy5QdkiqmQmFAsGiMvgAyb00y32vqQ== breminale2019',
-		'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCw+tytUdghOMecgJNDQdU48Dievr5+FPecRB3hNizzmHwagt7HYMyTOtzp9exw81ksiHPqe2tfJRfMvKsLzmSD161OGwvtpnZuk4XUc8VOZmIRO4TlbhSWKtqM+pl/JcAr25xcc90bnK7lsgNRAEs+rl38cyg9LMpN2Pu6zktMzDxQtGVnQQNTHl0Igr+HJKAHS1dUWPrjIRiyUuesBWng8C0iG4d/dMUdFGcBpbevlIDnKlbJoYzlDlG8BCBkOgPFhcrtZwRvvof3NXUL1NRU1tl7grvAXI1qQOdMJ77E4ynU5gUUPRzt4IbQ3Mgvg/LN8W4FNYGk0zWwp3JWEUQnG3bBZbox5ee+1chqqnwLlr4P+a2Cvwu4cNeVChQIISH+NGXAYg006NqGxrSzIO7pDa89tbcvtOOkEHZ1syiSAPv0V8gHKzMoYZ8xXWLqeGr9Rq0J9cG+Rls0iubKiEE8S333XnmfSRF9/+wK+AGt7Frjl+MoPtWJCWTtM3BeNsSTIsfrXAkBtTki38LQOLvxHwXZb9zzuP11bkk+ot4H2SON8c8J9q32nAp1ptHqPQGoOKu0Z4O0gls7Eqc924O4HS5HENFeTU1FG1VB+BvwQ8gbRUfa0bULH0T9cDvyYADgafzVj8wLoLlVl4IfohUmZteA2yCX09E4ELipI1Jmpw== freifunkmanager2019',
-		'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDI9U3PPxW4l3vn8D5scxPSo4wwRg/XEntqR9K3upVpkAhLJZ6mxYH8Rx+YBQh6PRPWyalVTrZhbk7OrU9jOQggNeTGebAwkciDwU7GwyPZTlY0ynIu3SAiCyKBWO1mg18zMkTOLb97rDDfxdJeqhAXeXHS8DRNC6mfe9XZIfMclBdqJTuooUSmTLszLYlXjOtYca7wamOVitnjcPOQC06jgqfwoyTknuFm7X39+VkAqpRJtE3TML7eydFy5gMqG+Q4QHkLdSodlBYyBp8T/hYHGmITV9g96+fRtkcSzTOXyHpywh9qt4OjU98RoOJdhxsp4Noolf81Sz25JFGKUiiEVcp1eQ7ai+9++gcq94jHltZuKpiCeUmqdldy/2r59HBGmTc2pu0cJIWlHnku+rNjcdMbuEM16KKomKb2NUu+u/UMg23hyU0JUp7OYABvZeE/fk3q2x2bMPoWI9xHDkvvf4c9FsWeKYoS44ZG7TFUJ8sEGrwWvI5KWw6u1w0l4rYoMxsnQbqmX696WtONQDQqTN9j14fQxq/FXOwsRcIYlZvteEuqrh0GU13dS5MEAg7ZLMk4HUiBrF+nffI8mijp0TQQGcRoZkhoUcK/09qa8+0kqErQoBVJZZ0toCndt79Uigpkp5wq6d3kZPCGwIIdoyrJaG6DyCu2bnqHEbo+SQ== genofire',
+		'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDBqUXlUTH1cNzgTDwmBSxD+JBcwLHM7DkSfH8Iv/YzaySg9sUr2Md8wg6hLV8q4UTacvo9tOXP3IESTdZDPrexCyk1W04UpbRsF/A9jNx+Lhl+b4/H6jLvOZh15DWDbwbIymnCODaSilnC1N3ZVNyi/Lfqk8+3dttgfvT2wA37FBsZIKIcfj8mL/E675qMWlecPmwCA3cxTvfBaztB9oZoWrl99Z/lx4hxNjxRsQEBVcRnhRfu9EQFKreVr8pbNXqO/5rYn6NVKIY5WLq+f1TVKTkrvHrWPSnCLDsgX2UJ05sAi5XupzjxqwRujtyi5g6EkJS3Y43dgd6DP7frzkUj5FZxe/9ynrA+kz5MIvNXv1w7gI9fu2I6cncE/ymmdUhwxHmdj6E6E90EoW68dODMt3rlVxER05sGif3rc10O/8sb0hhC9rDBHwk+E7CSAb4/bpvbFy3tgak+X3IqWaPJHjlZf+fxVKeowmsTR/INfseaa+O8abdU/HhFkUZEvbxz9qCSq1kDMla8UUcETJ9OSIvEAF6bwRXcmhGGh+VeWAX4oGLVOiarISCgrryzGrTyWFsGj6smCk8VAZfMsxFhDcreB65jcHy2VAh3vGsUk1Nb44iYLgVfLJfTvDSvK14gNrE7eiWNNF/9TbumI4gTmCK78KzYyZgQ3uA423i3aQ== ffhb@breminale_2022',
+		'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDZm0TZPBzgXrY1vrLoYviNRb/oGZQDQk9vrppPK84sN55ZPlr9VvP+JYE7Qkx8teRuH9ulxqX40+dxKaiAXMUl4HU57KPLjwCb7SnBNIFTv6ZHGxPS8ZgUzKJr4Agph51oenNEO3RziEqAo3EwK67SGnjeIYQQKcjpfwd08+PYMOjv42zSYQ9umooj5LooOvbxoogZ3VpboXv6DeyA4rev1M9RgnMWaWVF2LxJjQ3jVr7xh1vZktVGKuVk/XXKD6WVAuwmGMVEouQzjtG9kepWd8FUYe+fgj5mtdqfeQP9CypxvOcb7jT20wO1Abpp5udS9iPDQHg+lafklIAeKG3qgxxhBDH3otXtnWcoeXUmDpBI8HU/8d/yrGaLHYRfy3HHiSGFq3lBgoxi83QIOl9ELeKWMJC0fWKBApm0NU0flgwfy2j7GRyXmlM7tVFyuj5RTAZNQfgD9g054di9WbtUs7sm/9r3/rQe2+3neE3Jskt4xvZK0xbc4dZSZGn4E2JDWjENqPBvQ2dU5lsjpUKTZWAnxVGPe//BErsDxNLIHWz8emG71r3Q2yud4KPdAR9CgeC8g1bwlCI6JDFZutKBzIlE3QQ4ryKJEioiUL89xi6G+nNB7W5ABsQN0ZtWvZl8TG4Wh00B+oBXzgRER5Y9SdAYcrwWxlGVxxQyElUNrw== genofire',
 	},
 	interfaces = {
 		lan = {
@@ -71,45 +70,6 @@
 
 	mesh_vpn = {
 		enabled = false,
-		fastd = {
-			methods = {'salsa2012+umac'},
-			configurable = true,
-			enabled = true,
-			mtu = 1374,
-			groups = {
-				backbone = {
-					limit = 1,
-					peers = {
-						events = {
-							enabled = true,
-							key = '865b1ac1ad8dafe79647b0ac92a9d2ebf456995e39b4de6d93ff585b83dfdb8a',
-							remotes = {'"185.117.213.249" port 1500'},
-						},
-					},
-				},
-			},
-		},
-		wireguard = {
-			configurable = true,
-			enabled = true,
-			groups = {
-				backbone = {
-					limit = 1,
-					peers = {
-						events = {
-							key ='XA7WDD0pzgzxAGHNbbtcuDxxKJiX7x4ZCm/0XBKVOwM=',
-							remote = '185.117.213.249',
-							broker_port = '1501',
-						},
-					},
-				},
-			},
-		},
-		bandwidth_limit = {
-			enabled = false,
-			egress = 1800,
-			ingress = 14400,
-		},
 	},
 
 	opkg = {
@@ -117,33 +77,6 @@
 			modules = 'http://downloads.bremen.freifunk.net/opkg/modules/gluon-%GS-%GR/%S',
 		},
 	},
-
-	autoupdater = {
-		branch = 'babel',
-		branches = {
-			babel = {
-				name = 'babel',
-				mirrors = {
-					'http://downloads.bremen.freifunk.net/firmware/babel/sysupgrade',
-				},
-				good_signatures = 1,
-				pubkeys = {
-					'4bc6c2c3f36f984a9c370558a453d8a91933323679dd6dbbf6568834133a6030', -- autobuilder
-				},
-			},
-		},
-	},
-
-	autoupdater_switcher = {
-		date = '20140324',
-		branch = 'testing',
-	},
-
-	config_mode = {
-		geo_location = {
-			show_altitude = false,
-		},
-	},
 }
 
 -- vim: noet ts=4
diff --git a/site.mk b/site.mk
index f066f77..df47046 100755
--- a/site.mk
+++ b/site.mk
@@ -1,16 +1,11 @@
 GLUON_SITE_PACKAGES := \
 	gluon-respondd \
 	respondd-module-airtime \
-	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-web-admin \
-	gluon-web-autoupdater \
-	gluon-web-mesh-vpn-fastd \
 	gluon-web-network \
 	gluon-web-wifi-config \
 	gluon-client-bridge \