modules

 GLUON_SITE_FEEDS='ffnw'
 
 PACKAGES_FFNW_REPO=https://git.nordwest.freifunk.net/ffnw/packages.git
-PACKAGES_FFNW_BRANCH=0.5.3
-PACKAGES_FFNW_COMMIT=b8120af0f15da45e24775a7aa14fc998cfe0a5fb
+PACKAGES_FFNW_BRANCH=0.5.5
+PACKAGES_FFNW_COMMIT=10f1fb8439f83256b0aabb8d0680765abba471f2

site.conf

@@ -2,9 +2,9 @@
 	hostname_prefix = 'ffnw',
 	site_name = 'Freifunk Nordwest',
 	site_code = 'ffnw',
-    
-    opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
-    
+
+	opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+
 	prefix4 = '10.18.0.0/16',
 	prefix6 = 'fd74:fdaa:9dc4::/64',
 
@@ -38,32 +38,24 @@
 	},
 
 	fastd_mesh_vpn = {
+		enabled = true,
 		methods = { 'salsa2012+umac' },
 		mtu = 1312,
 		backbone = {
-			limit = 2,
+			limit = 1,
 			peers = {
 				vpn01 = {
 					key = '39f83c6e16b62273329aee0d04d420fa8d0637e6621a76ff680f6273e75c0c8d',
 					remotes = {'"vpn01.ffnw.de" port 11111'},
 				},
 				vpn02 = {
-                                        key = '30d28e8e0edb5dfe3df903ef1f1320224c90282d68b7127f8d621453c56ab8e4',
-                                        remotes = {'"vpn02.ffnw.de" port 11111'},
-                                },
+					key = '30d28e8e0edb5dfe3df903ef1f1320224c90282d68b7127f8d621453c56ab8e4',
+					remotes = {'"vpn02.ffnw.de" port 11111'},
+				},
 				vpn03 = {
-                                        key = 'b6b4f5ad5cba8986eadac11e8d4f65a1dc414e2ffd7a515bec6077a6fccc8bcb',
-                                        remotes = {'"vpn03.ffnw.de" port 11111'},
-                                },
-   				vpn04 = {
-                                        key = '18199a10620dbd13728a09402ca2364436ca27e46e669a2ebdfe20976dc45e6f',
-                                        remotes = {'"vpn04.ffnw.de" port 11111'},
-                                },
-				vpn05 = {
-                                        key = '5c1738236ba6930f654fd5e815e0c63ac03f81551ee2b183045b256fb133f77d',
-                                        remotes = {'"vpn05.ffnw.de" port 11111'},
-                                },
-
+					key = 'b6b4f5ad5cba8986eadac11e8d4f65a1dc414e2ffd7a515bec6077a6fccc8bcb',
+					remotes = {'"vpn03.ffnw.de" port 11111'},
+				},
 			},
 		},
 	},
@@ -75,30 +67,45 @@
 			stable = {
 				name = 'stable',
 				mirrors = {'http://[fd74:fdaa:9dc4::1]/firmware/stable' },
-				good_signatures = 2,
+				good_signatures = 3,
 				pubkeys = {
 					'22c79b193a36269fd7fd51531e762b776e982926c90822df80b56f2be11648d4', --bjo
 					'99c420e95dd0923ee6277af5c306f9ae6b97f8793b08edd41448925df5fe35b9', --floh1111
 					'a4f6bb6172f39a6967bf9fe9243c9853407217d8243eeaee885892baf1be4703', --bioxz
-	  				'd2b1366a38514e0fac47b119a8a08973ea8020bf9c138908d32b56a5d99f3079', --baranator
-                                        '5d95cc2ef3ad17fe3716469e1effde4a49a25d4de9befa4a6eb260e4cda79ab0', --tata
-
+					'd2b1366a38514e0fac47b119a8a08973ea8020bf9c138908d32b56a5d99f3079', --baranator
+					'5d95cc2ef3ad17fe3716469e1effde4a49a25d4de9befa4a6eb260e4cda79ab0', --tata
+					'0e6704ba26c150185514a391658455a612839c35bd83e0faffa81e0be48356e2', --sk
+					'1f45d9be8a07cc2b6fcc384c71685fc0895a54be0d884aa4637c93ec4f36d970', --stefan6
 				},
 			},
-		},	
+			testing = {
+				name = 'testing',
+				mirrors = {'http://[fd74:fdaa:9dc4::1]/firmware/testing' },
+				good_signatures = 1,
+				pubkeys = {
+					'22c79b193a36269fd7fd51531e762b776e982926c90822df80b56f2be11648d4', --bjo
+					'99c420e95dd0923ee6277af5c306f9ae6b97f8793b08edd41448925df5fe35b9', --floh1111
+					'a4f6bb6172f39a6967bf9fe9243c9853407217d8243eeaee885892baf1be4703', --bioxz
+					'd2b1366a38514e0fac47b119a8a08973ea8020bf9c138908d32b56a5d99f3079', --baranator
+					'5d95cc2ef3ad17fe3716469e1effde4a49a25d4de9befa4a6eb260e4cda79ab0', --tata
+					'0e6704ba26c150185514a391658455a612839c35bd83e0faffa81e0be48356e2', --sk
+					'1f45d9be8a07cc2b6fcc384c71685fc0895a54be0d884aa4637c93ec4f36d970', --stefan6
+				},
+			},
+		},
 	},
 
 	simple_tc = {
 		mesh_vpn = {
 			ifname = "mesh-vpn",
-			enabled = true,
+			enabled = false,
 			limit_egress = 500,
 			limit_ingress = 8000,
 		},
 	},
 
 	config_mode = {
-		  msg_welcome = [[
+		msg_welcome = [[
 	Hallo Freifunker!
 
 	]],

site.mk

 GLUON_SITE_PACKAGES := \
 	gluon-alfred \
 	gluon-announced \
-	gluon-ath9k-workaround \
 	gluon-autoupdater \
 	gluon-config-mode-autoupdater \
 	gluon-config-mode-hostname \
@@ -22,11 +21,12 @@ GLUON_SITE_PACKAGES := \
 	iwinfo \
 	iptables \
 	haveged \
-	ffnw-fastdreg \
 	ffnw-configurator \
-	ffnw-nodewatcher
+	ffnw-nodewatcher \
+	ffnw-opkgconfig \
+	ffnw-autoupdater-mod
 
-DEFAULT_GLUON_RELEASE := 0.5.5.2+0$(shell date '+%Y%m%d')
+DEFAULT_GLUON_RELEASE := 0.5.5.4+0$(shell date '+%Y%m%d')
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)