From cca165ee37258724eb16343585164f9d66152876 Mon Sep 17 00:00:00 2001
From: Flip <philippe@pilarkto.net>
Date: Fri, 20 Oct 2017 10:11:12 +0200
Subject: [PATCH] update to 2017.1.x remove ibss mesh
---
site.conf | 155 +++++++++++++++++++++++++-----------------------------
site.mk | 10 ++--
2 files changed, 78 insertions(+), 87 deletions(-)
diff --git a/site.conf b/site.conf
index 51aee9c..59de91b 100644
--- a/site.conf
+++ b/site.conf
@@ -2,19 +2,19 @@
hostname_prefix = 'ffs-',
site_name = 'Freifunk Stuttgart',
site_code = 'ffs',
-
+
prefix4 = '172.21.0.0/18',
prefix6 = 'fd21:711::/64',
-
+
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-
+
ntp_servers = {
'fd21:b4dc:4b00::a38:1', -- gw01
'fd21:b4dc:4b00::123:1',
'fd21:b4dc:4b00::123:2',
'fd21:b4dc:4b00::123:3',
},
-
+
regdom = 'DE',
wifi24 = {
@@ -29,11 +29,6 @@
id = 'ffsmesh_batman',
mcast_rate = 12000,
},
- ibss = {
- ssid = '02:04:08:16:32:64',
- bssid = '02:04:08:16:32:64',
- mcast_rate = 12000,
- },
},
wifi5 = {
@@ -45,11 +40,6 @@
id = 'ffsmesh_batman',
mcast_rate = 12000,
},
- ibss = {
- ssid = '02:04:08:16:32:64',
- bssid = '02:04:08:16:32:64',
- mcast_rate = 12000,
- },
},
@@ -59,85 +49,86 @@
mac = '02:00:0a:25:00:01',
},
- fastd_mesh_vpn = {
- methods = {'salsa2012+umac'},
+ mesh_vpn = {
mtu = 1340,
- enabled = true,
- groups = {
- backbone = {
- limit = 1,
- peers = {
- gw01 = {
- key = 'd7b89d42b629bd5d419139b4c395e7b47ed7417112d3fcd232ba38137daa58e6',
- remotes = {
- '"gw01.gw.freifunk-stuttgart.de" port 10299'
+ fastd = {
+ configurable = true,
+ methods = {'salsa2012+umac'},
+ groups = {
+ backbone = {
+ limit = 1,
+ peers = {
+ gw01 = {
+ key = 'd7b89d42b629bd5d419139b4c395e7b47ed7417112d3fcd232ba38137daa58e6',
+ remotes = {
+ '"gw01.gw.freifunk-stuttgart.de" port 10299'
+ },
},
- },
- gw02 = {
- key = '31eaff2ce1c19d0c9af693c4500defc4e1b4979ad75133d779532f0572955875',
- remotes = {
- '"gw02.gw.freifunk-stuttgart.de" port 10299'
+ gw02 = {
+ key = '31eaff2ce1c19d0c9af693c4500defc4e1b4979ad75133d779532f0572955875',
+ remotes = {
+ '"gw02.gw.freifunk-stuttgart.de" port 10299'
+ },
},
- },
- gw03 = {
- key = '1e944f5f2dca02e1c1d2e006186417e76759c26f75da5e7850f6c1e5cddcb1c2',
- remotes = {
- '"gw03.gw.freifunk-stuttgart.de" port 10299'
- },
- },
- gw04 = {
- key = '5689b2fd14bd313de1e95406c17e783b78b9d6f8aa86f896df4f2d843ab642bf',
- remotes = {
- '"gw04.gw.freifunk-stuttgart.de" port 10299'
+ gw03 = {
+ key = '1e944f5f2dca02e1c1d2e006186417e76759c26f75da5e7850f6c1e5cddcb1c2',
+ remotes = {
+ '"gw03.gw.freifunk-stuttgart.de" port 10299'
+ },
},
- },
- gw05 = {
- key = '26cd067057e4fcf58fb68da66c75a360de56aa4c36094f1846f706824682a789',
- remotes = {
- '"gw05.gw.freifunk-stuttgart.de" port 10299'
+ gw04 = {
+ key = '5689b2fd14bd313de1e95406c17e783b78b9d6f8aa86f896df4f2d843ab642bf',
+ remotes = {
+ '"gw04.gw.freifunk-stuttgart.de" port 10299'
+ },
},
- },
- gw06 = {
- key = 'fdc1737906d7431763962f4daf6eb4d973c845aca7a96e40643d08a82159dff2',
- remotes = {
- '"gw06.gw.freifunk-stuttgart.de" port 10299'
+ gw05 = {
+ key = '26cd067057e4fcf58fb68da66c75a360de56aa4c36094f1846f706824682a789',
+ remotes = {
+ '"gw05.gw.freifunk-stuttgart.de" port 10299'
+ },
},
- },
- gw07 = {
- key = '23f6d70be861effe9b1a7bc812fd8c9e2e575bf0ea63ca4ffdc0a3998afb59a1',
- remotes = {
- '"gw07.gw.freifunk-stuttgart.de" port 10299'
+ gw06 = {
+ key = 'fdc1737906d7431763962f4daf6eb4d973c845aca7a96e40643d08a82159dff2',
+ remotes = {
+ '"gw06.gw.freifunk-stuttgart.de" port 10299'
+ },
},
- },
- gw08 = {
- key = '1af6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3',
- remotes = {
- '"gw08.gw.freifunk-stuttgart.de" port 10299'
+ gw07 = {
+ key = '23f6d70be861effe9b1a7bc812fd8c9e2e575bf0ea63ca4ffdc0a3998afb59a1',
+ remotes = {
+ '"gw07.gw.freifunk-stuttgart.de" port 10299'
+ },
},
- },
- gw09 = {
- key = 'bf7c1a62dbf61b8fda25be7e5e600c0ae745e6b6e90a419aeafaf85b6497e8f2',
- remotes = {
- '"gw09.gw.freifunk-stuttgart.de" port 10299'
+ gw08 = {
+ key = '1af6a5d41d866823e5712e8d9af42080397ad52bdd8664a11ca94225629398a3',
+ remotes = {
+ '"gw08.gw.freifunk-stuttgart.de" port 10299'
+ },
},
- },
- gw10 = {
- key = '4b89e1a8882b4d7cf50eabc0360ff28138d78ca0b63fd63ec9e4c8260121da00',
- remotes = {
- '"gw10.gw.freifunk-stuttgart.de" port 10299'
+ gw09 = {
+ key = 'bf7c1a62dbf61b8fda25be7e5e600c0ae745e6b6e90a419aeafaf85b6497e8f2',
+ remotes = {
+ '"gw09.gw.freifunk-stuttgart.de" port 10299'
+ },
+ },
+ gw10 = {
+ key = '4b89e1a8882b4d7cf50eabc0360ff28138d78ca0b63fd63ec9e4c8260121da00',
+ remotes = {
+ '"gw10.gw.freifunk-stuttgart.de" port 10299'
+ },
},
},
},
},
},
- },
-
- bandwidth_limit = {
- -- Default upload limit (kbit/s).
- egress = 500,
- -- Default download limit (kbit/s).
- ingress = 15000,
- },
+ bandwidth_limit = {
+ -- Default upload limit (kbit/s).
+ egress = 500,
+ -- Default download limit (kbit/s).
+ ingress = 15000,
+ },
+ }
autoupdater = {
enabled = 1,
@@ -151,7 +142,7 @@
good_signatures = 2,
pubkeys = {
'4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
- '0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
+ '0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
},
},
@@ -163,7 +154,7 @@
good_signatures = 1,
pubkeys = {
'4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
- '0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
+ '0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
},
},
@@ -175,7 +166,7 @@
good_signatures = 1,
pubkeys = {
'4418436fe872b5746a6c86293afca7c6c9edba03eca3cac80fdfd82106092d7a', -- leonard
- '0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
+ '0b43680e4c389a55a02663a740be234defe017c1e05ba49de87baaa1f88c66c1', -- are
'b7077095e9d3fc892db1c280b78b65d737700c9aea70a6998d6aad8b3146aaed', -- flip
},
},
diff --git a/site.mk b/site.mk
index 9ca97be..e17e77a 100644
--- a/site.mk
+++ b/site.mk
@@ -12,11 +12,11 @@ GLUON_SITE_PACKAGES := \
gluon-config-mode-zip \
gluon-ebtables-filter-multicast \
gluon-ebtables-filter-ra-dhcp \
- gluon-luci-admin \
- gluon-luci-autoupdater \
- gluon-luci-portconfig \
- gluon-luci-private-wifi \
- gluon-luci-wifi-config \
+ gluon-web-admin \
+ gluon-web-autoupdater \
+ gluon-web-network \
+ gluon-web-private-wifi \
+ gluon-web-wifi-config \
gluon-neighbour-info \
gluon-mesh-vpn-fastd \
gluon-radvd \
--
GitLab