fixed typos again

README

@@ -8,10 +8,10 @@ http://firmware.leipzig.freifunk.net
 
 Gluon versions used for specific Leipzig Freifunk Firmware builds:
 
-* 1.6.1: v2021.1.0
+* 1.6.1: v2021.1.1
 * 1.5.3: v2020.2.3
 * 1.5.2: v2020.2.2
-* 1.4.4: v2o2o.1.4
+* 1.4.4: v2020.1.4
 * 1.3.3: v2019.1.3
 * 1.2.4: v2018.2.4
 * 1.2.1: v2018.2.1

site.conf

@@ -8,26 +8,28 @@
 	prefix6 = 'fdef:ffc0:7030::/64',
 
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-	ntp_servers = {'gluon-ntp.leipzig.freifunk.net'},
+	ntp_servers = {
+		'gluon-ntp.leipzig.freifunk.net'
+	},
 	regdom = 'DE',
 
 	wifi24 = {
 		ap = {
-		    ssid = '061-FREIFUNK-',
+			ssid = 'freifunk-leipzig.de',
 		},
 		channel = 1,
 		mesh = {
-		     id = 'LiMe',
+			id = 'de:ze:nt:ra:le.space',
 			mcast_rate = 12000,
 		},
 	},
 	wifi5 = {
 		ap = {
-		    ssid = '061-FREIFUNK-',
+			ssid = 'freifunk-leipzig.de',
 		},
 		channel = 44,
 		mesh = {
-		     id = 'LiMe',
+			id = 'de:ze:nt:ra:le.space',
 			mcast_rate = 12000,
 		},
 	},
@@ -50,7 +52,11 @@
 	  mtu = 1426,
 		fastd = {
 		  configurable = true,
-		  methods = {'salsa2012+umac', 'salsa2012+gmac', 'null+salsa2012+umac'},
+		  methods = {
+			  'salsa2012+umac',
+			  'salsa2012+gmac',
+			  'null+salsa2012+umac'
+		  },
 		  groups = {
 			backbone = {
 				limit = 2,
@@ -78,29 +84,42 @@
 		branches = {
 			stable = {
 				name = 'stable',
-				mirrors = {'http://gluon-updates-20161a.leipzig.freifunk.net/stable/sysupgrade'},
+				mirrors = {
+					'http://images.freifunk-leipzig.de/images/stable/images/sysupgrade/'
+				},
 				good_signatures = 1,
 				pubkeys = {
-					'a181bbc91cff1a91741fd17841f6aa3c4310cdaddf2236481c07d865cf2e873d', -- n3ph
-					'96118f622de836bcbeeb57aa6886c36f6ebf40bae7b3df3fb0b4caaa3d0a4bd7', -- ufo
+					'0e46fd09c1a39d2c5c6dead847d5bafb2dcbdfe201f1abe58aa8ae04716fbacd', -- jenkins builder
 				},
 			},
-			beta = {
-				name = 'beta',
-				mirrors = {'http://gluon-updates20161a.leipzig.freifunk.net/beta/sysupgrade'},
+			testing = {
+				name = 'testing',
+				mirrors = {
+					'http://images.freifunk-leipzig.de/images/testing/images/sysupgrade/'
+				},
 				good_signatures = 1,
 				pubkeys = {
-					'a181bbc91cff1a91741fd17841f6aa3c4310cdaddf2236481c07d865cf2e873d', -- n3ph
-					'96118f622de836bcbeeb57aa6886c36f6ebf40bae7b3df3fb0b4caaa3d0a4bd7', -- ufo
+					'0e46fd09c1a39d2c5c6dead847d5bafb2dcbdfe201f1abe58aa8ae04716fbacd', -- jenkins builder
+				},
+			},
+			unstable = {
+				name = 'unstable',
+				mirrors = {
+					'http://images.freifunk-leipzig.de/images/unstable/images/sysupgrade/'
+				},
+				good_signatures = 1,
+				pubkeys = {
+					'0e46fd09c1a39d2c5c6dead847d5bafb2dcbdfe201f1abe58aa8ae04716fbacd', -- jenkins builder
 				},
 			},
 			experimental = {
 				name = 'experimental',
-				mirrors = {'http://gluon-updates20161a.leipzig.freifunk.net/experimental/sysupgrade'},
+				mirrors = {
+					'http://images.freifunk-leipzig.de/images/experimental/images/sysupgrade/'
+				},
 				good_signatures = 1,
 				pubkeys = {
-					'a181bbc91cff1a91741fd17841f6aa3c4310cdaddf2236481c07d865cf2e873d', -- n3ph
-					'96118f622de836bcbeeb57aa6886c36f6ebf40bae7b3df3fb0b4caaa3d0a4bd7', -- ufo
+					'0e46fd09c1a39d2c5c6dead847d5bafb2dcbdfe201f1abe58aa8ae04716fbacd', -- jenkins builder
 				},
 			},
 		},