From 44d6aeca186e5ff92e8372f0a7e774d5ca443d3e Mon Sep 17 00:00:00 2001
From: Jan-Tarek Butt <tarek@ring0.de>
Date: Wed, 15 Sep 2021 19:45:41 +0200
Subject: [PATCH] Remove pkgs: 11s-switch, VXLAN-switch, hoods and
multiple-v6-watchdoog
Signed-off-by: Jan-Tarek Butt <tarek@ring0.de>
---
11s-switch/Makefile | 41 -
11s-switch/files/usr/lib/micron.d/11s-switch | 1 -
.../luasrc/lib/ffnw/11s-switch/11s-switch | 23 -
11s-switch/site.conf | 148 --
11s-switch/site_conf.lua | 7 -
VXLAN-switch/Makefile | 43 -
.../files/usr/lib/micron.d/vxlan-switch | 1 -
VXLAN-switch/leer.conf | 106 --
VXLAN-switch/leer_conf.lua | 7 -
VXLAN-switch/lohne.conf | 82 -
VXLAN-switch/lohne_conf.lua | 7 -
.../luasrc/lib/ffnw/vxlan-switch/vxlan-switch | 16 -
VXLAN-switch/oldenburg2.conf | 208 ---
VXLAN-switch/oldenburg2_conf.lua | 7 -
VXLAN-switch/osnabrueck.conf | 144 --
VXLAN-switch/osnabrueck2.conf | 122 --
VXLAN-switch/osnabrueck2_conf.lua | 7 -
VXLAN-switch/osnabrueck_conf.lua | 7 -
VXLAN-switch/rastede.conf | 126 --
VXLAN-switch/rastede_conf.lua | 7 -
VXLAN-switch/suedost.conf | 106 --
VXLAN-switch/suedost_conf.lua | 7 -
VXLAN-switch/tossens.conf | 82 -
VXLAN-switch/tossens_conf.lua | 7 -
VXLAN-switch/wilhelmshaven.conf | 82 -
VXLAN-switch/wilhelmshaven_conf.lua | 7 -
hoods/Makefile | 40 -
hoods/files/lib/ffnw/hoods/hoods.json | 1319 -----------------
.../lib/gluon/upgrade/500-set-hoodfile-path | 10 -
multiple-v6-watchdoog/Makefile | 37 -
.../usr/lib/micron.d/multiple-v6-watchdoog | 1 -
.../luasrc/usr/sbin/multiple-v6-watchdoog | 41 -
32 files changed, 2849 deletions(-)
delete mode 100644 11s-switch/Makefile
delete mode 100644 11s-switch/files/usr/lib/micron.d/11s-switch
delete mode 100755 11s-switch/luasrc/lib/ffnw/11s-switch/11s-switch
delete mode 100644 11s-switch/site.conf
delete mode 100644 11s-switch/site_conf.lua
delete mode 100644 VXLAN-switch/Makefile
delete mode 100644 VXLAN-switch/files/usr/lib/micron.d/vxlan-switch
delete mode 100644 VXLAN-switch/leer.conf
delete mode 100644 VXLAN-switch/leer_conf.lua
delete mode 100644 VXLAN-switch/lohne.conf
delete mode 100644 VXLAN-switch/lohne_conf.lua
delete mode 100755 VXLAN-switch/luasrc/lib/ffnw/vxlan-switch/vxlan-switch
delete mode 100644 VXLAN-switch/oldenburg2.conf
delete mode 100644 VXLAN-switch/oldenburg2_conf.lua
delete mode 100644 VXLAN-switch/osnabrueck.conf
delete mode 100644 VXLAN-switch/osnabrueck2.conf
delete mode 100644 VXLAN-switch/osnabrueck2_conf.lua
delete mode 100644 VXLAN-switch/osnabrueck_conf.lua
delete mode 100644 VXLAN-switch/rastede.conf
delete mode 100644 VXLAN-switch/rastede_conf.lua
delete mode 100644 VXLAN-switch/suedost.conf
delete mode 100644 VXLAN-switch/suedost_conf.lua
delete mode 100644 VXLAN-switch/tossens.conf
delete mode 100644 VXLAN-switch/tossens_conf.lua
delete mode 100644 VXLAN-switch/wilhelmshaven.conf
delete mode 100644 VXLAN-switch/wilhelmshaven_conf.lua
delete mode 100644 hoods/Makefile
delete mode 100644 hoods/files/lib/ffnw/hoods/hoods.json
delete mode 100755 hoods/luasrc/lib/gluon/upgrade/500-set-hoodfile-path
delete mode 100644 multiple-v6-watchdoog/Makefile
delete mode 100644 multiple-v6-watchdoog/files/usr/lib/micron.d/multiple-v6-watchdoog
delete mode 100755 multiple-v6-watchdoog/luasrc/usr/sbin/multiple-v6-watchdoog
diff --git a/11s-switch/Makefile b/11s-switch/Makefile
deleted file mode 100644
index 07fd56b..0000000
--- a/11s-switch/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ffnw-11s-switch
-PKG_VERSION:=1
-PKG_RELEASE:=1
-
-PKG_BUILD_DEPENDS := lua-cjson/host
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(TOPDIR)/../package/gluon.mk
-
-define Package/ffnw-11s-switch
- SECTION:=network
- CATEGORY:=Freifunk Nordwest
- TITLE:=Switch from IBSS to 11s
- DEPENDS:=+luci-lib-jsonc
-endef
-
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
- lua -e 'print(require("cjson").encode(assert(dofile("site_conf.lua"))))' > $(PKG_BUILD_DIR)/site.json
- lua -e 'print(os.time() + (14 * 86400))' > $(PKG_BUILD_DIR)/fdate
- $(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/ffnw-11s-switch/install
- $(CP) ./files/* $(1)/
- $(INSTALL_DIR) $(1)/lib/ffnw/11s-switch
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/site.json $(1)/lib/ffnw/11s-switch/
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/fdate $(1)/lib/ffnw/11s-switch/
- $(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-endef
-
-$(eval $(call BuildPackage,ffnw-11s-switch))
diff --git a/11s-switch/files/usr/lib/micron.d/11s-switch b/11s-switch/files/usr/lib/micron.d/11s-switch
deleted file mode 100644
index 2fb9fe9..0000000
--- a/11s-switch/files/usr/lib/micron.d/11s-switch
+++ /dev/null
@@ -1 +0,0 @@
-0 0 * * * /lib/ffnw/11s-switch/11s-switch
diff --git a/11s-switch/luasrc/lib/ffnw/11s-switch/11s-switch b/11s-switch/luasrc/lib/ffnw/11s-switch/11s-switch
deleted file mode 100755
index b4a11ba..0000000
--- a/11s-switch/luasrc/lib/ffnw/11s-switch/11s-switch
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/lua
-
-local FUTURE_SWITCH="/lib/ffnw/11s-switch/fdate"
-
-local SITE_PART="/lib/ffnw/11s-switch/site.json"
-
-local function file_exsist(file)
- return io.open(file, "r") ~= nil
-end
-
-if not file_exsist(SITE_PART) then
- io.stdout:write("11s-switch seems already done: " .. SITE_PART .. " dosnt exsist annymore!\n")
- os.exit(0)
-end
-
--- Check if interval over
-if tonumber(io.open(FUTURE_SWITCH):read("*a")) - os.time() < 0 then
- os.rename(SITE_PART, "/lib/gluon/site.json")
- os.execute('/lib/gluon/upgrade/200-wireless')
- os.execute('uci commit wireless && uci commit network')
-end
-io.stdout:write("Waiting " .. (io.open(FUTURE_SWITCH):read("*a") - os.time()) .. " seconds for switching\n")
-
diff --git a/11s-switch/site.conf b/11s-switch/site.conf
deleted file mode 100644
index 95327c5..0000000
--- a/11s-switch/site.conf
+++ /dev/null
@@ -1,148 +0,0 @@
-{
- hostname_prefix = 'ffnw-',
- site_name = 'Freifunk Nordwest',
- site_code = 'ffnw',
-
- prefix6 = 'fd74:fdaa:9dc4::/64',
-
- timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-
- ntp_servers = {'ntp.ffnw'},
-
- opkg = {
- extra = {
- modules = 'http://mirror.ffnw.de/modules/gluon-%GS-%GR/%S',
- },
- },
-
- regdom = 'DE',
-
- wifi24 = {
- channel = 6,
- supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
- basic_rate = {6000, 9000, 18000, 36000, 54000},
- ap = {
- ssid = 'nordwest.freifunk.net',
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0A:12:E0:00',
- mcast_rate = 12000,
- },
- },
- wifi5 = {
- channel = 44,
- ap = {
- ssid = 'nordwest.freifunk.net',
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0A:12:E0:00',
- mcast_rate = 12000,
- },
- },
-
- next_node = {
- ip6 = 'fd74:fdaa:9dc4::127',
- mac = '16:41:95:40:f7:dc',
- },
-
- mesh = {
- batman_adv = {
- gw_sel_class = 1, --class 1 is calculated from both the TQ and the announced bandwidth.
- },
- },
-
- mesh_vpn = {
- enabled = true,
- mtu = 1312,
- fastd = {
- methods = { 'null','salsa2012+umac' },
- configurable = true,
- groups = {
- backbone = {
- limit = 1,
- peers = {
- default06 = {
- key ='22e270ff9b2d1017c3a0b00dd22a58ef7e5915a355eeb16f0b8b52d7eb377869',
- remotes = {'"default06.ffnw.de" port 11111'},
- },
- },
- },
- },
- },
--- tunneldigger = {
--- brokers = {'vpn1.alpha-centauri.freifunk.net'}
--- },
- bandwidth_limit = {
- enabled = false,
- egress = 1800,
- ingress = 14400,
- },
- },
- mesh_on_wan = false,
- mesh_on_lan = false,
-
- autoupdater = {
- branch = 'stable',
- branches = {
- stable = {
- name = 'stable',
- mirrors = {
- 'http://autoupdate-lede.ffnw/stable',
- },
- good_signatures = 5,
- pubkeys = {
- '22c79b193a36269fd7fd51531e762b776e982926c90822df80b56f2be11648d4', --bjo
- '99c420e95dd0923ee6277af5c306f9ae6b97f8793b08edd41448925df5fe35b9', --floh1111
- 'd2b1366a38514e0fac47b119a8a08973ea8020bf9c138908d32b56a5d99f3079', --baranator
- '5d95cc2ef3ad17fe3716469e1effde4a49a25d4de9befa4a6eb260e4cda79ab0', --tata
- '0e6704ba26c150185514a391658455a612839c35bd83e0faffa81e0be48356e2', --sk
- '1f45d9be8a07cc2b6fcc384c71685fc0895a54be0d884aa4637c93ec4f36d970', --stefan6
- '36dff98a686a15d7fb129fe98df7977c7d53919aa512b825356bd8d638fca534', --PowerPan
- '13f022eb0704007a58a6a68952feaa5a91af4015db46f13bf3eb676a06e926f2', --fkr
- 'cc2e9b38ebe37613aa05bde6c0543a97a72940b1eee9f8ab89236e804cf0a3ff', --lethexa
- 'd3a4cbc90a2d4dbfc5386dd035016a04bfdfe1e7615fa8ea25bea5c048a7f106', --lrnzo
- },
- },
- testing = {
- name = 'testing',
- mirrors = {
- 'http://autoupdate-lede.ffnw/testing',
- },
- good_signatures = 1,
- pubkeys = {
- '22c79b193a36269fd7fd51531e762b776e982926c90822df80b56f2be11648d4', --bjo
- '99c420e95dd0923ee6277af5c306f9ae6b97f8793b08edd41448925df5fe35b9', --floh1111
- 'd2b1366a38514e0fac47b119a8a08973ea8020bf9c138908d32b56a5d99f3079', --baranator
- '5d95cc2ef3ad17fe3716469e1effde4a49a25d4de9befa4a6eb260e4cda79ab0', --tata
- '0e6704ba26c150185514a391658455a612839c35bd83e0faffa81e0be48356e2', --sk
- '1f45d9be8a07cc2b6fcc384c71685fc0895a54be0d884aa4637c93ec4f36d970', --stefan6
- '36dff98a686a15d7fb129fe98df7977c7d53919aa512b825356bd8d638fca534', --PowerPan
- '13f022eb0704007a58a6a68952feaa5a91af4015db46f13bf3eb676a06e926f2', --fkr
- 'd3a4cbc90a2d4dbfc5386dd035016a04bfdfe1e7615fa8ea25bea5c048a7f106', --lrnzo
- },
- },
- nightly_master = {
- name = 'nightly_master',
- mirrors = {
- 'http://autoupdate-lede.ffnw/nightly/master',
- },
- good_signatures = 1,
- pubkeys = {
- 'f89880c62f6975facbffa582f6a7078a63102477f1770f429f4e6e2a1ac7506f', --runner02.ffnw.de
- },
- },
- },
- },
-
- config_mode = {
- geo_location = {
- map_lon = 52.951947558,
- map_lat = 7.844238281,
- show_altitude = true,
- },
- location = {
- autolocation = 1,
- interval = 1000,
- },
- },
-}
diff --git a/11s-switch/site_conf.lua b/11s-switch/site_conf.lua
deleted file mode 100644
index 3d08b7b..0000000
--- a/11s-switch/site_conf.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-local function loader()
- coroutine.yield('return ')
- coroutine.yield(io.open('site.conf'):read('*a'))
-end
-
--- setfenv doesn't work with Lua 5.2 anymore, but we're using 5.1
-return setfenv(assert(load(coroutine.wrap(loader), 'site.conf')), {})()
diff --git a/VXLAN-switch/Makefile b/VXLAN-switch/Makefile
deleted file mode 100644
index 1707f7c..0000000
--- a/VXLAN-switch/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ffnw-vxlan-switch
-PKG_VERSION:=1
-PKG_RELEASE:=1
-
-PKG_BUILD_DEPENDS := lua-cjson/host
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(TOPDIR)/../package/gluon.mk
-
-define Package/ffnw-vxlan-switch
- SECTION:=network
- CATEGORY:=Freifunk Nordwest
- TITLE:=time base file copy
-endef
-# DEPENDS:=+luci-lib-jsonc
-#endef
-
-define Build/Compile
- lua -e 'print(require("cjson").encode(assert(dofile("leer_conf.lua"))))' > $(PKG_BUILD_DIR)/leer.json
- lua -e 'print(require("cjson").encode(assert(dofile("lohne_conf.lua"))))' > $(PKG_BUILD_DIR)/lohne.json
- lua -e 'print(require("cjson").encode(assert(dofile("oldenburg2_conf.lua"))))' > $(PKG_BUILD_DIR)/oldenburg2.json
- lua -e 'print(require("cjson").encode(assert(dofile("osnabrueck_conf.lua"))))' > $(PKG_BUILD_DIR)/osnabrueck.json
- lua -e 'print(require("cjson").encode(assert(dofile("rastede_conf.lua"))))' > $(PKG_BUILD_DIR)/rastede.json
- lua -e 'print(require("cjson").encode(assert(dofile("osnabrueck2_conf.lua"))))' > $(PKG_BUILD_DIR)/osnabrueck2.json
- lua -e 'print(require("cjson").encode(assert(dofile("suedost_conf.lua"))))' > $(PKG_BUILD_DIR)/suedost.json
- lua -e 'print(require("cjson").encode(assert(dofile("tossens_conf.lua"))))' > $(PKG_BUILD_DIR)/tossens.json
- lua -e 'print(require("cjson").encode(assert(dofile("wilhelmshaven_conf.lua"))))' > $(PKG_BUILD_DIR)/wilhelmshaven.json
- lua -e 'print(os.time() + (14 * 86400))' > $(PKG_BUILD_DIR)/fdate
- $(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/ffnw-vxlan-switch/install
- $(CP) ./files/* $(1)/
- $(INSTALL_DIR) $(1)/lib/ffnw/vxlan-switch
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/*.json $(1)/lib/ffnw/vxlan-switch/
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/fdate $(1)/lib/ffnw/vxlan-switch/
- $(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-endef
-
-$(eval $(call BuildPackage,ffnw-vxlan-switch))
diff --git a/VXLAN-switch/files/usr/lib/micron.d/vxlan-switch b/VXLAN-switch/files/usr/lib/micron.d/vxlan-switch
deleted file mode 100644
index 4cb7b94..0000000
--- a/VXLAN-switch/files/usr/lib/micron.d/vxlan-switch
+++ /dev/null
@@ -1 +0,0 @@
-0 0 * * * /lib/ffnw/vxlan-switch/vxlan-switch
diff --git a/VXLAN-switch/leer.conf b/VXLAN-switch/leer.conf
deleted file mode 100644
index 72f841a..0000000
--- a/VXLAN-switch/leer.conf
+++ /dev/null
@@ -1,106 +0,0 @@
-{
- domain_names = { leer = 'Leer' },
- domain_seed = 'ef1e0e53c6df30c482e61f9b504d41ee2623a88b9e3c53e6d59fe78ce24f106a',
-
- prefix6 = '2a06:e881:2000:4c00::/64',
- extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
- prefix4 = '10.18.208.0/21',
-
- wifi24 = {
- ap = {
- ssid = 'nordwest.freifunk.net',
- owe_ssid = 'owe.nordwest.freifunk.net',
- owe_transition_mode = true,
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0a:12:d0:00',
- },
- },
- wifi5 = {
- ap = {
- ssid = 'nordwest.freifunk.net',
- owe_ssid = 'owe.nordwest.freifunk.net',
- owe_transition_mode = true,
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0a:12:d0:00',
- },
- },
-
- next_node = {
- name = { 'node.ffnw', 'nextnode', 'nn' },
- ip6 = 'fd74:fdaa:9dc4::127',
- },
-
- mesh_vpn = {
- fastd = {
- groups = {
- backbone = {
- peers = {
- leer01 = {
- key ='02ee5dc6e69696388c38b8cee0c366f152a39136c0051300dfb6104ef0761007',
- remotes = {'"leer01.sn.ffnw.de" port 10000'},
- },
- leer02 = {
- key ='241d76b6b262f9dd452dcea92bcb57f1cc606ebeaeed9d0c55828dfd230a0271',
- remotes = {'"leer01.sn.ffnw.de" port 10001'},
- },
- },
- },
- },
- },
- tunneldigger = {
- brokers = {'leer01.sn.ffnw.de:9000'}
- },
- },
- hoodselector = {
- shapes = {
- {
- {
- lat = 53.115,
- lon = 6.981
- },
- {
- lat = 53.115,
- lon = 7.498
- },
- {
- lat = 53.026,
- lon = 7.498
- },
- {
- lat = 53.026,
- lon = 7.699
- },
- {
- lat = 53.21,
- lon = 7.699
- },
- {
- lat = 53.21,
- lon = 7.85
- },
- {
- lat = 53.372,
- lon = 7.85
- },
- {
- lat = 53.372,
- lon = 7.322
- },
- {
- lat = 53.32,
- lon = 7.322
- },
- {
- lat = 53.32,
- lon = 6.981
- },
- {
- lat = 53.115,
- lon = 6.981
- }
- }
- }
- }
-}
diff --git a/VXLAN-switch/leer_conf.lua b/VXLAN-switch/leer_conf.lua
deleted file mode 100644
index 2129855..0000000
--- a/VXLAN-switch/leer_conf.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-local function loader()
- coroutine.yield('return ')
- coroutine.yield(io.open('leer.conf'):read('*a'))
-end
-
--- setfenv doesn't work with Lua 5.2 anymore, but we're using 5.1
-return setfenv(assert(load(coroutine.wrap(loader), 'leer.conf')), {})()
diff --git a/VXLAN-switch/lohne.conf b/VXLAN-switch/lohne.conf
deleted file mode 100644
index 5ee0c50..0000000
--- a/VXLAN-switch/lohne.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-{
- domain_names = { lohne = 'Lohne' },
- domain_seed = '8b5029248dc02bdc1af2790cf487ba438704c513a117645a00a8f67f83dee08c',
-
- prefix6 = '2a06:e881:2000:4300::/64',
- extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
- prefix4 = '10.18.32.0/21',
-
- wifi24 = {
- ap = {
- ssid = 'nordwest.freifunk.net',
- owe_ssid = 'owe.nordwest.freifunk.net',
- owe_transition_mode = true,
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0a:12:20:00',
- },
- },
- wifi5 = {
- ap = {
- ssid = 'nordwest.freifunk.net',
- owe_ssid = 'owe.nordwest.freifunk.net',
- owe_transition_mode = true,
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0a:12:20:00',
- },
- },
-
- next_node = {
- name = { 'node.ffnw', 'nextnode', 'nn' },
- ip6 = 'fd74:fdaa:9dc4::127',
- },
-
- mesh_vpn = {
- fastd = {
- groups = {
- backbone = {
- peers = {
- vec01 = {
- key ='6051e5fd6848819f636030fcddf6e64bf2375bad06c82b95c719ab45a4c96116',
- remotes = {'"vec01.sn.ffnw.de" port 10004'},
- },
- vec01 = {
- key ='a4ce41a63f5baf4c0ba95cff3bd1a666ddcd78fb58d11564f6d35581d4b3fb23',
- remotes = {'"vec01.sn.ffnw.de" port 10005'},
- },
- },
- },
- },
- },
- tunneldigger = {
- brokers = {'vec01.sn.ffnw.de:9002'}
- },
- },
- hoodselector = {
- shapes = {
- {
- {
- lat = 52.625,
- lon = 8.16
- },
- {
- lat = 52.625,
- lon = 8.32
- },
- {
- lat = 52.69,
- lon = 8.32
- },
- {
- lat = 52.69,
- lon = 8.16
- },
- {
- lat = 52.625,
- lon = 8.16
- }
- }
- }
- }
-}
diff --git a/VXLAN-switch/lohne_conf.lua b/VXLAN-switch/lohne_conf.lua
deleted file mode 100644
index a3c7ff1..0000000
--- a/VXLAN-switch/lohne_conf.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-local function loader()
- coroutine.yield('return ')
- coroutine.yield(io.open('lohne.conf'):read('*a'))
-end
-
--- setfenv doesn't work with Lua 5.2 anymore, but we're using 5.1
-return setfenv(assert(load(coroutine.wrap(loader), 'lohne.conf')), {})()
diff --git a/VXLAN-switch/luasrc/lib/ffnw/vxlan-switch/vxlan-switch b/VXLAN-switch/luasrc/lib/ffnw/vxlan-switch/vxlan-switch
deleted file mode 100755
index a2235d9..0000000
--- a/VXLAN-switch/luasrc/lib/ffnw/vxlan-switch/vxlan-switch
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/lua
-
-local FUTURE_SWITCH="/lib/ffnw/vxlan-switch/fdate"
-
-if os.execute("ls /lib/ffnw/vxlan-switch/ | grep -q json") ~= 0 then
- io.stdout:write("vxlan-switch seems already done!\n")
- os.exit(0)
-end
-
--- Check if interval over
-if tonumber(io.open(FUTURE_SWITCH):read("*a")) - os.time() < 0 then
- os.execute("mv /lib/ffnw/vxlan-switch/*.json /lib/gluon/domains/.")
- os.execute("gluon-reconfigure")
- os.execute("sleep 10 && reboot")
-end
-io.stdout:write("Waiting " .. (io.open(FUTURE_SWITCH):read("*a") - os.time()) .. " seconds for switching\n")
diff --git a/VXLAN-switch/oldenburg2.conf b/VXLAN-switch/oldenburg2.conf
deleted file mode 100644
index f1dceb6..0000000
--- a/VXLAN-switch/oldenburg2.conf
+++ /dev/null
@@ -1,208 +0,0 @@
-{
- domain_names = { oldenburg2 = 'Oldenburg Umland' },
- domain_seed = '104ef6470c5e4c9a8d675decde3a3b231ba6fcad9693ef629770dd50298b17a6',
-
- prefix6 = '2a06:e881:2000:4701::/64',
- extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
- prefix4 = '10.18.104.0/21',
-
- wifi24 = {
- ap = {
- ssid = 'nordwest.freifunk.net',
- owe_ssid = 'owe.nordwest.freifunk.net',
- owe_transition_mode = true,
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0a:12:68:00',
- },
- },
- wifi5 = {
- ap = {
- ssid = 'nordwest.freifunk.net',
- owe_ssid = 'owe.nordwest.freifunk.net',
- owe_transition_mode = true,
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0a:12:68:00',
- },
- },
-
- next_node = {
- name = { 'node.ffnw', 'nextnode', 'nn' },
- ip6 = 'fd74:fdaa:9dc4::127',
- },
-
- mesh_vpn = {
- fastd = {
- groups = {
- backbone = {
- peers = {
- ol01 = {
- key ='2bfd94d23a0a37e5438a2ea3363a38e6ffe9a0bedc31034e45d7f62a4783de71',
- remotes = {'"ol01.sn.ffnw.de" port 10002'},
- },
- ol02 = {
- key ='cefa3ae11e91bb09180f394257da2c8e5492fdb493091a65c79ec332ba7763e6',
- remotes = {'"ol01.sn.ffnw.de" port 10003'},
- },
- },
- },
- },
- },
- tunneldigger = {
- brokers = {'ol01.sn.ffnw.de:9001'}
- },
- },
- hoodselector = {
- shapes = {
- {
- {
- lat = 53.08,
- lon = 8.14
- },
- {
- lat = 53.08,
- lon = 8.3
- },
- {
- lat = 53.2,
- lon = 8.3
- },
- {
- lat = 53.2,
- lon = 8.22
- },
- {
- lat = 53.21,
- lon = 8.22
- },
- {
- lat = 53.21,
- lon = 8.14
- },
- {
- lat = 53.08,
- lon = 8.14
- }
- },
- {
- {
- lat = 53.1651,
- lon = 8.2188
- },
- {
- lat = 53.1638,
- lon = 8.2145
- },
- {
- lat = 53.1625,
- lon = 8.2059
- },
- {
- lat = 53.1579,
- lon = 8.1976
- },
- {
- lat = 53.1561,
- lon = 8.1952
- },
- {
- lat = 53.1531,
- lon = 8.1937
- },
- {
- lat = 53.1462,
- lon = 8.1926
- },
- {
- lat = 53.1413,
- lon = 8.19
- },
- {
- lat = 53.1349,
- lon = 8.192
- },
- {
- lat = 53.1311,
- lon = 8.1945
- },
- {
- lat = 53.1291,
- lon = 8.1982
- },
- {
- lat = 53.1284,
- lon = 8.2016
- },
- {
- lat = 53.1283,
- lon = 8.2086
- },
- {
- lat = 53.1274,
- lon = 8.2127
- },
- {
- lat = 53.1248,
- lon = 8.2179
- },
- {
- lat = 53.1233,
- lon = 8.2239
- },
- {
- lat = 53.1241,
- lon = 8.2447
- },
- {
- lat = 53.1213,
- lon = 8.2576
- },
- {
- lat = 53.1141,
- lon = 8.2735
- },
- {
- lat = 53.1282,
- lon = 8.276
- },
- {
- lat = 53.1446,
- lon = 8.2766
- },
- {
- lat = 53.156,
- lon = 8.2742
- },
- {
- lat = 53.1649,
- lon = 8.2705
- },
- {
- lat = 53.1609,
- lon = 8.2577
- },
- {
- lat = 53.16,
- lon = 8.2505
- },
- {
- lat = 53.1585,
- lon = 8.2438
- },
- {
- lat = 53.159,
- lon = 8.2385
- },
- {
- lat = 53.1619,
- lon = 8.2327
- },
- {
- lat = 53.1651,
- lon = 8.2188
- }
- }
- }
- }
-}
diff --git a/VXLAN-switch/oldenburg2_conf.lua b/VXLAN-switch/oldenburg2_conf.lua
deleted file mode 100644
index c3e8ffd..0000000
--- a/VXLAN-switch/oldenburg2_conf.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-local function loader()
- coroutine.yield('return ')
- coroutine.yield(io.open('oldenburg2.conf'):read('*a'))
-end
-
--- setfenv doesn't work with Lua 5.2 anymore, but we're using 5.1
-return setfenv(assert(load(coroutine.wrap(loader), 'oldenburg2.conf')), {})()
diff --git a/VXLAN-switch/osnabrueck.conf b/VXLAN-switch/osnabrueck.conf
deleted file mode 100644
index 19017f2..0000000
--- a/VXLAN-switch/osnabrueck.conf
+++ /dev/null
@@ -1,144 +0,0 @@
-{
- domain_names = {osnabrueck='Osnabrück'},
- domain_seed = 'd607cea9e5555fcbd3c814aae15e920307ea0916c573018ed41ee8dbd1a1548d',
-
- prefix6 = '2a06:e881:2000:4400::/64',
- extra_prefixes6 = {'fd74:fdaa:9dc4::/64'},
- prefix4 = '10.18.144.0/21',
-
- wifi24 = {
- ap = {
- ssid = 'nordwest.freifunk.net',
- owe_ssid = 'owe.nordwest.freifunk.net',
- owe_transition_mode = true,
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0a:12:90:00',
- },
- },
- wifi5 = {
- ap = {
- ssid = 'nordwest.freifunk.net',
- owe_ssid = 'owe.nordwest.freifunk.net',
- owe_transition_mode = true,
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0a:12:90:00',
- },
- },
-
- next_node = {
- name = { 'node.ffnw', 'nextnode', 'nn' },
- ip6 = 'fd74:fdaa:9dc4::127',
- },
-
- mesh_vpn = {
- fastd = {
- groups = {
- backbone = {
- peers = {
- lk_os01 = {
- key ='148fa1af96a0ee6653d150fa11b6b018738a711f47b8d8bb05ad569880ad6415',
- remotes = {'"lk-os01.sn.ffnw.de" port 10000'},
- },
- lk_os02 = {
- key ='c91a74b295f8d1372080c0a7536b094631c4cab6af3fd339e135c4f971c91242',
- remotes = {'"lk-os02.sn.ffnw.de" port 10001'},
- },
- },
- },
- },
- },
- tunneldigger = {
- brokers = {'lk-os01.sn.ffnw.de:9000'}
- },
- },
- hoodselector = {
- shapes = {
- {
- {
- lat = 52.24,
- lon = 7.99
- },
- {
- lat = 52.24,
- lon = 8.15
- },
- {
- lat = 52.32,
- lon = 8.15
- },
- {
- lat = 52.32,
- lon = 7.99
- },
- {
- lat = 52.24,
- lon = 7.99
- }
- },
- {
- {
- lat = 52.27,
- lon = 8.0417
- },
- {
- lat = 52.2684,
- lon = 8.0447
- },
- {
- lat = 52.2676,
- lon = 8.0471
- },
- {
- lat = 52.2672,
- lon = 8.05
- },
- {
- lat = 52.2672,
- lon = 8.0531
- },
- {
- lat = 52.2683,
- lon = 8.0568
- },
- {
- lat = 52.2705,
- lon = 8.0585
- },
- {
- lat = 52.2701,
- lon = 8.0595
- },
- {
- lat = 52.2727,
- lon = 8.0618
- },
- {
- lat = 52.2747,
- lon = 8.057
- },
- {
- lat = 52.2823,
- lon = 8.0434
- },
- {
- lat = 52.2787,
- lon = 8.0384
- },
- {
- lat = 52.2765,
- lon = 8.0382
- },
- {
- lat = 52.2755,
- lon = 8.0393
- },
- {
- lat = 52.27,
- lon = 8.0417
- }
- }
- }
- }
-}
diff --git a/VXLAN-switch/osnabrueck2.conf b/VXLAN-switch/osnabrueck2.conf
deleted file mode 100644
index cdbd4a0..0000000
--- a/VXLAN-switch/osnabrueck2.conf
+++ /dev/null
@@ -1,122 +0,0 @@
-{
- domain_names = { osnabrueck2 = 'Osnabrück Innenstadt' },
- domain_seed = 'b9f64deca4ac0c9e43320f405c593ffbce996eb46374b214af6061dbc63f1acb',
-
- prefix6 = '2a06:e881:2000:4401::/64',
- extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
- prefix4 = '10.18.96.0/21',
-
- wifi24 = {
- ap = {
- ssid = 'nordwest.freifunk.net',
- owe_ssid = 'owe.nordwest.freifunk.net',
- owe_transition_mode = true,
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0a:12:60:00',
- },
- },
- wifi5 = {
- ap = {
- ssid = 'nordwest.freifunk.net',
- owe_ssid = 'owe.nordwest.freifunk.net',
- owe_transition_mode = true,
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0a:12:60:00',
- },
- },
-
- next_node = {
- name = { 'node.ffnw', 'nextnode', 'nn' },
- ip6 = 'fd74:fdaa:9dc4::127',
- },
-
- mesh_vpn = {
- fastd = {
- groups = {
- backbone = {
- peers = {
- os01 = {
- key ='e00d26eee0a91d7a9d38da736b051cbe1fef4166cb15ab41c4d1ada95e857c43',
- remotes = {'"os01.sn.ffnw.de" port 10002'},
- },
- os02 = {
- key ='30e2b86d25c9270ce084393de456a15e5326093998002b668c1bd9bc79b96c79',
- remotes = {'"os01.sn.ffnw.de" port 10003'},
- },
- },
- },
- },
- },
- tunneldigger = {
- brokers = {'lk-os01.sn.ffnw.de:9001'}
- },
- },
- hoodselector = {
- shapes = {
- {
- {
- lat = 52.27,
- lon = 8.0417
- },
- {
- lat = 52.2684,
- lon = 8.0447
- },
- {
- lat = 52.2676,
- lon = 8.0471
- },
- {
- lat = 52.2672,
- lon = 8.05
- },
- {
- lat = 52.2672,
- lon = 8.0531
- },
- {
- lat = 52.2683,
- lon = 8.0568
- },
- {
- lat = 52.2705,
- lon = 8.0585
- },
- {
- lat = 52.2701,
- lon = 8.0595
- },
- {
- lat = 52.2727,
- lon = 8.0618
- },
- {
- lat = 52.2747,
- lon = 8.057
- },
- {
- lat = 52.2823,
- lon = 8.0434
- },
- {
- lat = 52.2787,
- lon = 8.0384
- },
- {
- lat = 52.2765,
- lon = 8.0382
- },
- {
- lat = 52.2755,
- lon = 8.0393
- },
- {
- lat = 52.27,
- lon = 8.0417
- }
- }
- }
- }
-}
diff --git a/VXLAN-switch/osnabrueck2_conf.lua b/VXLAN-switch/osnabrueck2_conf.lua
deleted file mode 100644
index 33a36af..0000000
--- a/VXLAN-switch/osnabrueck2_conf.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-local function loader()
- coroutine.yield('return ')
- coroutine.yield(io.open('osnabrueck2.conf'):read('*a'))
-end
-
--- setfenv doesn't work with Lua 5.2 anymore, but we're using 5.1
-return setfenv(assert(load(coroutine.wrap(loader), 'osnabrueck2.conf')), {})()
diff --git a/VXLAN-switch/osnabrueck_conf.lua b/VXLAN-switch/osnabrueck_conf.lua
deleted file mode 100644
index c63b5e8..0000000
--- a/VXLAN-switch/osnabrueck_conf.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-local function loader()
- coroutine.yield('return ')
- coroutine.yield(io.open('osnabrueck.conf'):read('*a'))
-end
-
--- setfenv doesn't work with Lua 5.2 anymore, but we're using 5.1
-return setfenv(assert(load(coroutine.wrap(loader), 'osnabrueck.conf')), {})()
diff --git a/VXLAN-switch/rastede.conf b/VXLAN-switch/rastede.conf
deleted file mode 100644
index 38318f3..0000000
--- a/VXLAN-switch/rastede.conf
+++ /dev/null
@@ -1,126 +0,0 @@
-{
- domain_names = { rastede = 'Rastede' },
- domain_seed = 'a089010314ddccf6306881e15601bc418bb5b08ef59b8708a6789f7fc510ab72',
-
- prefix6 = '2a06:e881:2000:4302::/64',
- extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
- prefix4 = '10.18.160.0/21',
-
- wifi24 = {
- ap = {
- ssid = 'nordwest.freifunk.net',
- owe_ssid = 'owe.nordwest.freifunk.net',
- owe_transition_mode = true,
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0a:12:a0:00',
- },
- },
- wifi5 = {
- ap = {
- ssid = 'nordwest.freifunk.net',
- owe_ssid = 'owe.nordwest.freifunk.net',
- owe_transition_mode = true,
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0a:12:a0:00',
- },
- },
-
- next_node = {
- name = { 'node.ffnw', 'nextnode', 'nn' },
- ip6 = 'fd74:fdaa:9dc4::127',
- },
-
- mesh_vpn = {
- fastd = {
- groups = {
- backbone = {
- peers = {
- ras01 = {
- key ='ca1b5487ffc20a1f90e0ac14e835d84ab9e52612b5ca62e073d0a13dad98775e',
- remotes = {'"ras01.sn.ffnw.de" port 10000'},
- },
- },
- },
- },
- },
- tunneldigger = {
- brokers = {'ras01.sn.ffnw.de:9000'}
- },
- },
- hoodselector = {
- shapes = {
- {
- {
- lat = 53.08,
- lon = 7.699
- },
- {
- lat = 53.08,
- lon = 8.14
- },
- {
- lat = 53.21,
- lon = 8.14
- },
- {
- lat = 53.21,
- lon = 8.22
- },
- {
- lat = 53.2,
- lon = 8.22
- },
- {
- lat = 53.2,
- lon = 8.3
- },
- {
- lat = 53.28,
- lon = 8.3
- },
- {
- lat = 53.28,
- lon = 8.13
- },
- {
- lat = 53.372,
- lon = 8.13
- },
- {
- lat = 53.372,
- lon = 7.9743
- },
- {
- lat = 53.3628,
- lon = 7.9741
- },
- {
- lat = 53.3626,
- lon = 7.9372
- },
- {
- lat = 53.372,
- lon = 7.9374
- },
- {
- lat = 53.372,
- lon = 7.85
- },
- {
- lat = 53.21,
- lon = 7.85
- },
- {
- lat = 53.21,
- lon = 7.699
- },
- {
- lat = 53.08,
- lon = 7.699
- }
- }
- }
- }
-}
diff --git a/VXLAN-switch/rastede_conf.lua b/VXLAN-switch/rastede_conf.lua
deleted file mode 100644
index 2318076..0000000
--- a/VXLAN-switch/rastede_conf.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-local function loader()
- coroutine.yield('return ')
- coroutine.yield(io.open('rastede.conf'):read('*a'))
-end
-
--- setfenv doesn't work with Lua 5.2 anymore, but we're using 5.1
-return setfenv(assert(load(coroutine.wrap(loader), 'rastede.conf')), {})()
diff --git a/VXLAN-switch/suedost.conf b/VXLAN-switch/suedost.conf
deleted file mode 100644
index 393fe7b..0000000
--- a/VXLAN-switch/suedost.conf
+++ /dev/null
@@ -1,106 +0,0 @@
-{
- domain_names = { suedost = 'Südost' },
- domain_seed = '644056d244937557f31b224f1b5b52d941ae63874ab13826c9966a58b9df6aff',
-
- prefix6 = '2a06:e881:2000:4902::/64',
- extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
- prefix4 = '10.18.48.0/21',
-
- wifi24 = {
- ap = {
- ssid = 'nordwest.freifunk.net',
- owe_ssid = 'owe.nordwest.freifunk.net',
- owe_transition_mode = true,
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0a:12:30:00',
- },
- },
- wifi5 = {
- ap = {
- ssid = 'nordwest.freifunk.net',
- owe_ssid = 'owe.nordwest.freifunk.net',
- owe_transition_mode = true,
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0a:12:30:00',
- },
- },
-
- next_node = {
- name = { 'node.ffnw', 'nextnode', 'nn' },
- ip6 = 'fd74:fdaa:9dc4::127',
- },
-
- mesh_vpn = {
- fastd = {
- groups = {
- backbone = {
- peers = {
- suedost01 = {
- key ='2f4fdcfea81ae7122455846bc5b2ea7a0b70506afc365861931221898bcb3e05',
- remotes = {'"suedost01.sn.ffnw.de" port 10006'},
- },
- suedost02 = {
- key ='353dc2fb5ef923af2512f873e208357cf2b56e922ff2520ccf56659cda5d87a2',
- remotes = {'"suedost01.sn.ffnw.de" port 10007'},
- },
- },
- },
- },
- },
- tunneldigger = {
- brokers = {'suedost01.sn.ffnw.de:9002'}
- },
- },
- hoodselector = {
- shapes = {
- {
- {
- lat = 52.07,
- lon = 8.42
- },
- {
- lat = 52.07,
- lon = 9.3
- },
- {
- lat = 52.944,
- lon = 9.3
- },
- {
- lat = 52.944,
- lon = 8.67
- },
- {
- lat = 52.76,
- lon = 8.67
- },
- {
- lat = 52.76,
- lon = 8.443
- },
- {
- lat = 52.69,
- lon = 8.443
- },
- {
- lat = 52.69,
- lon = 8.32
- },
- {
- lat = 52.46,
- lon = 8.32
- },
- {
- lat = 52.46,
- lon = 8.42
- },
- {
- lat = 52.07,
- lon = 8.42
- }
- }
- }
- }
-}
diff --git a/VXLAN-switch/suedost_conf.lua b/VXLAN-switch/suedost_conf.lua
deleted file mode 100644
index bceb1fe..0000000
--- a/VXLAN-switch/suedost_conf.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-local function loader()
- coroutine.yield('return ')
- coroutine.yield(io.open('suedost.conf'):read('*a'))
-end
-
--- setfenv doesn't work with Lua 5.2 anymore, but we're using 5.1
-return setfenv(assert(load(coroutine.wrap(loader), 'suedost.conf')), {})()
diff --git a/VXLAN-switch/tossens.conf b/VXLAN-switch/tossens.conf
deleted file mode 100644
index dbf11fe..0000000
--- a/VXLAN-switch/tossens.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-{
- domain_names = { tossens = 'Tossens' },
- domain_seed = '08d037cae17c5a9cbc5b9fa19bdf873e7c66b9fa5b92a2e2e74c1866440bdc00',
-
- prefix6 = '2a06:e881:2000:4900::/64',
- extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
- prefix4 = '10.18.216.0/21',
-
- wifi24 = {
- ap = {
- ssid = 'nordwest.freifunk.net',
- owe_ssid = 'owe.nordwest.freifunk.net',
- owe_transition_mode = true,
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0a:12:d8:00',
- },
- },
- wifi5 = {
- ap = {
- ssid = 'nordwest.freifunk.net',
- owe_ssid = 'owe.nordwest.freifunk.net',
- owe_transition_mode = true,
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0a:12:d8:00',
- },
- },
-
- next_node = {
- name = { 'node.ffnw', 'nextnode', 'nn' },
- ip6 = 'fd74:fdaa:9dc4::127',
- },
-
- 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'}
- },
- },
- hoodselector = {
- shapes = {
- {
- {
- 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
- }
- }
- }
- }
-}
diff --git a/VXLAN-switch/tossens_conf.lua b/VXLAN-switch/tossens_conf.lua
deleted file mode 100644
index 35cb06b..0000000
--- a/VXLAN-switch/tossens_conf.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-local function loader()
- coroutine.yield('return ')
- coroutine.yield(io.open('tossens.conf'):read('*a'))
-end
-
--- setfenv doesn't work with Lua 5.2 anymore, but we're using 5.1
-return setfenv(assert(load(coroutine.wrap(loader), 'tossens.conf')), {})()
diff --git a/VXLAN-switch/wilhelmshaven.conf b/VXLAN-switch/wilhelmshaven.conf
deleted file mode 100644
index 23ff0fc..0000000
--- a/VXLAN-switch/wilhelmshaven.conf
+++ /dev/null
@@ -1,82 +0,0 @@
-{
- domain_names = { wilhelmshaven = 'Wilhelmshaven' },
- domain_seed = 'c4773223c43939b50f66bd1dd3129fe4d75f81dbfe49969adf36db159d58d236',
-
- prefix6 = '2a06:e881:2000:4601::/64',
- extra_prefixes6 = { 'fd74:fdaa:9dc4::/64' },
- prefix4 = '10.18.232.0/21',
-
- wifi24 = {
- ap = {
- ssid = 'nordwest.freifunk.net',
- owe_ssid = 'owe.nordwest.freifunk.net',
- owe_transition_mode = true,
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0a:12:e8:00',
- },
- },
- wifi5 = {
- ap = {
- ssid = 'nordwest.freifunk.net',
- owe_ssid = 'owe.nordwest.freifunk.net',
- owe_transition_mode = true,
- },
- mesh = {
- id = 'ffnw-mesh_02:00:0a:12:e8:00',
- },
- },
-
- next_node = {
- name = { 'node.ffnw', 'nextnode', 'nn' },
- ip6 = 'fd74:fdaa:9dc4::127',
- },
-
- 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'}
- },
- },
- hoodselector = {
- shapes = {
- {
- {
- 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
- }
- }
- }
- }
-}
diff --git a/VXLAN-switch/wilhelmshaven_conf.lua b/VXLAN-switch/wilhelmshaven_conf.lua
deleted file mode 100644
index 34d4be7..0000000
--- a/VXLAN-switch/wilhelmshaven_conf.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-local function loader()
- coroutine.yield('return ')
- coroutine.yield(io.open('wilhelmshaven.conf'):read('*a'))
-end
-
--- setfenv doesn't work with Lua 5.2 anymore, but we're using 5.1
-return setfenv(assert(load(coroutine.wrap(loader), 'wilhelmshaven.conf')), {})()
diff --git a/hoods/Makefile b/hoods/Makefile
deleted file mode 100644
index 6d64262..0000000
--- a/hoods/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ffnw-hoods
-PKG_VERSION:=1
-PKG_RELEASE:=1
-
-PKG_BUILD_DEPENDS := lua-cjson/host
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(TOPDIR)/../package/gluon.mk
-
-define Package/$(PKG_NAME)
- SECTION:=network
- CATEGORY:=Freifunk Nordwest
- TITLE:=Hoodjson file
-endef
-
-define Package/$(PKG_NAME)/description
- Hoodjson file
-endef
-
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
- $(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/$(PKG_NAME)/install
- $(INSTALL_DIR) $(1)/lib/ffnw/hoods
- lua -e 'local cjson = require("cjson"); print(cjson.encode(cjson.decode(assert(io.open("./files/lib/ffnw/hoods/hoods.json"):read("*a")))))' > $(1)/lib/ffnw/hoods/hoods.json
- $(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/hoods/files/lib/ffnw/hoods/hoods.json b/hoods/files/lib/ffnw/hoods/hoods.json
deleted file mode 100644
index a48e51e..0000000
--- a/hoods/files/lib/ffnw/hoods/hoods.json
+++ /dev/null
@@ -1,1319 +0,0 @@
-[
- {
- "name": "default",
- "bssid": "02:00:0A:12:E0:00",
- "defaulthood": true,
- "servers": [
- {
- "type": "fastd",
- "host": "default06.ffnw.de",
- "port": "11111",
- "publickey": "22e270ff9b2d1017c3a0b00dd22a58ef7e5915a355eeb16f0b8b52d7eb377869"
- },
- {
- "type": "fastd",
- "host": "default06.ffnw.de",
- "port": "11112",
- "publickey": "49f91cb7adabccc5c8876394d3bbe4f1927aa54c21af1a811a88cc44b5a12bfb"
- },
- {
- "type": "l2tp",
- "host": "default06.ffnw.de",
- "port": "9000"
- }
- ],
- "boxes": []
- },
- {
- "name": "landkreis-steinfurt",
- "bssid": "02:00:0A:12:80:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "lk-st01.sn.ffnw.de",
- "port": "10000",
- "publickey": "c6485ba100d633dbebdbfad24ba4a010a242d6d7bb9817173259e9d3677b929d"
- },
- {
- "type": "fastd",
- "host": "lk-st02.sn.ffnw.de",
- "port": "10001",
- "publickey": "88991ed1d7c6c4e1ffa9c97a1aa390d8ac03917ddacd9494c949abcbea6c6c94"
- },
- {
- "type": "l2tp",
- "host": "lk-st01.sn.ffnw.de",
- "port": "9000"
- }
- ],
- "boxes": [
- [
- [
- 52.154,
- 7.41
- ],
- [
- 52.35,
- 7.66
- ]
- ],
- [
- [
- 52.3,
- 7.66
- ],
- [
- 52.35,
- 7.9
- ]
- ],
- [
- [
- 52.18,
- 7.66
- ],
- [
- 52.25,
- 7.9
- ]
- ],
- [
- [
- 52.25,
- 7.76
- ],
- [
- 52.3,
- 7.9
- ]
- ]
- ]
- },
- {
- "name": "landkreis-friesland",
- "bssid": "02:00:0A:12:88:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "lk-fri01.sn.ffnw.de",
- "port": "10001",
- "publickey": "613ffbc8a5a2b1a8602866c0bd44afddecee79c49cde52ee4dd5df73c88d0437"
- },
- {
- "type": "fastd",
- "host": "lk-fri02.sn.ffnw.de",
- "port": "10002",
- "publickey": "14f33c20c3487904e6d1420e9105cfb62b66bc3216d5cdb8a055461b6ed0415d"
- },
- {
- "type": "l2tp",
- "host": "lk-fri01.sn.ffnw.de",
- "port": "9000"
- }
- ],
- "boxes": [
- [
- [
- 53.62,
- 7.85
- ],
- [
- 53.72,
- 8.18
- ]
- ],
- [
- [
- 53.372,
- 7.956
- ],
- [
- 53.5,
- 8.18
- ]
- ],
- [
- [
- 53.5,
- 7.85
- ],
- [
- 53.62,
- 8.03
- ]
- ]
- ]
- },
- {
- "name": "oldenburg",
- "bssid": "02:00:0A:12:98:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "ol01.sn.ffnw.de",
- "port": "10000",
- "publickey": "2807aacfbccff12794c80a1c368e89966bee9376416cc1773a5224c6f94c76d6"
- },
- {
- "type": "fastd",
- "host": "ol02.sn.ffnw.de",
- "port": "10001",
- "publickey": "9e3eb2b7094efbd574de2d7401589e2279c4e9e65522c0985fb57a98dfb605c1"
- },
- {
- "type": "l2tp",
- "host": "ol01.sn.ffnw.de",
- "port": "9000"
- }
- ],
- "boxes": [
- [
- [
- 53.124,
- 8.216
- ],
- [
- 53.163,
- 8.3
- ]
- ],
- [
- [
- 53.128,
- 8.187
- ],
- [
- 53.163,
- 8.216
- ]
- ]
- ]
- },
- {
- "name": "osnabrueck",
- "bssid": "02:00:0A:12:90:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "lk-os01.sn.ffnw.de",
- "port": "10000",
- "publickey": "148fa1af96a0ee6653d150fa11b6b018738a711f47b8d8bb05ad569880ad6415"
- },
- {
- "type": "fastd",
- "host": "lk-os02.sn.ffnw.de",
- "port": "10001",
- "publickey": "c91a74b295f8d1372080c0a7536b094631c4cab6af3fd339e135c4f971c91242"
- },
- {
- "type": "l2tp",
- "host": "lk-os01.sn.ffnw.de",
- "port": "9000"
- }
- ],
- "boxes": [
- [
- [
- 52.282,
- 7.99
- ],
- [
- 52.32,
- 8.15
- ]
- ],
- [
- [
- 52.24,
- 7.99
- ],
- [
- 52.282,
- 8.036
- ]
- ],
- [
- [
- 52.268,
- 8.06
- ],
- [
- 52.282,
- 8.15
- ]
- ],
- [
- [
- 52.24,
- 8.036
- ],
- [
- 52.268,
- 8.15
- ]
- ]
- ]
- },
- {
- "name": "butjadingen",
- "bssid": "02:00:0A:12:B0:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "lk-bra01.sn.ffnw.de",
- "port": "10000",
- "publickey": "e581343a5d17afc1c8c205424e00e26adef6c520ec54b6f462f962245e5b02cd"
- },
- {
- "type": "fastd",
- "host": "lk-bra02.sn.ffnw.de",
- "port": "10001",
- "publickey": "f9940159383e953044102b3e1529f568dd068c3f34062177ef74d244e06f65ef"
- },
- {
- "type": "l2tp",
- "host": "bra01.sn.ffnw.de",
- "port": "9000"
- }
- ],
- "boxes": [
- [
- [
- 53.5,
- 8.315
- ],
- [
- 53.63,
- 8.403
- ]
- ]
- ]
- },
- {
- "name": "landkreis-wittmund",
- "bssid": "02:00:0A:12:B8:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "lk-wtm01.sn.ffnw.de",
- "port": "10000",
- "publickey": "b57a979cc9ae698b4173b5b57b2b193e38de5cc423059023894965bba8458e45"
- },
- {
- "type": "fastd",
- "host": "lk-wtm02.sn.ffnw.de",
- "port": "10001",
- "publickey": "29a241d64158bc51f01e44bc188e91e5b887985da3688a02ce12b33439e17053"
- },
- {
- "type": "l2tp",
- "host": "wtm01.sn.ffnw.de",
- "port": "9000"
- }
- ],
- "boxes": [
- [
- [
- 53.5,
- 7.648
- ],
- [
- 53.72,
- 7.85
- ]
- ],
- [
- [
- 53.72,
- 7.648
- ],
- [
- 53.806,
- 8.052
- ]
- ],
- [
- [
- 53.436,
- 7.648
- ],
- [
- 53.5,
- 7.956
- ]
- ],
- [
- [
- 53.372,
- 7.825
- ],
- [
- 53.436,
- 7.956
- ]
- ]
- ]
- },
- {
- "name": "rastede",
- "bssid": "02:00:0A:12:A0:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "ras01.sn.ffnw.de",
- "port": "10000",
- "publickey": "ca1b5487ffc20a1f90e0ac14e835d84ab9e52612b5ca62e073d0a13dad98775e"
- },
- {
- "type": "l2tp",
- "host": "ras01.sn.ffnw.de",
- "port": "9000"
- }
- ],
- "boxes": [
- [
- [
- 53.21,
- 7.85
- ],
- [
- 53.28,
- 8.3
- ]
- ],
- [
- [
- 53.28,
- 7.85
- ],
- [
- 53.372,
- 8.13
- ]
- ],
- [
- [
- 53.2,
- 8.22
- ],
- [
- 53.21,
- 8.3
- ]
- ],
- [
- [
- 53.08,
- 7.699
- ],
- [
- 53.21,
- 8.14
- ]
- ]
- ]
- },
- {
- "name": "landkreis-vechta",
- "bssid": "02:00:0A:12:A8:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "lk-vec01.sn.ffnw.de",
- "port": "10002",
- "publickey": "18e3fd453b3ed675e23ead15727b6989879db5c401a71e1a5c4744f86d473eea"
- },
- {
- "type": "l2tp",
- "host": "vec01.sn.ffnw.de",
- "port": "9001"
- }
- ],
- "boxes": [
- [
- [
- 52.625,
- 7.9
- ],
- [
- 52.69,
- 8.16
- ]
- ],
- [
- [
- 52.46,
- 7.9
- ],
- [
- 52.625,
- 8.32
- ]
- ],
- [
- [
- 52.76,
- 8.21
- ],
- [
- 52.944,
- 8.67
- ]
- ],
- [
- [
- 52.69,
- 8.05
- ],
- [
- 52.76,
- 8.443
- ]
- ]
- ]
- },
- {
- "name": "delmenhorst",
- "bssid": "02:00:0A:12:C0:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "del01.sn.ffnw.de",
- "port": "10000",
- "publickey": "a1180ec56590b7c2c9377c10e96c5af176ff7f64984af423115875dd72d9bac3"
- },
- {
- "type": "fastd",
- "host": "del02.sn.ffnw.de",
- "port": "10001",
- "publickey": "22d9a5e6c1d91946e894065038a7bc73b9739daa19ee767fd789a3ce0da95f92"
- },
- {
- "type": "l2tp",
- "host": "del01.sn.ffnw.de",
- "port": "9000"
- }
- ],
- "boxes": [
- [
- [
- 52.944,
- 8.3
- ],
- [
- 53.22,
- 8.78
- ]
- ],
- [
- [
- 52.944,
- 8.14
- ],
- [
- 53.08,
- 8.3
- ]
- ]
- ]
- },
- {
- "name": "landkreis-osnabrueck",
- "bssid": "02:00:0A:12:C8:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "os02.sn.ffnw.de",
- "port": "10000",
- "publickey": "c694e8ae8828d9da0ba1d9e263d481dd1677e18f83be2cd8acd63db30aad0e5e"
- },
- {
- "type": "fastd",
- "host": "os02.sn.ffnw.de",
- "port": "10001",
- "publickey": "86f79f8e272d589d0436918ed436691e2109d687086bccd287275a175605d8d1"
- },
- {
- "type": "l2tp",
- "host": "os02.sn.ffnw.de",
- "port": "9000"
- }
- ],
- "boxes": [
- [
- [
- 52.07,
- 8.15
- ],
- [
- 52.32,
- 8.42
- ]
- ],
- [
- [
- 52.07,
- 7.9
- ],
- [
- 52.32,
- 7.99
- ]
- ],
- [
- [
- 52.182,
- 7.99
- ],
- [
- 52.24,
- 8.15
- ]
- ],
- [
- [
- 52.057,
- 8.101
- ],
- [
- 52.058,
- 8.102
- ]
- ],
- [
- [
- 52.32,
- 7.9
- ],
- [
- 52.46,
- 8.42
- ]
- ]
- ]
- },
- {
- "name": "leer",
- "bssid": "02:00:0A:12:D0:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "leer01.sn.ffnw.de",
- "port": "10000",
- "publickey": "02ee5dc6e69696388c38b8cee0c366f152a39136c0051300dfb6104ef0761007"
- },
- {
- "type": "fastd",
- "host": "leer01.sn.ffnw.de",
- "port": "10001",
- "publickey": "241d76b6b262f9dd452dcea92bcb57f1cc606ebeaeed9d0c55828dfd230a0271"
- },
- {
- "type": "l2tp",
- "host": "leer01.sn.ffnw.de",
- "port": "9000"
- }
- ],
- "boxes": [
- [
- [
- 53.21,
- 6.98
- ],
- [
- 53.32,
- 7.322
- ]
- ],
- [
- [
- 53.21,
- 7.322
- ],
- [
- 53.372,
- 7.85
- ]
- ],
- [
- [
- 53.115,
- 6.981
- ],
- [
- 53.21,
- 7.699
- ]
- ],
- [
- [
- 53.026,
- 7.498
- ],
- [
- 53.115,
- 7.699
- ]
- ]
- ]
- },
- {
- "name": "landkreis-emsland",
- "bssid": "02:00:0A:12:28:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "suedwest01.sn.ffnw.de",
- "port": "10004",
- "publickey": "d472e4f1747ea9d8e00069abc9361e689b22dd6c1cf3539ab8fafc9586fa299e"
- },
- {
- "type": "fastd",
- "host": "suedwest01.sn.ffnw.de",
- "port": "10005",
- "publickey": "ea6aa0730ec30d927b6706521897cd3fb874904dc2e497da0b34f4eff2426cdc"
- },
- {
- "type": "l2tp",
- "host": "suedwest01.sn.ffnw.de",
- "port": "9001"
- }
- ],
- "boxes": [
- [
- [
- 52.69,
- 6.982
- ],
- [
- 53.026,
- 7.699
- ]
- ],
- [
- [
- 52.35,
- 7.244
- ],
- [
- 52.69,
- 7.9
- ]
- ],
- [
- [
- 53.026,
- 6.982
- ],
- [
- 53.115,
- 7.498
- ]
- ]
- ]
- },
- {
- "name": "wilhelmshaven",
- "bssid": "02:00:0A:12:E8:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "whv01.sn.ffnw.de",
- "port": "10004",
- "publickey": "2f2c43e8f84ae7a5aa854ab7ef1eb448ea42147498dbe543e264737961bf5806"
- },
- {
- "type": "fastd",
- "host": "whv01.sn.ffnw.de",
- "port": "10005",
- "publickey": "4d828afb1ce3752c754f47236dbf7a6d73bc9f1cdbf4848d5ab4e78738c3bd5f"
- },
- {
- "type": "l2tp",
- "host": "whv01.sn.ffnw.de",
- "port": "9001"
- }
- ],
- "boxes": [
- [
- [
- 53.5,
- 8.03
- ],
- [
- 53.62,
- 8.18
- ]
- ]
- ]
- },
- {
- "name": "lohne",
- "bssid": "02:00:0A:12:20:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "vec01.sn.ffnw.de",
- "port": "10004",
- "publickey": "6051e5fd6848819f636030fcddf6e64bf2375bad06c82b95c719ab45a4c96116"
- },
- {
- "type": "fastd",
- "host": "vec01.sn.ffnw.de",
- "port": "10005",
- "publickey": "a4ce41a63f5baf4c0ba95cff3bd1a666ddcd78fb58d11564f6d35581d4b3fb23"
- },
- {
- "type": "l2tp",
- "host": "vec01.sn.ffnw.de",
- "port": "9002"
- }
- ],
- "boxes": [
- [
- [
- 52.625,
- 8.16
- ],
- [
- 52.69,
- 8.32
- ]
- ]
- ]
- },
- {
- "name": "landkreis-wesermarsch",
- "bssid": "02:00:0A:12:38:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "bra01.sn.ffnw.de",
- "port": "10002",
- "publickey": "2416b256c7b980832f741a8ab4617a501fd1b590e52405d9556565c0fe0006a7"
- },
- {
- "type": "fastd",
- "host": "bra01.sn.ffnw.de",
- "port": "10003",
- "publickey": "cee553559bee169806a1b33649367377edff5f74e0323dc8206ecf0171c48ede"
- },
- {
- "type": "l2tp",
- "host": "bra01.sn.ffnw.de",
- "port": "9001"
- }
- ],
- "boxes": [
- [
- [
- 53.372,
- 8.18
- ],
- [
- 53.5,
- 8.57
- ]
- ],
- [
- [
- 53.22,
- 8.3
- ],
- [
- 53.372,
- 8.57
- ]
- ],
- [
- [
- 53.28,
- 8.13
- ],
- [
- 53.372,
- 8.3
- ]
- ],
- [
- [
- 53.501,
- 8.403
- ],
- [
- 53.63,
- 8.57
- ]
- ]
- ]
- },
- {
- "name": "suedost",
- "bssid": "02:00:0A:12:30:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "suedost01.sn.ffnw.de",
- "port": "10006",
- "publickey": "2f4fdcfea81ae7122455846bc5b2ea7a0b70506afc365861931221898bcb3e05"
- },
- {
- "type": "fastd",
- "host": "suedost01.sn.ffnw.de",
- "port": "10007",
- "publickey": "353dc2fb5ef923af2512f873e208357cf2b56e922ff2520ccf56659cda5d87a2"
- },
- {
- "type": "l2tp",
- "host": "suedost01.sn.ffnw.de",
- "port": "9002"
- }
- ],
- "boxes": [
- [
- [
- 52.69,
- 8.67
- ],
- [
- 52.944,
- 9.3
- ]
- ],
- [
- [
- 52.46,
- 8.32
- ],
- [
- 52.69,
- 9.3
- ]
- ],
- [
- [
- 52.07,
- 8.42
- ],
- [
- 52.46,
- 9.3
- ]
- ],
- [
- [
- 52.69,
- 8.443
- ],
- [
- 52.76,
- 8.67
- ]
- ]
- ]
- },
- {
- "name": "ibbenbueren",
- "bssid": "02:00:0A:12:48:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "st01.sn.ffnw.de",
- "port": "10002",
- "publickey": "3e006396edd0c721991e2cc49ab0ab5323903308001e10fa400812f8670bca95"
- },
- {
- "type": "fastd",
- "host": "st01.sn.ffnw.de",
- "port": "10003",
- "publickey": "820ded034dff272975d3c2eab056a0cefd5876e67297bdc55f4663d2c88c490a"
- },
- {
- "type": "l2tp",
- "host": "lk-st01.sn.ffnw.de",
- "port": "9001"
- }
- ],
- "boxes": [
- [
- [
- 52.25,
- 7.66
- ],
- [
- 52.3,
- 7.76
- ]
- ]
- ]
- },
- {
- "name": "landkreis-cloppenburg",
- "bssid": "02:00:0A:12:40:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "clp01.sn.ffnw.de",
- "port": "10000",
- "publickey": "3b06ec0dda3fcbf5ddefb965941e6cf50e59f5c93e5526cfd44db380bd4b0118"
- },
- {
- "type": "fastd",
- "host": "clp01.sn.ffnw.de",
- "port": "10001",
- "publickey": "7a31434790579bbcb9744686ae4c447e0e55c934de0992c72681d13264845ab9"
- },
- {
- "type": "l2tp",
- "host": "clp01.sn.ffnw.de",
- "port": "9000"
- }
- ],
- "boxes": [
- [
- [
- 52.76,
- 7.699
- ],
- [
- 52.944,
- 8.21
- ]
- ],
- [
- [
- 52.944,
- 7.699
- ],
- [
- 53.08,
- 8.14
- ]
- ],
- [
- [
- 52.69,
- 7.699
- ],
- [
- 52.76,
- 8.05
- ]
- ],
- [
- [
- 53.122,
- 6.41
- ],
- [
- 53.123,
- 6.411
- ]
- ]
- ]
- },
- {
- "name": "grafschaft-bentheim",
- "bssid": "02:00:0A:12:50:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "clp01.sn.ffnw.de",
- "port": "10002",
- "publickey": "dcf496d15011e9f5fab63505c5e3b2eabab03d03b8f2319341ec53e31c6718c5"
- },
- {
- "type": "fastd",
- "host": "clp01.sn.ffnw.de",
- "port": "10003",
- "publickey": "0bc26b5fc747492d265aae55314da3439619a7c41013e0dbbc44de8644195313"
- },
- {
- "type": "l2tp",
- "host": "clp01.sn.ffnw.de",
- "port": "9001"
- }
- ],
- "boxes": [
- [
- [
- 52.178,
- 6.652
- ],
- [
- 52.69,
- 7.244
- ]
- ],
- [
- [
- 52.178,
- 7.244
- ],
- [
- 52.35,
- 7.41
- ]
- ]
- ]
- },
- {
- "name": "bad-iburg",
- "bssid": "02:00:0A:12:58:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "os02.sn.ffnw.de",
- "port": "10002",
- "publickey": "fef1a503efa6e25b5177af6dd6347f0b1a8ae3393c15752a6beefe8da06d0683"
- },
- {
- "type": "fastd",
- "host": "os02.sn.ffnw.de",
- "port": "10003",
- "publickey": "b3c46fb7089261901d2e8dd531abe63e67856700f5eeec9191d5342ada6c73b1"
- },
- {
- "type": "l2tp",
- "host": "os02.sn.ffnw.de",
- "port": "9001"
- }
- ],
- "boxes": [
- [
- [
- 52.07,
- 7.99
- ],
- [
- 52.182,
- 8.15
- ]
- ]
- ]
- },
- {
- "name": "osnabrueck2",
- "bssid": "02:00:0A:12:60:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "os01.sn.ffnw.de",
- "port": "10002",
- "publickey": "e00d26eee0a91d7a9d38da736b051cbe1fef4166cb15ab41c4d1ada95e857c43"
- },
- {
- "type": "fastd",
- "host": "os01.sn.ffnw.de",
- "port": "10003",
- "publickey": "30e2b86d25c9270ce084393de456a15e5326093998002b668c1bd9bc79b96c79"
- },
- {
- "type": "l2tp",
- "host": "lk-os01.sn.ffnw.de",
- "port": "9001"
- }
- ],
- "boxes": [
- [
- [
- 52.268,
- 8.036
- ],
- [
- 52.282,
- 8.06
- ]
- ]
- ]
- },
- {
- "name": "aurich",
- "bssid": "02:00:0A:12:18:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "leer01.sn.ffnw.de",
- "port": "10002",
- "publickey": "98ea2bdc5307f96d4c71461b07ff7011d941ff75f7c32310e1880a5be2e95c7b"
- },
- {
- "type": "fastd",
- "host": "leer01.sn.ffnw.de",
- "port": "10003",
- "publickey": "e52904c61760b1d05cd309cbbf1fdaa0de00377de6f62be5458eb4bb389de8fa"
- },
- {
- "type": "l2tp",
- "host": "leer01.sn.ffnw.de",
- "port": "9001"
- }
- ],
- "boxes": [
- [
- [
- 53.372,
- 6.98
- ],
- [
- 53.436,
- 7.825
- ]
- ],
- [
- [
- 53.32,
- 6.98
- ],
- [
- 53.372,
- 7.322
- ]
- ],
- [
- [
- 53.436,
- 6.624
- ],
- [
- 53.807,
- 7.648
- ]
- ]
- ]
- },
- {
- "name": "oldenburg2",
- "bssid": "02:00:0A:12:68:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "ol01.sn.ffnw.de",
- "port": "10002",
- "publickey": "2bfd94d23a0a37e5438a2ea3363a38e6ffe9a0bedc31034e45d7f62a4783de71"
- },
- {
- "type": "fastd",
- "host": "ol01.sn.ffnw.de",
- "port": "10003",
- "publickey": "cefa3ae11e91bb09180f394257da2c8e5492fdb493091a65c79ec332ba7763e6"
- },
- {
- "type": "l2tp",
- "host": "ol01.sn.ffnw.de",
- "port": "9001"
- }
- ],
- "boxes": [
- [
- [
- 53.08,
- 8.14
- ],
- [
- 53.21,
- 8.187
- ]
- ],
- [
- [
- 53.163,
- 8.187
- ],
- [
- 53.2,
- 8.3
- ]
- ],
- [
- [
- 53.2,
- 8.187
- ],
- [
- 53.21,
- 8.22
- ]
- ],
- [
- [
- 53.08,
- 8.216
- ],
- [
- 53.124,
- 8.3
- ]
- ],
- [
- [
- 53.08,
- 8.187
- ],
- [
- 53.128,
- 8.216
- ]
- ]
- ]
- },
- {
- "name": "tossens",
- "bssid": "02:00:0A:12:D8:00",
- "defaulthood": false,
- "servers": [
- {
- "type": "fastd",
- "host": "tossens01.sn.ffnw.de",
- "port": "10000",
- "publickey": "8d8e6230e122d020942bc0d60d26d55996d97e918892b2f870ba1e0bbea8a9c8"
- },
- {
- "type": "fastd",
- "host": "tossens01.sn.ffnw.de",
- "port": "10001",
- "publickey": "6b5518082bfd1f110a34830412848759e8caf3b264349f018ef46d4a33734a05"
- },
- {
- "type": "l2tp",
- "host": "tossens01.sn.ffnw.de",
- "port": "9000"
- }
- ],
- "boxes": [
- [
- [
- 53.5,
- 8.18
- ],
- [
- 53.63,
- 8.315
- ]
- ]
- ]
- }
-]
diff --git a/hoods/luasrc/lib/gluon/upgrade/500-set-hoodfile-path b/hoods/luasrc/lib/gluon/upgrade/500-set-hoodfile-path
deleted file mode 100755
index 866b3a6..0000000
--- a/hoods/luasrc/lib/gluon/upgrade/500-set-hoodfile-path
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/lua
-
-local uci = require('simple-uci').cursor()
-
-local hoodfile = uci:get('hoodselector', 'hoodselector', 'hoodfile')
-
-if not hoodfile:match("/lib/ffnw/hoods/hoods.json") then
- uci:set('hoodselector', 'hoodselector', 'hoodfile', '/lib/ffnw/hoods/hoods.json')
- uci:save('hoodselector')
-end
diff --git a/multiple-v6-watchdoog/Makefile b/multiple-v6-watchdoog/Makefile
deleted file mode 100644
index 276a089..0000000
--- a/multiple-v6-watchdoog/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ffnw-multiple-v6-watchdoog
-PKG_VERSION:=1
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-include $(TOPDIR)/../package/gluon.mk
-
-define Package/ffnw-multiple-v6-watchdoog
- SECTION:=network
- CATEGORY:=Freifunk Nordwest
- TITLE:=Restart br-client if multiple v6 adresses exsist
-endef
-
-define Package/ffnw-multiple-v6-watchdoog/description
- Restart br-client if multiple v6 adresses exsist
-endef
-
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
- $(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/ffnw-multiple-v6-watchdoog/install
- $(CP) ./files/* $(1)/
- $(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-endef
-
-$(eval $(call BuildPackage,ffnw-multiple-v6-watchdoog))
diff --git a/multiple-v6-watchdoog/files/usr/lib/micron.d/multiple-v6-watchdoog b/multiple-v6-watchdoog/files/usr/lib/micron.d/multiple-v6-watchdoog
deleted file mode 100644
index d77e483..0000000
--- a/multiple-v6-watchdoog/files/usr/lib/micron.d/multiple-v6-watchdoog
+++ /dev/null
@@ -1 +0,0 @@
-*/2 * * * * /usr/sbin/multiple-v6-watchdoog
diff --git a/multiple-v6-watchdoog/luasrc/usr/sbin/multiple-v6-watchdoog b/multiple-v6-watchdoog/luasrc/usr/sbin/multiple-v6-watchdoog
deleted file mode 100755
index 7c05ef3..0000000
--- a/multiple-v6-watchdoog/luasrc/usr/sbin/multiple-v6-watchdoog
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/lua
-local pidPath="/var/run/multiple-v6-watchdoog.pid"
-
-if io.open(pidPath, "r") ~=nil then
- io.stderr:write("The multiple-v6-watchdoog is still running.\n")
- os.exit(1)
-else
- io.close(io.open(pidPath, "w"))
-end
--- initialization done
-
--- Program terminating function including removing of PID file
-local function exit()
- if io.open(pidPath, "r") ~=nil then
- os.remove(pidPath)
- end
- os.exit(0)
-end
-
-local function brclient_restart()
- os.execute('ifconfig br-client down')
- os.execute('ifconfig br-client up')
- io.stderr:write('Interface br-client restarted.\n')
-end
-
-local puplicv6found = 0
-for ifout in io.popen(string.format("ifconfig br-client 2> /dev/null"),'r'):lines() do
- if string.find(ifout,"inet6 addr") then
- local group1 = string.match(ifout,"([a-f0-9]+):[:a-f0-9]+")
- if (group1 ~= "fe80" and group1 ~= "fd74") then
- if puplicv6found == 1 then
- brclient_restart()
- exit()
- end
- puplicv6found = 1
- end
- end
-end
-
-io.stderr:write('Only one Puplic v6 address.\n')
-exit()
--
GitLab