Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • ffnw-firmware/siteconf
  • pic/siteconf
  • PowerPan/siteconf
  • netmon-sc/siteconf
  • floh1111/siteconf
  • lrnzo/siteconf
  • florian.lottes/siteconf
7 results
Show changes
......@@ -2,13 +2,15 @@
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',
......@@ -16,7 +18,9 @@
},
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',
......@@ -25,27 +29,11 @@
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
}
}
}
......
From 1604ec5893cfe8ada35367fc5c8ca323b1ea10b9 Mon Sep 17 00:00:00 2001
From 28944a798cdd929f3b87f18112fcf7b3c2c4c442 Mon Sep 17 00:00:00 2001
From: runner01 <runner01@ffnw.de>
Date: Fri, 8 Feb 2019 04:43:50 +0100
Subject: [PATCH 1/2] add gluon-geolocator
Subject: [PATCH 1/4] add gluon-geolocator
---
package/gluon-geolocator/Makefile | 14 +++
package/gluon-geolocator/check_site.lua | 2 +
.../gluon-geolocator/files/etc/config/geolocator | 2 +
.../files/usr/lib/micron.d/geolocator | 1 +
.../luasrc/lib/gluon/geolocator/geolocator | 130 +++++++++++++++++++++
.../lib/gluon/upgrade/540-geolocator-settings | 26 +++++
package/gluon-geolocator/Makefile | 14 ++
package/gluon-geolocator/check_site.lua | 2 +
.../files/etc/config/geolocator | 2 +
.../files/usr/lib/micron.d/geolocator | 1 +
.../luasrc/lib/gluon/geolocator/geolocator | 130 ++++++++++++++++++
.../lib/gluon/upgrade/540-geolocator-settings | 26 ++++
6 files changed, 175 insertions(+)
create mode 100644 package/gluon-geolocator/Makefile
create mode 100644 package/gluon-geolocator/check_site.lua
......@@ -34,7 +34,7 @@ index 00000000..54dd3002
+
+define Package/gluon-geolocator
+ TITLE:=Provide the geolocator to receive positions over wifi
+ DEPENDS:=+gluon-node-info +micrond
+ DEPENDS:=+gluon-node-info +micrond +lua-bit32
+endef
+
+$(eval $(call BuildPackageGluon,gluon-geolocator))
......@@ -69,7 +69,7 @@ index 00000000..3ec5771c
@@ -0,0 +1,130 @@
+#!/usr/bin/lua
+
+local bit = require('bit')
+local bit = require('bit32')
+local unistd = require('posix.unistd')
+local fcntl = require('posix.fcntl')
+local uci = require('simple-uci').cursor()
......@@ -230,5 +230,5 @@ index 00000000..84c9f99c
+})
+uci:save(config)
--
2.11.0
2.20.1
From f8b094deea34370f92add200896ee06a65846496 Mon Sep 17 00:00:00 2001
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/3] ffnw config migration from gluon-node-info to geolocator
Subject: [PATCH 2/4] ffnw config migration from gluon-node-info to geolocator
Signed-off-by: Jan-Tarek Butt <tarek@ring0.de>
---
.../luasrc/lib/gluon/upgrade/900-geloc-conf-migration | 17 +++++++++++++++++
.../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
......@@ -33,5 +33,5 @@ index 00000000..6bfb1059
+ uci:save('geolocator')
+end
--
2.11.0
2.20.1
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
features({
'autoupdater',
'ebtables-filter-multicast',
'ebtables-filter-ra-dhcp',
'mesh-batman-adv-15',
%A
'respondd',
'status-page',
'web-advanced',
'web-wizard',
'ebtables-source-filter',
'radv-filterd',
'lock-password',
'web-private-wifi',
'web-logging',
'geolocator',
'config-mode-geo-location-osm',
'hoodselector'
})
packages({
'ffnw-banner',
'respondd-module-airtime',
'iwinfo',
'wget-ssl',
'ca-bundle',
'ca-certificates'
})
if not device_class('tiny') then
features({
'wireless-encryption-wpa3',
'web-cellular'
})
end
-- Custom package lists
local pkgs_usb_hid = {
'kmod-usb-hid',
'kmod-hid-generic'
}
local pkgs_usb_serial = {
'kmod-usb-serial',
'kmod-usb-serial-ch341',
'kmod-usb-serial-cp210x',
'kmod-usb-serial-ftdi',
'kmod-usb-serial-pl2303'
}
local pkgs_usb_storage = {
'block-mount',
'blkid',
'kmod-fs-ext4',
'kmod-fs-ntfs',
'kmod-fs-vfat',
'kmod-usb-storage',
'kmod-usb-storage-extras', -- Card Readers
'kmod-usb-storage-uas', -- USB Attached SCSI (UAS/UASP)
'kmod-nls-base',
'kmod-nls-cp1250', -- NLS Codepage 1250 (Eastern Europe)
'kmod-nls-cp437', -- NLS Codepage 437 (United States, Canada)
'kmod-nls-cp850', -- NLS Codepage 850 (Europe)
'kmod-nls-cp852', -- NLS Codepage 852 (Europe)
'kmod-nls-iso8859-1', -- NLS ISO 8859-1 (Latin 1)
'kmod-nls-iso8859-13', -- NLS ISO 8859-13 (Latin 7; Baltic)
'kmod-nls-iso8859-15', -- NLS ISO 8859-15 (Latin 9)
'kmod-nls-iso8859-2', -- NLS ISO 8859-2 (Latin 2)
'kmod-nls-utf8' -- NLS UTF-8
}
local pkgs_usb_net = {
'kmod-mii',
'kmod-usb-net',
'kmod-usb-net-asix',
'kmod-usb-net-asix-ax88179',
'kmod-usb-net-cdc-eem',
'kmod-usb-net-cdc-ether',
'kmod-usb-net-cdc-subset',
'kmod-usb-net-dm9601-ether',
'kmod-usb-net-hso',
'kmod-usb-net-ipheth',
'kmod-usb-net-mcs7830',
'kmod-usb-net-pegasus',
'kmod-usb-net-rndis',
'kmod-usb-net-rtl8152',
'kmod-usb-net-smsc95xx',
}
local pkgs_pci = {
'pciutils'
}
local pkgs_pci_net = {
'kmod-bnx2'
}
if target('ath79') then
if device({
'buffalo-wzr-hp-ag300h',
'devolo-wifi-pro-1750e',
'buffalo-wzr-600dhp',
'buffalo-wzr-hp-g300nh-rtl8366s',
'd-link-dir825b1',
'gl.inet-gl-ar150',
'gl.inet-6416',
'gl.inet-gl-ar150',
'gl.inet-gl-ar300m-nor',
'gl.inet-gl-ar300m-lite',
'gl.inet-gl-ar750',
'gl.inet-gl-ar750s-nor',
'gl.inet-gl-xe300',
'librerouter-v1',
'netgear-wndr3700',
'netgear-wndr3700-v2',
'netgear-wndr3700-v4',
'netgear-wndr3800',
'netgear-wndr3800ch',
'netgear-wndr4300',
'tp-link-archer-a7-v5',
'tp-link-archer-c5-v1',
'tp-link-archer-c7-v2',
'tp-link-archer-c7-v4',
'tp-link-archer-c7-v5',
'tp-link-archer-c59-v1',
'tp-link-tl-wdr3500-v1',
'tp-link-tl-wdr3600-v1',
'tp-link-tl-wdr4300-v1',
'tp-link-tl-wr842n-v3',
'tp-link-tl-wr902ac-v1',
'tp-link-tl-wr1043nd-v2',
'tp-link-tl-wr1043nd-v3',
'tp-link-tl-wr1043nd-v4',
}) then
packages(pkgs_usb_serial)
end
end
if target('ipq40xx') then
packages(pkgs_usb_serial)
packages(pkgs_usb_storage)
end
if target('ipq806x') then
packages(pkgs_usb_serial)
packages(pkgs_usb_storage)
end
if target('mediatek') then
packages(pkgs_usb_serial)
packages(pkgs_usb_storage)
end
if target('mpc85xx') then
packages(pkgs_usb_serial)
packages(pkgs_usb_storage)
end
if target('ramips', 'mt7621') then
packages(pkgs_usb_serial)
end
if target('rockchip') then
-- No PCI / video
packages(pkgs_usb_net)
packages(pkgs_usb_serial)
packages(pkgs_usb_storage)
end
if target('sunxi') then
-- No PCI / video
packages(pkgs_usb_serial)
packages(pkgs_usb_storage)
end
-- Include all custom packages for RaspberryPi
if target('bcm27xx') then
packages(pkgs_usb_hid)
packages(pkgs_usb_net)
packages(pkgs_usb_serial)
packages(pkgs_usb_storage)
end
-- Include all custom packages for x86
if target('x86') then
packages(pkgs_pci)
packages(pkgs_pci_net)
packages(pkgs_usb_hid)
packages(pkgs_usb_net)
packages(pkgs_usb_serial)
packages(pkgs_usb_storage)
end
-- the Network-activated setup-mode allows us to unbreak the device
if device({'zyxel-nwa55axe'}) then
broken(false)
packages({'ffda-network-setup-mode'})
end
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
......@@ -16,50 +16,63 @@
regdom = 'DE',
radv_filterd = {
threshold = 20,
},
wifi24 = {
channel = 6,
supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
basic_rate = {6000, 9000, 18000, 36000, 54000},
mesh = {
mcast_rate = 12000,
},
},
wifi5 = {
channel = 44,
outdoor_chanlist = '100-140',
mesh = {
mcast_rate = 12000,
},
},
dns = {
servers = {'2001:1b60:3:34:7711:1:0:1','2001:67c:1400:2250::1'},
cacheentries = 5000,
servers = {'2a06:e881:2000:8::1','2a06:e881:2000:7::1'},
},
mesh = {
batman_adv = {
gw_sel_class = 1, --class 1 is calculated from both the TQ and the announced bandwidth.
routing_algo = "BATMAN_IV", -- also possible: "BATMAN_V" and "BATMAN_IV_LEGACY", but this value may not be unset
},
},
mesh_vpn = {
enabled = true,
mtu = 1312,
fastd = {
methods = { 'salsa2012+umac' },
configurable = true,
groups = {
backbone = {
limit = 1,
},
},
tunneldigger = {
mtu = 1312,
},
-- The bandwidth limit can be enabled by default here.
bandwidth_limit = {
enabled = false,
-- Default upload limit (kbit/s).
egress = 1800,
-- Default download limit (kbit/s).
ingress = 14400,
},
},
interfaces = {
lan = {
default_roles = { 'client' },
},
wan = {
default_roles = { 'uplink' },
},
single = {
default_roles = { 'uplink' },
},
},
autoupdater = {
branch = 'stable',
branches = {
......@@ -68,39 +81,50 @@
mirrors = {
%B
},
good_signatures = 4,
good_signatures = 3,
pubkeys = {
'99c420e95dd0923ee6277af5c306f9ae6b97f8793b08edd41448925df5fe35b9', --floh1111
'5d95cc2ef3ad17fe3716469e1effde4a49a25d4de9befa4a6eb260e4cda79ab0', --tata
'0e6704ba26c150185514a391658455a612839c35bd83e0faffa81e0be48356e2', --sk
'785004680028afc482a5c92b392d6d7ebdfa26a48e678cb447e78d9b2eb84556', --f700w
'd3a4cbc90a2d4dbfc5386dd035016a04bfdfe1e7615fa8ea25bea5c048a7f106', --lrnzo
'e3d2e96563b9be3e95a3d748c0ff50a6f854208b68b4a1181667641d74754c76', --stefan
},
},
rc = {
name = 'stable',
mirrors = {
%C
},
good_signatures = 1,
pubkeys = {
'22c79b193a36269fd7fd51531e762b776e982926c90822df80b56f2be11648d4', --bjo
'99c420e95dd0923ee6277af5c306f9ae6b97f8793b08edd41448925df5fe35b9', --floh1111
'd2b1366a38514e0fac47b119a8a08973ea8020bf9c138908d32b56a5d99f3079', --baranator
'5d95cc2ef3ad17fe3716469e1effde4a49a25d4de9befa4a6eb260e4cda79ab0', --tata
'0e6704ba26c150185514a391658455a612839c35bd83e0faffa81e0be48356e2', --sk
'1f45d9be8a07cc2b6fcc384c71685fc0895a54be0d884aa4637c93ec4f36d970', --stefan6
'36dff98a686a15d7fb129fe98df7977c7d53919aa512b825356bd8d638fca534', --PowerPan
'785004680028afc482a5c92b392d6d7ebdfa26a48e678cb447e78d9b2eb84556', --f700w
'd3a4cbc90a2d4dbfc5386dd035016a04bfdfe1e7615fa8ea25bea5c048a7f106', --lrnzo
'e3d2e96563b9be3e95a3d748c0ff50a6f854208b68b4a1181667641d74754c76', --stefan
},
},
testing = {
name = 'testing',
mirrors = {
%C
%D
},
good_signatures = 1,
pubkeys = {
'22c79b193a36269fd7fd51531e762b776e982926c90822df80b56f2be11648d4', --bjo
'99c420e95dd0923ee6277af5c306f9ae6b97f8793b08edd41448925df5fe35b9', --floh1111
'd2b1366a38514e0fac47b119a8a08973ea8020bf9c138908d32b56a5d99f3079', --baranator
'5d95cc2ef3ad17fe3716469e1effde4a49a25d4de9befa4a6eb260e4cda79ab0', --tata
'0e6704ba26c150185514a391658455a612839c35bd83e0faffa81e0be48356e2', --sk
'1f45d9be8a07cc2b6fcc384c71685fc0895a54be0d884aa4637c93ec4f36d970', --stefan6
'36dff98a686a15d7fb129fe98df7977c7d53919aa512b825356bd8d638fca534', --PowerPan
'785004680028afc482a5c92b392d6d7ebdfa26a48e678cb447e78d9b2eb84556', --f700w
'd3a4cbc90a2d4dbfc5386dd035016a04bfdfe1e7615fa8ea25bea5c048a7f106', --lrnzo
'e3d2e96563b9be3e95a3d748c0ff50a6f854208b68b4a1181667641d74754c76', --stefan
},
},
nightly_master = {
name = 'nightly_master',
mirrors = {
%D
%E
},
good_signatures = 1,
pubkeys = {
......
GLUON_FEATURES := \
web-wizard \
autoupdater \
web-advanced \
status-page \
mesh-batman-adv-15 \
%A
ebtables-filter-multicast \
ebtables-filter-ra-dhcp \
ebtables-limit-arp \
ebtables-source-filter \
radvd \
radv-filterd \
lock-password \
web-private-wifi \
web-logging \
geolocator \
config-mode-geo-location-osm
GLUON_SITE_PACKAGES := \
respondd-module-airtime \
haveged \
iwinfo \
USB_BASIC := \
kmod-usb-core \
kmod-usb2 \
kmod-usb-hid
USB_NIC := \
kmod-usb-net \
kmod-usb-net-asix \
kmod-usb-net-rtl8150 \
kmod-usb-net-rtl8152 \
kmod-usb-net-dm9601-ether \
kmod-usb-net-mcs7830
ifeq ($(GLUON_TARGET),x86-generic)
GLUON_SITE_PACKAGES += \
$(USB_BASIC) \
kmod-usb-ohci-pci \
$(USB_NIC) \
kmod-phy-broadcom
endif
ifeq ($(GLUON_TARGET),x86-64)
GLUON_SITE_PACKAGES += \
$(USB_BASIC) \
$(USB_NIC) \
kmod-phy-broadcom \
kmod-igb
endif
GLUON_MULTIDOMAIN=1
GLUON_WLAN_MESH := 11s
# Allow overriding from the command line
%B
%C
GLUON_AUTOUPDATER_ENABLED ?= 1
GLUON_DEPRECATED ?= upgrade
GLUON_LANGS ?= de en
GLUON_PRIORITY ?= 0
GLUON_REGION ?= eu
GLUON_LANGS ?= de en