From 2b335d295c9a515cc8962a84b9c86161e75b6c43 Mon Sep 17 00:00:00 2001
From: "Service .14" <nordheide.freifunk.net>
Date: Sun, 2 Sep 2018 09:17:27 +0200
Subject: [PATCH] Hypergw1 Vorbereitungen
---
site.conf | 98 ++++++++-----------------------------------------------
site.mk | 5 ++-
2 files changed, 15 insertions(+), 88 deletions(-)
diff --git a/site.conf b/site.conf
index f280086..8cca371 100644
--- a/site.conf
+++ b/site.conf
@@ -1,4 +1,4 @@
-{
+#{
hostname_prefix = 'Bitte ändere mich! ',
site_name = 'Freifunk Nord',
site_code = 'ffnord',
@@ -7,9 +7,9 @@
domain_seed = '718966471108bd550c01001f8a6f609c34507b6b8bcd5672232f5d9acddae8b4',
opkg = {
- lede = 'http://[fd42:eb49:c0b5:4242::fd00]/lede/snapshots/packages/%A',
+ lede = 'http://[fd42:eb49:c0b5:4242::fd30]/lede/snapshots/packages/%A',
extra = {
- gluon = 'http://[fd42:eb49:c0b5:4242::fd00]/packages/gluon-%GS-%GR/%S',
+ gluon = 'http://[fd42:eb49:c0b5:4242::fd30]/packages/gluon-%GS-%GR/%S',
},
},
@@ -29,20 +29,8 @@
'fd42:eb49:c0b5:4242::fd04',
'fd42:eb49:c0b5:4242::fd05',
'fd42:eb49:c0b5:4242::fd06',
- 'fd42:eb49:c0b5:4242::fd07',
- 'fd42:eb49:c0b5:4242::fd08',
- 'fd42:eb49:c0b5:4242::fd09',
- 'fd42:eb49:c0b5:4242::fd10',
- 'fd42:eb49:c0b5:4242::fd11',
- 'fd42:eb49:c0b5:4242::fd12',
- 'fd42:eb49:c0b5:4242::fd13',
- 'fd42:eb49:c0b5:4242::fd14',
- 'fd42:eb49:c0b5:4242::fd15',
- 'fd42:eb49:c0b5:4242::fd16',
- 'fd42:eb49:c0b5:4242::fd17',
- 'fd42:eb49:c0b5:4242::fd18',
- 'fd42:eb49:c0b5:4242::fd19',
'fd42:eb49:c0b5:4242::fd20',
+ 'fd42:eb49:c0b5:4242::fd30',
},
-- Wireless regulatory domain of your community.
@@ -68,8 +56,8 @@
},
-- ddhcpd = {
- -- range = "10.116.220.0/22",
- -- broadcast = "10.116.255.255"
+ -- range = "10.187.220.0/22",
+ -- broadcast = "10.187.255.255"
-- },
-- Wireless configuration for 2.4 GHz interfaces.
@@ -119,19 +107,6 @@
'fd42:eb49:c0b5:4242::fd04',
'fd42:eb49:c0b5:4242::fd05',
'fd42:eb49:c0b5:4242::fd06',
- 'fd42:eb49:c0b5:4242::fd07',
- 'fd42:eb49:c0b5:4242::fd08',
- 'fd42:eb49:c0b5:4242::fd09',
- 'fd42:eb49:c0b5:4242::fd10',
- 'fd42:eb49:c0b5:4242::fd11',
- 'fd42:eb49:c0b5:4242::fd12',
- 'fd42:eb49:c0b5:4242::fd13',
- 'fd42:eb49:c0b5:4242::fd14',
- 'fd42:eb49:c0b5:4242::fd15',
- 'fd42:eb49:c0b5:4242::fd16',
- 'fd42:eb49:c0b5:4242::fd17',
- 'fd42:eb49:c0b5:4242::fd18',
- 'fd42:eb49:c0b5:4242::fd19',
'fd42:eb49:c0b5:4242::fd20',
},
},
@@ -175,7 +150,7 @@
mesh_vpn = {
enabled = true,
- mtu = 1280,
+ mtu = 1312,
fastd = {
-- optional add ``null`` to the ``mesh_vpn.fastd.methods`` table if you want "Performance mode" as default
@@ -215,62 +190,14 @@
key = '734913882d3592603d1c704d4e4133c12606192ebd1a49429e7d980a2ca121d0',
remotes = {'ipv4 "6.gw.freifunknord.de" port 10050', 'ipv6 "6.gw.freifunknord.de" port 10050'},
},
- ffnord_vpn7 = {
- key = '6c35f366d430a6637cf5696fee2806b70ea4a3b3dfba2cb0e576b3ef4a77a7be',
- remotes = {'ipv4 "7.gw.freifunknord.de" port 10050', 'ipv6 "7.gw.freifunknord.de" port 10050'},
- },
- ffnord_vpn8 = {
- key = '9d6bf926071340171cc8a692c9a858e482a4368856dcb63e095e393049b8d6fd',
- remotes = {'ipv4 "8.gw.freifunknord.de" port 10050', 'ipv6 "8.gw.freifunknord.de" port 10050'},
- },
- ffnord_vpn9 = {
- key = '3b09482cee91e08839c1bfcca5a1135583c03817b1e8ff52019902faef7e2f28',
- remotes = {'ipv4 "9.gw.freifunknord.de" port 10050', 'ipv6 "9.gw.freifunknord.de" port 10050'},
- },
- ffnord_vpn10 = {
- key = 'a326197364109a3a7bfc9344e19da9277734989bc06d930617e00206feb6a065',
- remotes = {'ipv4 "10.gw.freifunknord.de" port 10050', 'ipv6 "10.gw.freifunknord.de" port 10050'},
- },
- ffnord_vpn11 = {
- key = '9ab17517450a52d1eac521a6ae4e696cf7861c3e55cd63acf0a94e85cb3e5172',
- remotes = {'ipv4 "11.gw.freifunknord.de" port 10050', 'ipv6 "11.gw.freifunknord.de" port 10050'},
- },
- ffnord_vpn12 = {
- key = 'bec4e95be17044ead0e1926b58cafc0d2cca9df3eb7a836234e886f3b51679f9',
- remotes = {'ipv4 "12.gw.freifunknord.de" port 10050', 'ipv6 "12.gw.freifunknord.de" port 10050'},
- },
- ffnord_vpn13 = {
- key = '1eeabc7534bed144c30b6d62f9cefd2e0b54607ac4c2ac1343c5153bceb01ab1',
- remotes = {'ipv4 "13.gw.freifunknord.de" port 10050', 'ipv6 "13.gw.freifunknord.de" port 10050'},
- },
- ffnord_vpn14 = {
- key = '5c7930f1fc37ceca6c921c13bed8010e4bada7e422aa69ad195c24f92c12f679',
- remotes = {'ipv4 "14.gw.freifunknord.de" port 10050', 'ipv6 "14.gw.freifunknord.de" port 10050'},
- },
- ffnord_vpn15 = {
- key = 'ae5bfc856ffc779bd766619aa24242890539495bdac03bf28405e41ba087b9a8',
- remotes = {'ipv4 "15.gw.freifunknord.de" port 10050', 'ipv6 "15.gw.freifunknord.de" port 10050'},
- },
- ffnord_vpn16 = {
- key = 'edaf40898203e24ce9af0e8180ec14d73bf69b13545f8b8b8deca79206cedbc0',
- remotes = {'ipv4 "16.gw.freifunknord.de" port 10050', 'ipv6 "16.gw.freifunknord.de" port 10050'},
- },
- ffnord_vpn17 = {
- key = '9b676bf167957780dbb8d810634f62ef6ce2ebc9e4a0283664883ff5fdbf86cc',
- remotes = {'ipv4 "17.gw.freifunknord.de" port 10050', 'ipv6 "17.gw.freifunknord.de" port 10050'},
- },
- ffnord_vpn18 = {
- key = '032b8c38201b07c8545e3679247ccbb581578b4dce8b7b57fde0285e34970ddf',
- remotes = {'ipv4 "18.gw.freifunknord.de" port 10050', 'ipv6 "18.gw.freifunknord.de" port 10050'},
- },
- ffnord_vpn19 = {
- key = '1e712fed9f190808c94298b20b1266536937c6b1d38bf229bf9f86a46cb41094',
- remotes = {'ipv4 "19.gw.freifunknord.de" port 10050', 'ipv6 "19.gw.freifunknord.de" port 10050'},
- },
ffnord_vpn20 = {
key = 'e12ab3ae5955e1380cd18908edd18e006ba11fa471335ed7b2d2776401da58b0',
remotes = {'ipv4 "20.gw.freifunknord.de" port 10050', 'ipv6 "20.gw.freifunknord.de" port 10050'},
},
+ ffnord_vpn30 = {
+ key = 'eb4c8a1608608a28633833ce89e2e2b432ef08b538336486a0b6a4985f7cff6',
+ remotes = {'ipv4 "1.hypergw.freifunknord.de" port 10050', 'ipv6 "1.hypergw.freifunknord.de" port 10050'},
+ },
},
},
},
@@ -292,18 +219,19 @@
name = 'stable',
mirrors = {
-- List of mirrors to fetch images from. IPv6 required!
+ 'http://[fd42:eb49:c0b5:4242::fd30]/firmware/stable/sysupgrade/',
'http://[fd42:eb49:c0b5:4242::fd00]/firmware/stable/sysupgrade/',
'http://[fd42:eb49:c0b5:4242::fd01]/firmware/stable/sysupgrade/',
'http://[fd42:eb49:c0b5:4242::fd02]/firmware/stable/sysupgrade/',
'http://0.update.ffnord/firmware/stable/sysupgrade/',
'http://1.update.ffnord/firmware/stable/sysupgrade/',
'http://2.update.ffnord/firmware/stable/sysupgrade/',
+ 'http://1hyper.update.ffnord/firmware/stable/sysupgrade/',
'http://update.freifunknord.de/firmware/stable/sysupgrade/',
},
good_signatures = 2,
pubkeys = {
'bbb814470889439c04667748c30aabf25fb800621e67544bee803fd1b342ace3', -- sargon
- '1d37eacbd70f72730b1f5aba246a6a8eab100e2d45dda0163d9ad827f70f88d4', -- gernot
'589695821488c9acd2efc26c2fdde259b25615cbfdbb6a434e95e33fa6932023', -- Tarnatos
'9885f836464abf3633f92701e4febeefec54f481d8b6cd39085e6ad24162ff82', -- rubo77
'359ec3619184f1bdfe26515cf5ba2b016ba23489db2a371cbf5c3cee9d061110', -- sven (FF-FL)
diff --git a/site.mk b/site.mk
index 9c9a872..3ea24c1 100644
--- a/site.mk
+++ b/site.mk
@@ -29,8 +29,7 @@ GLUON_SITE_PACKAGES := \
# from sargon:
GLUON_SITE_PACKAGES += \
- roamguide \
- ddhcpd
+ roamguide
# from https://github.com/Freifunk-Nord/eulenfunk-packages
GLUON_SITE_PACKAGES += \
@@ -53,7 +52,7 @@ GLUON_SITE_PACKAGES += \
# Always call `make` from the command line with the desired release version!
# otherwise this is generated:
#DEFAULT_GLUON_RELEASE := 2018.1
-DEFAULT_GLUON_RELEASE := 2018.1.0~exp$(shell date '+%y%m%d')
+DEFAULT_GLUON_RELEASE := 2018.1.1~exp$(shell date '+%y%m%d')
# Allow overriding the release number from the command line
--
GitLab