Update Site-Repo

Remove old Site-Configs
Add extra/sites.conf for ffho-config-mode-site-select
Update modules & site.mk

extra/ffho_bkk.conf

@@ -1,187 +0,0 @@
-{
-	-- A new node's name will be autogenerated from
-	-- it's primary MAC address and this prefix.
-	-- e.g. freifunk-0123456789ab
-	hostname_prefix = 'freifunk-',
-
-	-- name of this community
-	site_name = 'Freifunk Hochstift - Brakel',
-	-- short name of this community
-	site_code = 'ffho_bkk',
-
-	-- v4 and v6 prefixes in which nodes+clients might get an IP
-	prefix4 = 'ToDo',
-	prefix6 = 'ToDo',
-
-	-- extra ipv6 prefixes used in this mesh area
-	additional_prefix6 = { 'ToDo', },
-
-	-- timezone
-	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-
-	-- network-internal ntp service
-	ntp_servers = {'ntp.ffho.net'},
-
-        -- OpenWRT Package Repository (IPv6 capable)
-	opkg_repo = 'http://bo.mirror.garr.it/pub/1/openwrt/barrier_breaker/14.07/%S/packages/',
-
-	-- regulatory domain of your wifi
-	regdom = 'DE',
-
-	-- wifi settings (2.4 GHz and 5 GHz)
-	-- the most important thing to change is the SSID
-	-- of the client network (hochstift.freifunk.net/yourcity) and
-	-- both(!) mesh_?ssid ad-hoc mesh network ids.
-	wifi24 = {
-		ssid = 'hochstift.freifunk.net/brakel',
-		channel = 1,
-		htmode = 'HT20',
-		mesh_ssid = 'ffho-mesh-bkk',
-		mesh_bssid = '42:72:61:6b:65:6c',
-		mesh_mcast_rate = 12000,
-	},
-	wifi5 = {
-		ssid = 'hochstift.freifunk.net/brakel',
-		channel = 44,
-		htmode = 'HT40+',
-		mesh_ssid = 'ffho-mesh-bkk',
-		mesh_bssid = '42:72:61:6b:65:6c',
-		mesh_mcast_rate = 12000,
-	},
-
-	-- IP address of each router
-	-- At this IP a client can always connect to its
-	-- currently connected node. Both v4 and v6 addr.
-	-- must lie in the above prefix4 and prefix6.
-	next_node = {
-		ip4 = 'ToDo',
-		ip6 = 'ToDo',
-
-		-- mac address, must be unique in the client network
-		-- (usually, you don't need to change this)
-		mac = '16:41:95:40:f7:dc',
-	},
-
-	-- fastd (vpn) settings
-	fastd_mesh_vpn = {
-		-- cipher(s) to use
-		methods = {'salsa2012+gmac'},
-
-		-- the maximum transfer unit
-		-- use 1426 for IPv4 gateways
-		mtu = 1406,
-
-		groups = {
-			backbone = {
-				-- specifies how many servers are contacted
-				-- by a client simultanously
-				limit = 1,
-	
-				-- list all available vpn servers
-				peers = {
-					gw01 = {
-						-- public fastd key of the vpn server
-						key = 'ToDo',
-						-- remotes is an array of ways on how to reach the VPN server
-						-- Use public addresses here, these addresses are used when the mesh might not be connected yet.
-						-- format: '[|ipv4|ipv6] "hostname-or-ip-address" port 10000'
-						remotes = {
-							'ipv6 "v6.gw01.bkk.ffho.net" port 10000',
-							'ipv4 "v4.gw01.bkk.ffho.net" port 10000',
-							-- 'ipv6 "ToDo" port 10000',
-							-- 'ipv4 "ToDo" port 10000',
-						},
-					},
-					gw02 = {
-						key = 'ToDo',
-						remotes = {
-							'ipv6 "v6.gw02.bkk.ffho.net" port 10000',
-							'ipv4 "v4.gw02.bkk.ffho.net" port 10000',
-							-- 'ipv6 "ToDo" port 10000',
-							-- 'ipv4 "ToDo" port 10000',
-						},
-					},
-				},
-			},
-		},
-	},
-
-	-- configure the autoupdater
-	autoupdater = {
-		enabled = 1,
-
-		-- default branch for a firmware
-		-- In config-mode, the user can select a different branch from below
-		branch = 'stable',
-
-		-- available branches for the autoupdater
-		branches = {
-			stable = {
-				-- visible name of this branch (why not use the internal identifier here, too)
-				name = 'stable',
-
-				-- where to get the manifest file (without the trailing /manifest)
-				-- It's wise to use an internal address here,
-				-- but specifying a publicly available update site does not hurt.
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/ToDo/stable', 'http://firmware.ffho.net/ToDo/stable'},
-
-				-- Number of valid manifest signatures necessary to accept the manifest as "good".
-				good_signatures = 3,
-
-				-- list of public keys which are considered "good" for manifest signatures
-				pubkeys = {
-					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
-					'b0197042824a752c2dba717a4b2ded88852111bbe12e6b5f57fdfa3abb9312c0', -- thardes2
-					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
-					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
-					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
-				},
-			},
-			testing = {
-				name = 'testing',
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/ToDo/testing','http://firmware.ffho.net/ToDo/testing'},
-				good_signatures = 2,
-				pubkeys = {
-					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
-					'b0197042824a752c2dba717a4b2ded88852111bbe12e6b5f57fdfa3abb9312c0', -- thardes2
-					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
-					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
-					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
-				},
-			},
-			experimental = {
-				name = 'experimental',
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/ToDo/experimental','http://firmware.ffho.net/ToDo/experimental'},
-				good_signatures = 1,
-				pubkeys = {
-					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
-					'b0197042824a752c2dba717a4b2ded88852111bbe12e6b5f57fdfa3abb9312c0', -- thardes2
-					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
-					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
-					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
-				},
-			},
-		},
-	},
-
-	-- default traffic shaping (bandwidth limit) settings
-	simple_tc = {
-		mesh_vpn = {
-			ifname = 'mesh-vpn',
-			enabled = false,
-			limit_egress = 200,
-			limit_ingress = 3000,
-		},
-	},
-
-	-- configure ffpb-debug
-	debugserver = {
-		host = { 'debugreport.ffho.net', 'fdca:ffee:ff12:a254::deb9' },
-		port = 1337,
-		liveport = 1338,
-	},
-
-	-- enable BATMAN on WAN interface by default (requires gluon-batman-on-wan package)
-	batman_on_wan = 0,
-
-}

extra/ffho_wag.conf

@@ -1,187 +0,0 @@
-{
-	-- A new node's name will be autogenerated from
-	-- it's primary MAC address and this prefix.
-	-- e.g. freifunk-0123456789ab
-	hostname_prefix = 'freifunk-',
-
-	-- name of this community
-	site_name = 'Freifunk Hochstift - Warburg',
-	-- short name of this community
-	site_code = 'ffho_wag',
-
-	-- v4 and v6 prefixes in which nodes+clients might get an IP
-	prefix4 = '10.132.64.0/19',
-	prefix6 = '2a03:2260:2006:23::/64',
-
-	-- extra ipv6 prefixes used in this mesh area
-	-- additional_prefix6 = { },
-
-	-- timezone
-	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-
-	-- network-internal ntp service
-	ntp_servers = {'ntp.in.ffho.net'},
-
-        -- OpenWRT Package Repository (IPv6 capable)
-	opkg_repo = 'http://bo.mirror.garr.it/pub/1/openwrt/barrier_breaker/14.07/%S/packages/',
-
-	-- regulatory domain of your wifi
-	regdom = 'DE',
-
-	-- wifi settings (2.4 GHz and 5 GHz)
-	-- the most important thing to change is the SSID
-	-- of the client network (hochstift.freifunk.net/yourcity) and
-	-- both(!) mesh_?ssid ad-hoc mesh network ids.
-	wifi24 = {
-		ssid = 'hochstift.freifunk.net/warburg',
-		channel = 1,
-		htmode = 'HT20',
-		mesh_ssid = 'ffho-mesh-wag',
-		mesh_bssid = '6e:6b:c3:b4:6b:5c',
-		mesh_mcast_rate = 12000,
-	},
-	wifi5 = {
-		ssid = 'hochstift.freifunk.net/warburg',
-		channel = 44,
-		htmode = 'HT40+',
-		mesh_ssid = 'ffho-mesh-wag',
-		mesh_bssid = '6e:6b:c3:b4:6b:5c',
-		mesh_mcast_rate = 12000,
-	},
-
-	-- IP address of each router
-	-- At this IP a client can always connect to its
-	-- currently connected node. Both v4 and v6 addr.
-	-- must lie in the above prefix4 and prefix6.
-	next_node = {
-		ip4 = '10.132.64.1',
-		ip6 = '2a03:2260:2006:23::1',
-
-		-- mac address, must be unique in the client network
-		-- (usually, you don't need to change this)
-		mac = '16:41:95:40:f7:dc',
-	},
-
-	-- fastd (vpn) settings
-	fastd_mesh_vpn = {
-		-- cipher(s) to use
-		methods = {'salsa2012+gmac'},
-
-		-- the maximum transfer unit
-		-- use 1426 for IPv4 gateways
-		mtu = 1406,
-
-		groups = {
-			backbone = {
-				-- specifies how many servers are contacted
-				-- by a client simultanously
-				limit = 1,
-	
-				-- list all available vpn servers
-				peers = {
-					gw01 = {
-						-- public fastd key of the vpn server
-						key = 'd33d9a6905ac166e12f7b004dbe2215c63fe930a8528ac124a62dba48ca845b9',
-						-- remotes is an array of ways on how to reach the VPN server
-						-- Use public addresses here, these addresses are used when the mesh might not be connected yet.
-						-- format: '[|ipv4|ipv6] "hostname-or-ip-address" port 10000'
-						remotes = {
-							'ipv6 "gw01.wag.ffho.net" port 10000',
-							'ipv4 "gw01.wag.ffho.net" port 10000',
-							-- 'ipv6 "ToDo" port 10000',
-							-- 'ipv4 "ToDo" port 10000',
-						},
-					},
-					gw02 = {
-						key = 'cf38aebe045c5c19c4018daf473071b298a607b095b4283e2cbf2669cc829e49',
-						remotes = {
-							'ipv6 "gw02.wag.ffho.net" port 10000',
-							'ipv4 "gw02.wag.ffho.net" port 10000',
-							-- 'ipv6 "ToDo" port 10000',
-							-- 'ipv4 "ToDo" port 10000',
-						},
-					},
-				},
-			},
-		},
-	},
-
-	-- configure the autoupdater
-	autoupdater = {
-		enabled = 1,
-
-		-- default branch for a firmware
-		-- In config-mode, the user can select a different branch from below
-		branch = 'stable',
-
-		-- available branches for the autoupdater
-		branches = {
-			stable = {
-				-- visible name of this branch (why not use the internal identifier here, too)
-				name = 'stable',
-
-				-- where to get the manifest file (without the trailing /manifest)
-				-- It's wise to use an internal address here,
-				-- but specifying a publicly available update site does not hurt.
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/wag/stable', 'http://firmware.wag.ffho.net/stable'},
-
-				-- Number of valid manifest signatures necessary to accept the manifest as "good".
-				good_signatures = 3,
-
-				-- list of public keys which are considered "good" for manifest signatures
-				pubkeys = {
-					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
-					'b0197042824a752c2dba717a4b2ded88852111bbe12e6b5f57fdfa3abb9312c0', -- thardes2
-					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
-					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
-					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
-				},
-			},
-			testing = {
-				name = 'testing',
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/wag/testing','http://firmware.wag.ffho.net/testing'},
-				good_signatures = 2,
-				pubkeys = {
-					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
-					'b0197042824a752c2dba717a4b2ded88852111bbe12e6b5f57fdfa3abb9312c0', -- thardes2
-					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
-					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
-					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
-				},
-			},
-			experimental = {
-				name = 'experimental',
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/wag/experimental','http://firmware.wag.ffho.net/experimental'},
-				good_signatures = 1,
-				pubkeys = {
-					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
-					'b0197042824a752c2dba717a4b2ded88852111bbe12e6b5f57fdfa3abb9312c0', -- thardes2
-					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
-					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
-					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
-				},
-			},
-		},
-	},
-
-	-- default traffic shaping (bandwidth limit) settings
-	simple_tc = {
-		mesh_vpn = {
-			ifname = 'mesh-vpn',
-			enabled = false,
-			limit_egress = 200,
-			limit_ingress = 3000,
-		},
-	},
-
-	-- configure ffpb-debug
-	debugserver = {
-		host = { 'debugreport.ffho.net', 'fdca:ffee:ff12:a254::deb9' },
-		port = 1337,
-		liveport = 1338,
-	},
-
-	-- enable BATMAN on WAN interface by default (requires gluon-batman-on-wan package)
-	batman_on_wan = 0,
-
-}

extra/ffpb.conf

@@ -1,232 +0,0 @@
-{
-	-- A new node's name will be autogenerated from
-	-- it's primary MAC address and this prefix.
-	-- e.g. freifunk-0123456789ab
-	hostname_prefix = 'freifunk',
-
-	-- name of this community
-	site_name = 'Freifunk Paderborn',
-	-- short name of this community
-	site_code = 'ffpb',
-
-	-- v4 and v6 prefixes in which nodes+clients might get an IP
-	prefix4 = '10.132.0.0/18',
-	prefix6 = 'fdca:ffee:ff12:132::/64',
-
-	-- extra ipv6 prefixes used in this mesh area
-	additional_prefix6 = { '2001:470:6d:860::/64', },
-
-	-- timezone
-	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-
-	-- network-internal ntp service
-	ntp_servers = {'ntp.services.ffpb'},
-
-        -- OpenWRT Package Repository (IPv6 capable)
-	opkg_repo = 'http://bo.mirror.garr.it/pub/1/openwrt/barrier_breaker/14.07/%S/packages/',
-
-	-- regulatory domain of your wifi
-	regdom = 'DE',
-
-	-- wifi settings (2.4 GHz and 5 GHz)
-	-- the most important thing to change is the SSID
-	-- of the client network (yourcity.freifunk.net) and
-	-- both(!) mesh_?ssid ad-hoc mesh network ids.
-	wifi24 = {
-		ssid = 'paderborn.freifunk.net',
-		channel = 1,
-		htmode = 'HT20',
-		mesh_ssid = '02:d1:11:13:87:ad',
-		mesh_bssid = '02:d1:11:13:87:ad',
-		mesh_mcast_rate = 12000,
-	},
-	wifi5 = {
-		ssid = 'paderborn.freifunk.net',
-		channel = 44,
-		htmode = 'HT40+',
-		mesh_ssid = '02:d1:11:13:87:ad',
-		mesh_bssid = '02:d1:11:13:87:ad',
-		mesh_mcast_rate = 12000,
-	},
-
-	-- IP address of each router
-	-- At this IP a client can always connect to its
-	-- currently connected node. Both v4 and v6 addr.
-	-- must lie in the above prefix4 and prefix6.
-	next_node = {
-		ip4 = '10.132.0.1',
-		ip6 = 'fdca:ffee:ff12:132::1',
-
-		-- mac address, must be unique in the client network
-		-- (usually, you don't need to change this)
-		mac = '16:41:95:40:f7:dc',
-	},
-
-	-- fastd (vpn) settings
-	fastd_mesh_vpn = {
-		-- cipher(s) to use
-		methods = {'salsa2012+gmac'},
-
-		-- the maximum transfer unit
-		-- use 1426 for IPv4 gateways
-		mtu = 1406,
-
-		groups = {
-			backbone = {
-				-- specifies how many servers are contacted
-				-- by a client simultanously
-				limit = 1,
-	
-				-- list all available vpn servers
-				peers = {
-					gw01 = {
-						-- public fastd key of the vpn server
-						key = '97bc56ae561f67cfe15364134868c3553b5f1eab06f7bd9c5b93fbf280a52b51',
-						-- remotes is an array of ways on how to reach the VPN server
-						-- Use public addresses here, these addresses are used when the mesh might not be connected yet.
-						-- format: '[|ipv4|ipv6] "hostname-or-ip-address" port 10000'
-						remotes = {
-							'ipv6 "v6.gw01.paderborn.freifunk.net" port 10000',
-							'ipv4 "v4.gw01.paderborn.freifunk.net" port 10000',
-							'ipv6 "2a01:4f8:190:2105::ff12" port 10000',
-							'ipv4 "85.10.248.243" port 10000',
-						},
-					},
-					gw02 = {
-						key = 'e8fa9bf402fd33dd1ba804a97f2e46c704423ff49e9c55312845a7bfb93121ad',
-						remotes = {
-							'ipv6 "v6.gw02.paderborn.freifunk.net" port 10000',
-							'ipv4 "v4.gw02.paderborn.freifunk.net" port 10000',
-							'ipv6 "2a01:4f8:190:6500::18:1" port 10000',
-							'ipv4 "78.46.242.24" port 10000',
-						},
-					},
-					gw03 = {
-						key = 'cf7b54f7221a26251a5970e1d404f864ff4bfed3254bd741cf754445e040b9d0',
-						remotes = {
-							'ipv6 "v6.gw03.paderborn.freifunk.net" port 10000',
-							'ipv4 "v4.gw03.paderborn.freifunk.net" port 10000',
-							'ipv6 "2a01:a700:4621:d100::10" port 10000',
-							'ipv4 "31.172.8.123" port 10000',
-						},
-					},
-					gw04 = {
-						key = 'cf3855e5fa04e4c04a294cb6e8902f91c7ff7ef82bf031cc842a2b79b936677c',
-						remotes = {
-							'ipv6 "v6.gw04.paderborn.freifunk.net" port 10000',
-							'ipv4 "v4.gw04.paderborn.freifunk.net" port 10000',
-							'ipv6 "2a02:450:1:4::10" port 10000',
-							'ipv4 "80.70.181.57" port 10000',
-						},
-					},
-					gw05 = {
-						key = 'd0d32a2f536a0fc1f0c848e6da15bd96851d5ff4fdf9239c830bab033ddcec1a',
-						remotes = {
-							'ipv6 "v6.gw05.paderborn.freifunk.net" port 10000',
-							'ipv4 "v4.gw05.paderborn.freifunk.net" port 10000',
-							'ipv6 "2001:638:502:1884::ff05" port 10000',
-							'ipv4 "192.26.175.182" port 10000',
-						},
-					},
-					gw06 = {
-						key = 'b912bcf1c1335390364b8030448e53d8869b650f32923e59bf01d763d3028840',
-						remotes = {
-							'ipv6 "v6.gw06.paderborn.freifunk.net" port 10000',
-							'ipv4 "v4.gw06.paderborn.freifunk.net" port 10000',
-							'ipv6 "2a03:4000:6:20f0::ff12" port 10000',
-							'ipv4 "5.45.111.222" port 10000',
-						},
-					},
-					gw08 = {
-						key = '3da050bbf1c3e95af286af65553f546fd563d9cb5d4b3b3444069bef281de621',
-						remotes = {
-							'ipv6 "v6.gw08.paderborn.freifunk.net" port 10000',
-							'ipv4 "v4.gw08.paderborn.freifunk.net" port 10000',
-							'ipv6 "2a03:4000:6:1151::ff12" port 10000',
-							'ipv4 "5.45.107.59" port 10000',
-						},
-					},
-				},
-			},
-		},
-	},
-
-	-- configure the autoupdater
-	autoupdater = {
-		enabled = 1,
-
-		-- default branch for a firmware
-		-- In config-mode, the user can select a different branch from below
-		branch = 'stable',
-
-		-- available branches for the autoupdater
-		branches = {
-			stable = {
-				-- visible name of this branch (why not use the internal identifier here, too)
-				name = 'stable',
-
-				-- where to get the manifest file (without the trailing /manifest)
-				-- It's wise to use an internal address here,
-				-- but specifying a publicly available update site does not hurt.
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/stable', 'http://firmware.paderborn.freifunk.net/stable'},
-
-				-- Number of valid manifest signatures necessary to accept the manifest as "good".
-				good_signatures = 3,
-
-				-- list of public keys which are considered "good" for manifest signatures
-				pubkeys = {
-					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
-					'b0197042824a752c2dba717a4b2ded88852111bbe12e6b5f57fdfa3abb9312c0', -- thardes2
-					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
-					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
-					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
-				},
-			},
-			testing = {
-				name = 'testing',
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/testing','http://firmware.paderborn.freifunk.net/testing'},
-				good_signatures = 2,
-				pubkeys = {
-					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
-					'b0197042824a752c2dba717a4b2ded88852111bbe12e6b5f57fdfa3abb9312c0', -- thardes2
-					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
-					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
-					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
-				},
-			},
-			experimental = {
-				name = 'experimental',
-				mirrors = {'http://[fdca:ffee:ff12:a254::80]/experimental','http://firmware.paderborn.freifunk.net/experimental'},
-				good_signatures = 1,
-				pubkeys = {
-					'16b0e942929d6592d4a01b66b334427ba4db03b388a876432958d9010bd8d8b5', -- HeJ
-					'b0197042824a752c2dba717a4b2ded88852111bbe12e6b5f57fdfa3abb9312c0', -- thardes2
-					'ba2e6ff4de41ade9959702195d4c26c764e7aab85c627363681c29dbc4a8a2c5', -- oscar-
-					'fb9d6beba63dcb6175d0248c1e743b5fe4359474eb264d27f389d7a962e24477', -- northalpha
-					'f70f9ddeb307fff8fca31a76f4fbd0ac676dab8ad143625f0a4160d434d72876', -- Barbarossa
-				},
-			},
-		},
-	},
-
-	-- default traffic shaping (bandwidth limit) settings
-	simple_tc = {
-		mesh_vpn = {
-			ifname = 'mesh-vpn',
-			enabled = false,
-			limit_egress = 200,
-			limit_ingress = 3000,
-		},
-	},
-
-	-- configure ffpb-debug
-	debugserver = {
-		host = { 'debugreport.paderborn.freifunk.net', 'fdca:ffee:ff12:a254::deb9' },
-		port = 1337,
-		liveport = 1338,
-	},
-
-	-- enable BATMAN on WAN interface by default (requires gluon-batman-on-wan package)
-	batman_on_wan = 0,
-
-}

extra/sites.conf

@@ -0,0 +1,123 @@
+-- Define Blocks like:
+-- ffho_pad = {
+-- 	-- name of the region
+-- 	site_name = 'Freifunk Hochstift - Paderborn (Umland)',
+--
+--	-- short name of the region
+--	site_code = 'ffho_pad',
+--
+--	-- wifi settings
+--	ssid = 'hochstift.freifunk.net/pad-umlnd',
+--},
+{
+	ffho_abn = {
+		site_name = 'Freifunk Hochstift - Altenbeken',
+		site_code = 'ffho_abn',
+		ssid = 'hochstift.freifunk.net/altenbkn',
+	},
+	ffho_bdr = {
+		site_name = 'Freifunk Hochstift - Bad Driburg',
+		site_code = 'ffho_bdr',
+		ssid = 'hochstift.freifunk.net/driburg',
+	},
+	ffho_wux = {
+		site_name = 'Freifunk Hochstift - Bad Wünnenberg',
+		site_code = 'ffho_wux',
+		ssid = 'hochstift.freifunk.net/wuennenb',
+	},
+	ffho_xsc = {
+		site_name = 'Freifunk Hochstift - Bad Lippspringe & Schlangen',
+		site_code = 'ffho_xsc',
+		ssid = 'hochstift.freifunk.net/balischla',
+	},
+	ffho_bev = {
+		site_name = 'Freifunk Hochstift - Beverungen',
+		site_code = 'ffho_bev',
+		ssid = 'hochstift.freifunk.net/bev',
+	},
+	ffho_rhc = {
+		site_name = 'Freifunk Hochstift - Borchen',
+		site_code = 'ffho_rhc',
+		ssid = 'hochstift.freifunk.net/borchen',
+	},
+	ffho_bxg = {
+		site_name = 'Freifunk Hochstift - Borgendreich',
+		site_code = 'ffho_bxg',
+		ssid = 'hochstift.freifunk.net/borgendr',
+	},
+	ffho_bkk = {
+		site_name = 'Freifunk Hochstift - Brakel',
+		site_code = 'ffho_bkk',
+		ssid = 'hochstift.freifunk.net/brakel',
+	},
+	ffho_buq = {
+		site_name = 'Freifunk Hochstift - Büren',
+		site_code = 'ffho_buq',
+		ssid = 'hochstift.freifunk.net/bueren',
+	},
+	ffho_dek = {
+		site_name = 'Freifunk Hochstift - Delbrück',
+		site_code = 'ffho_dek',
+		ssid = 'hochstift.freifunk.net/delbrueck',
+	},
+	ffho_hvf = {
+		site_name = 'Freifunk Hochstift - Hövelhof',
+		site_code = 'ffho_hvf',
+		ssid = 'hochstift.freifunk.net/hoevelhof',
+	},
+	ffho_hox = {
+		site_name = 'Freifunk Hochstift - Höxter',
+		site_code = 'ffho_hox',
+		ssid = 'hochstift.freifunk.net/hoexter',
+	},
+	ffho_lit = {
+		site_name = 'Freifunk Hochstift - Lichtenau',
+		site_code = 'ffho_lit',
+		ssid = 'hochstift.freifunk.net/lichtenau',
+	},
+	ffho_mms = {
+		site_name = 'Freifunk Hochstift - Marienmünster',
+		site_code = 'ffho_mms',
+		ssid = 'hochstift.freifunk.net/mms',
+	},
+	ffho_yni = {
+		site_name = 'Freifunk Hochstift - Nieheim',
+		site_code = 'ffho_yni',
+		ssid = 'hochstift.freifunk.net/nieheim',
+	},
+	ffho_pad1 = {
+		site_name = 'Freifunk Hochstift - Paderborn (Umland)',
+		site_code = 'ffho_pad1',
+		ssid = 'hochstift.freifunk.net/pad-umlnd',
+	},
+	ffho_pad2 = {
+		site_name = 'Freifunk Hochstift - Paderborn (Kernstadt)',
+		site_code = 'ffho_pad2',
+		ssid = 'hochstift.freifunk.net/pad-city',
+	},
+	ffho_szn = {
+		site_name = 'Freifunk Hochstift - Salzkotten',
+		site_code = 'ffho_szn',
+		ssid = 'hochstift.freifunk.net/salzk',
+	},
+	ffho_stm = {
+		site_name = 'Freifunk Hochstift - Steinheim',
+		site_code = 'ffho_stm',
+		ssid = 'hochstift.freifunk.net/steinheim',
+	},
+	ffho_wag = {
+		site_name = 'Freifunk Hochstift - Warburg',
+		site_code = 'ffho_wag',
+		ssid = 'hochstift.freifunk.net/warburg',
+	},
+	ffho_ywl = {
+		site_name = 'Freifunk Hochstift - Willebadessen',
+		site_code = 'ffho_ywl',
+		ssid = 'hochstift.freifunk.net/willebdn',
+	},
+	ffho_yho = {
+		site_name = 'Freifunk Hochstift - Umland',
+		site_code = 'ffho_yho',
+		ssid = 'hochstift.freifunk.net/umland',
+	},
+}

modules

@@ -1,8 +1,5 @@
-GLUON_SITE_FEEDS='ffpb gluon_community_repositorys'
+GLUON_SITE_FEEDS='ffho'
 
-PACKAGES_FFPB_REPO=http://git.c3pb.de/freifunk-pb/ffpb-packages.git
-PACKAGES_FFPB_BRANCH=11s-mesh
-PACKAGES_FFPB_COMMIT=8890a16bf1f6740dd75fdca0aea8f174ae6da846
-
-PACKAGES_GLUON_COMMUNITY_REPOSITORYS_REPO=https://github.com/freifunk-gcp/v2015.1
-PACKAGES_GLUON_COMMUNITY_REPOSITORYS_COMMIT=2e7326aa903273485617f28cdf17dc06dfe44a87
+PACKAGES_FFHO_REPO=http://git.c3pb.de/freifunk-pb/ffpb-packages.git
+PACKAGES_FFHO_BRANCH=v2015.1.x
+PACKAGES_FFHO_COMMIT=2db3f2028caae2163c8fd6ab35102e45d576d1b0

site.conf

@@ -4,10 +4,13 @@
 	-- e.g. freifunk-0123456789ab
 	hostname_prefix = 'freifunk',
 
-	-- name of this community
-	site_name = 'Freifunk Paderborn',
-	-- short name of this community
-	site_code = 'ffpb',
+	-- name of this site
+	-- site_name = 'Freifunk Hochstift - ${site}',
+	site_name = 'Bitte wählen',
+	
+	-- short name of this site
+	-- site_code = 'ffho_${un-code}'
+	site_code = 'default',
 
 	-- v4 and v6 prefixes in which nodes+clients might get an IP
 	prefix4 = '10.132.0.0/18',
@@ -20,18 +23,18 @@
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
 
 	-- network-internal ntp service
-	ntp_servers = {'ntp.services.ffpb'},
+	ntp_servers = {'ntp.in.ffho.net'},
 
-        -- OpenWRT Package Repository (IPv6 capable)
+	-- OpenWRT Package Repository (IPv6 capable)
 	opkg_repo = 'http://bo.mirror.garr.it/pub/1/openwrt/barrier_breaker/14.07/%S/packages/',
 
 	-- regulatory domain of your wifi
 	regdom = 'DE',
 
 	-- wifi settings (2.4 GHz and 5 GHz)
-	-- the most important thing to change is the SSID
-	-- of the client network (yourcity.freifunk.net) and
-	-- both(!) mesh_?ssid ad-hoc mesh network ids.
+	-- ssid = 'hochstift.freifunk.net/${kürzel}',
+	-- mesh_ssid = 'ffho-mesh-${un-code}',
+	-- mesh_bssid = '${idividual-mac}'
 	wifi24 = {
 		ssid = 'paderborn.freifunk.net',
 		channel = 1,
@@ -221,7 +224,7 @@
 
 	-- configure ffpb-debug
 	debugserver = {
-		host = { 'debugreport.paderborn.freifunk.net', 'fdca:ffee:ff12:a254::deb9' },
+		host = { 'debugreport.ffho.net', 'fdca:ffee:ff12:a254::deb9' },
 		port = 1337,
 		liveport = 1338,
 	},

site.mk

@@ -5,16 +5,17 @@ GLUON_SITE_PACKAGES := \
 	ffpb-node-tuning \
 	ffpb-ebtables-net-rules \
 	ffpb-openwrt-migration-tools \
+	ffpb-alfred-config \
 	gluon-alfred \
 	gluon-announced \
 	gluon-autoupdater \
 	gluon-config-mode-core \
 	gluon-config-mode-autoupdater \
 	gluon-config-mode-hostname \
-	ffpb-config-mode-mesh-vpn \
-	ffpb-config-mode-geo-location \
 	gluon-config-mode-contact-info \
-	gluon-config-mode-site-select \
+	ffho-config-mode-mesh-vpn \
+	ffho-config-mode-geo-location \
+	ffho-config-mode-site-select \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
 	gluon-luci-admin \