Compare revisions

e8261ea6 · e8261ea6 · e8261ea6 · e8261ea6 · e8261ea6 · e8261ea6
--- a/domains/tossens.conf
+++ b/domains/tossens.conf
 {
-	domain_names = { tossens = 'tossens' },
+	domain_names = { tossens = 'Tossens' },
 	domain_seed = '08d037cae17c5a9cbc5b9fa19bdf873e7c66b9fa5b92a2e2e74c1866440bdc00',

-	prefix6 = '2a03:2260:1001:d800::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4:d800::/64' },
+	prefix6 = '2a0f:b506:ff1a::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4900::/64' },
 	prefix4 = '10.18.216.0/21',

 	wifi24 = {
 		ap = {
-			ssid = 'testing.nordwest.freifunk.net',
+			ssid = 'test.nordwest.freifunk.net',
+			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0A:12:D8:00',
+			id = 't-ffnw-mesh_02:00:0a:12:d8:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'testing.nordwest.freifunk.net',
+			ssid = 'test.nordwest.freifunk.net',
+			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0A:12:D8:00',
+			id = 't-ffnw-mesh_02:00:0a:12:d8:00',
 		},
 	},

 	next_node = {
 		name = { 'node.ffnw', 'nextnode', 'nn' },
-		ip6 = 'fd74:fdaa:9dc4:d800::1:1',
-		ip4 = '10.18.216.1',
+		ip6 = 'fd74:fdaa:9dc4::127',
+		mac = '16:41:95:40:f7:dc',
 	},

 	mesh_vpn = {
- 		fastd = {
-			groups = {
-				backbone = {
-					peers = {
-						tossens01 = {
-							key ='8d8e6230e122d020942bc0d60d26d55996d97e918892b2f870ba1e0bbea8a9c8',
-							remotes = {'"tossens01.sn.ffnw.de" port 10000'},
-						},
-						tossens02 = {
-							key ='6b5518082bfd1f110a34830412848759e8caf3b264349f018ef46d4a33734a05',
-							remotes = {'"tossens01.sn.ffnw.de" port 10001'},
-						},
-					},
-				},
-			},
-		},
 		tunneldigger = {
 			brokers = {'tossens01.sn.ffnw.de:9000'}
 		},
@@ -57,9 +45,21 @@
 					lat = 53.5,
 					lon = 8.18
 				},
+				{
+					lat = 53.5,
+					lon = 8.315
+				},
 				{
 					lat = 53.63,
 					lon = 8.315
+				},
+				{
+					lat = 53.63,
+					lon = 8.18
+				},
+				{
+					lat = 53.5,
+					lon = 8.18
 				}
 			}
 		}

--- a/domains/wilhelmshaven.conf
+++ b/domains/wilhelmshaven.conf
 {
-	domain_names = { wilhelmshaven = 'wilhelmshaven' },
+	domain_names = { wilhelmshaven = 'Wilhelmshaven' },
 	domain_seed = 'c4773223c43939b50f66bd1dd3129fe4d75f81dbfe49969adf36db159d58d236',

-	prefix6 = '2a06:e881:2000:4601::/64',
-	extra_prefixes6 = { 'fd74:fdaa:9dc4:e800::/64' },
+	prefix6 = '2a0f:b506:ff1b::/64',
+	extra_prefixes6 = { 'fd74:fdaa:9dc4::/64', '2a06:e881:2000:4601::/64' },
 	prefix4 = '10.18.232.0/21',

 	wifi24 = {
 		ap = {
-			ssid = 'testing.nordwest.freifunk.net',
+			ssid = 'test.nordwest.freifunk.net',
+			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0A:12:E8:00',
+			id = 't-ffnw-mesh_02:00:0a:12:e8:00',
 		},
 	},
 	wifi5 = {
 		ap = {
-			ssid = 'testing.nordwest.freifunk.net',
+			ssid = 'test.nordwest.freifunk.net',
+			owe_ssid = 'owe.test.nordwest.freifunk.net',
+			owe_transition_mode = true,
 		},
 		mesh = {
-			id = 't-ffnw-mesh_02:00:0A:12:E8:00',
+			id = 't-ffnw-mesh_02:00:0a:12:e8:00',
 		},
 	},

 	next_node = {
 		name = { 'node.ffnw', 'nextnode', 'nn' },
-		ip6 = 'fd74:fdaa:9dc4:e800::1:1',
-		ip4 = '10.18.232.1',
+		ip6 = 'fd74:fdaa:9dc4::127',
+		mac = '16:41:95:40:f7:dc',
 	},

 	mesh_vpn = {
- 		fastd = {
-			groups = {
-				backbone = {
-					peers = {
-						whv01 = {
-							key ='2f2c43e8f84ae7a5aa854ab7ef1eb448ea42147498dbe543e264737961bf5806',
-							remotes = {'"whv01.sn.ffnw.de" port 10004'},
-						},
-						whv02 = {
-							key ='4d828afb1ce3752c754f47236dbf7a6d73bc9f1cdbf4848d5ab4e78738c3bd5f',
-							remotes = {'"whv01.sn.ffnw.de" port 10005'},
-						},
-					},
-				},
-			},
-		},
 		tunneldigger = {
 			brokers = {'whv01.sn.ffnw.de:9001'}
 		},
@@ -57,9 +45,21 @@
 					lat = 53.5,
 					lon = 8.03
 				},
+				{
+					lat = 53.5,
+					lon = 8.18
+				},
 				{
 					lat = 53.62,
 					lon = 8.18
+				},
+				{
+					lat = 53.62,
+					lon = 8.03
+				},
+				{
+					lat = 53.5,
+					lon = 8.03
 				}
 			}
 		}

--- a/gluon_patches/0001-add-gluon-geolocator.patch
+++ b/gluon_patches/0001-add-gluon-geolocator.patch
--- a/gluon_patches/0002-ffnw-config-migration-from-gluon-node-info-to-geoloc.patch
+++ b/gluon_patches/0002-ffnw-config-migration-from-gluon-node-info-to-geoloc.patch
+From 71bcf5add0180cda356f6c9ce69e2a676e4daba6 Mon Sep 17 00:00:00 2001
+From: Jan-Tarek Butt <tarek@ring0.de>
+Date: Sun, 25 Feb 2018 08:42:42 +0100
+Subject: [PATCH 2/4] ffnw config migration from gluon-node-info to geolocator
+
+Signed-off-by: Jan-Tarek Butt <tarek@ring0.de>
+---
+ .../lib/gluon/upgrade/900-geloc-conf-migration  | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+ create mode 100755 package/gluon-geolocator/luasrc/lib/gluon/upgrade/900-geloc-conf-migration
+
+diff --git a/package/gluon-geolocator/luasrc/lib/gluon/upgrade/900-geloc-conf-migration b/package/gluon-geolocator/luasrc/lib/gluon/upgrade/900-geloc-conf-migration
+new file mode 100755
+index 00000000..6bfb1059
+--- /dev/null
+++ b/package/gluon-geolocator/luasrc/lib/gluon/upgrade/900-geloc-conf-migration
+@@ -0,0 +1,17 @@
+#!/usr/bin/lua
+
+local uci = require('simple-uci').cursor()
+local config = 'gluon-node-info'
+local sname = uci:get_first(config, 'location')
+if sname then
+  local options = {'refresh_interval', 'static_location', 'auto_location'}
+  for _, option in ipairs(options) do
+    local value = uci:get(config, sname, option)
+    if value then
+      uci:set('geolocator', 'settings', option, value)
+      uci:delete(config, sname, option)
+    end
+  end
+  uci:save(config)
+  uci:save('geolocator')
+end
+-- 
+2.20.1
+
--- a/gluon_patches/0003-hoodselector-to-domain-migration.patch
+++ b/gluon_patches/0003-hoodselector-to-domain-migration.patch
+From a273489a54d14454e6e53af94ab479b7c72f74d2 Mon Sep 17 00:00:00 2001
+From: runner01 <runner01@ffnw.de>
+Date: Mon, 18 Mar 2019 21:29:26 +0100
+Subject: [PATCH 3/4] hoodselector to domain migration
+
+Domain migration: restart services after migration
+
+Signed-off-by: runner01 <runner01@ffnw.de>
+---
+ .../lib/gluon/upgrade/010-domain-migrate      | 38 +++++++++++++++++++
+ 1 file changed, 38 insertions(+)
+ create mode 100755 package/gluon-hoodselector/luasrc/lib/gluon/upgrade/010-domain-migrate
+
+diff --git a/package/gluon-hoodselector/luasrc/lib/gluon/upgrade/010-domain-migrate b/package/gluon-hoodselector/luasrc/lib/gluon/upgrade/010-domain-migrate
+new file mode 100755
+index 00000000..9146970b
+--- /dev/null
+++ b/package/gluon-hoodselector/luasrc/lib/gluon/upgrade/010-domain-migrate
+@@ -0,0 +1,38 @@
+#!/usr/bin/lua
+
+local uci = require('simple-uci').cursor()
+local hoodutil = require('hoodselector.util')
+
+local last_hood = uci:get('hoodselector', 'hoodselector', 'hood')
+
+-- Return domain based on a given MESH-ID. nil if no matching domain could be found
+function get_domain_by_meshid(jdomains, meshid)
+	for _, jdomain in pairs(jdomains) do
+		if jdomain.domain.wifi24 ~= nil then
+			if jdomain.domain.wifi24.mesh ~= nil then
+				if meshid:lower() == jdomain.domain.wifi24.mesh.id:lower() then
+					return jdomain
+				end
+			end
+		end
+		if jdomain.domain.wifi5 ~= nil then
+			if jdomain.domain.wifi5.mesh ~= nil then
+				if meshid:lower()  == jdomain.domain.wifi5.mesh.id:lower() then
+					return jdomain
+				end
+			end
+		end
+	end
+	return nil
+end
+
+if last_hood ~= nil then
+	print(last_hood)
+	local new_domain = get_domain_by_meshid(hoodutil.get_domains(),"ffnw-mesh_"..last_hood)
+	if new_domain ~= nil then
+		print(new_domain.domain_code)
+		hoodutil.set_domain_config(new_domain)
+		os.execute("rm /etc/config/hoodselector")
+		hoodutil.restart_services()
+	end
+end
+-- 
+2.20.1
+
--- a/image-customization.lua
+++ b/image-customization.lua
--- a/modules
+++ b/modules
-GLUON_SITE_FEEDS='ffnw ffho tecff'
+GLUON_SITE_FEEDS='ffnw community'

-PACKAGES_FFNW_REPO=https://git.nordwest.freifunk.net/ffnw-firmware/packages.git
+PACKAGES_FFNW_REPO=https://git.ffnw.de/ffnw-firmware/packages.git
 PACKAGES_FFNW_BRANCH=master
-PACKAGES_FFNW_COMMIT=64ba97cb4238c9cdbda1a8c54989fd72a98ce5f9
+PACKAGES_FFNW_COMMIT=44d6aeca186e5ff92e8372f0a7e774d5ca443d3e

-PACKAGES_FFHO_REPO=https://git.ffho.net/FreifunkHochstift/ffho-packages.git
-PACKAGES_FFHO_BRANCH=v2017.1.x
-PACKAGES_FFHO_COMMIT=806f98a8f4bc0896ba29b903a8b9f72c39db2f09
-
-PACKAGES_TECFF_REPO=https://github.com/tecff/gluon-packages.git
-PACKAGES_TECFF_BRANCH=v2018.1.x
-PACKAGES_TECFF_COMMIT=7964a2884f1b43d994f8d1da931e89c5d36d3890
+PACKAGES_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git
+PACKAGES_COMMUNITY_COMMIT=bd78c4cea3fd2e203c0628ded1098c7a92cb3ae4
+PACKAGES_COMMUNITY_BRANCH=master
--- a/site.conf
+++ b/site.conf
--- a/site.mk
+++ b/site.mk
No results found