FF-RGB/site-ffrgb
3
0
Fork 0
mirror of https://github.com/ffrgb/site-ffrgb.git synced 2024-12-27 19:31:51 +01:00
Code Releases Wiki Activity

Merge pull request #21 from ffrgb/11s

Browse Source 
11s
This commit is contained in:
Bastian 2020-05-29 23:43:04 +02:00 committed by GitHub
commit 3588f450c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 41 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -1,22 +1,31 @@
GLUON_BUILD_DIR := gluon-build GLUON_BUILD_DIR := gluon-build
GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon
GLUON_GIT_REF := v2018.1 GLUON_GIT_REF := v2020.1.2
SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
GLUON_TARGETS ?= \ GLUON_TARGETS ?= \
ar71xx-generic \ ar71xx-generic \
ar71xx-tiny \ ar71xx-tiny \
ar71xx-nand \ ar71xx-nand \
ath79-generic \
brcm2708-bcm2708 \ brcm2708-bcm2708 \
brcm2708-bcm2709 \ brcm2708-bcm2709 \
ipq806x-generic \
lantiq-xrx200 \
lantiq-xway \
mpc85xx-generic \ mpc85xx-generic \
mpc85xx-p1020 \
ramips-mt7620 \
ramips-mt7621 \ ramips-mt7621 \
ramips-mt76x8 \
ramips-rt305x \ ramips-rt305x \
ipq40xx-generic \
sunxi-cortexa7 \
x86-64 \ x86-64 \
x86-generic \ x86-generic \
x86-geode \ x86-geode \
sunxi
GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
@ -30,7 +39,7 @@ JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
#JOBS = 1 #JOBS = 1
GLUON_MAKE := ${MAKE} BROKEN=0 -j ${JOBS} -C ${GLUON_BUILD_DIR} \ GLUON_MAKE := ${MAKE} V=s BROKEN=0 -j ${JOBS} -C ${GLUON_BUILD_DIR} \
GLUON_RELEASE=${GLUON_RELEASE} \ GLUON_RELEASE=${GLUON_RELEASE} \
GLUON_BRANCH=${GLUON_BRANCH} \ GLUON_BRANCH=${GLUON_BRANCH} \

109
domains/ffrgb.conf
View File

@ -1,109 +0,0 @@
{
domain_names = { ffrgb = 'Legacy' },
domain_seed = 'c8951e3a104d55543da98ee732468ea121878e77c6d18cbcbefb5409c292601a',
hide_domain = true,
opkg = {
--[[ old
openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
]]
lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
},
prefix4 = '10.90.0.0/19',
prefix6 = 'fdef:f00f:1337:cafe::/64',
ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
wifi24 = {
channel = 1,
ap = {
ssid = 'regensburg.freifunk.net',
},
ibss = {
ssid = 'mesh.ffrgb',
bssid = '02:0E:8E:1E:61:17',
mcast_rate = 12000,
},
},
wifi5 = {
channel = 44,
ap = {
ssid = 'regensburg.freifunk.net',
},
ibss = {
ssid = 'mesh.ffrgb',
bssid = '02:0E:8E:1E:61:17',
mcast_rate = 12000,
}
},
dns = {
cacheentries = 500,
servers = { 'fdef:f00f:1337:cafe::11', },
},
next_node = {
name = { 'nextnode.ffrgb', 'nextnode', 'nn' },
ip4 = '10.90.0.1',
ip6 = 'fdef:f00f:1337:cafe::1',
mac = '16:41:95:40:f7:dd',
},
mesh = {
vxlan = false,
filter_membership_reports = false,
batman_adv = {
gw_sel_class = 1,
},
},
mesh_vpn = {
mtu = 1426,
fastd = {
groups = {
backbone = {
limit = 2,
peers = {
gw01 = { --[[ sven ]]
key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66',
remotes = {
'ipv4 "78.47.168.108" port 10000',
},
},
gw02 = { --[[ alamar ]]
key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214',
remotes = {
'ipv4 "185.53.218.23" port 10000',
},
},
gw04 = { --[[ mephisto ]]
key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5',
remotes = {
'ipv4 "213.166.225.5" port 10000',
},
},
},
},
},
},
},
autoupdater = {
enabled = 1,
branches = {
stable = {
mirrors = {
'http://fw.services.ffrgb/firmware-ng/stable/sysupgrade/',
},
},
experimental = {
mirrors = {
'http://fw.services.ffrgb/firmware-ng/experimental/sysupgrade/',
},
},
},
},
}
-- vim: set ft=lua:ts=2:sw=2:et

26
domains/ffrgb_cty.conf
View File

@ -2,13 +2,6 @@
domain_names = { ffrgb_cty = 'Regensburg Stadt' }, domain_names = { ffrgb_cty = 'Regensburg Stadt' },
domain_seed = '1124de9b0fe2dde424c8a4c481816b5899e6d1b4b4cf72de42136c4f1f197c7a', domain_seed = '1124de9b0fe2dde424c8a4c481816b5899e6d1b4b4cf72de42136c4f1f197c7a',
opkg = {
--[[ old
openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
]]
lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
},
prefix4 = '10.90.32.0/19', prefix4 = '10.90.32.0/19',
prefix6 = 'fdef:f10f:1337:cafe::/64', prefix6 = 'fdef:f10f:1337:cafe::/64',
extra_prefixes6 = {'2a00:9d80:6000:0101::/64'}, extra_prefixes6 = {'2a00:9d80:6000:0101::/64'},
@ -21,10 +14,8 @@
ap = { ap = {
ssid = 'regensburg.freifunk.net', ssid = 'regensburg.freifunk.net',
}, },
ibss = { mesh = {
ssid = 'mesh.ffrgb_cty', id = 'loo23eWueg11s',
bssid = '02:0E:8E:1E:61:01',
mcast_rate = 12000,
}, },
}, },
@ -34,11 +25,9 @@
ap = { ap = {
ssid = 'regensburg.freifunk.net', ssid = 'regensburg.freifunk.net',
}, },
ibss = { mesh = {
ssid = 'mesh.ffrgb_cty', id = 'loo23eWueg11s',
bssid = '02:0E:8E:1E:61:01', },
mcast_rate = 12000,
}
}, },
dns = { dns = {
@ -58,6 +47,7 @@
filter_membership_reports = false, filter_membership_reports = false,
batman_adv = { batman_adv = {
gw_sel_class = 1, gw_sel_class = 1,
routing_algo = 'BATMAN_IV',
}, },
}, },
@ -107,12 +97,12 @@
branches = { branches = {
stable = { stable = {
mirrors = { mirrors = {
'http://fw.services.ffrgb/firmware-ng/stable/sysupgrade/', 'http://fw.services.ffrgb/firmware-11s/stable/sysupgrade/',
}, },
}, },
experimental = { experimental = {
mirrors = { mirrors = {
'http://fw.services.ffrgb/firmware-ng/experimental/sysupgrade/', 'http://fw.services.ffrgb/firmware-11s/experimental/sysupgrade/',
}, },
}, },
}, },

26
domains/ffrgb_tst.conf
View File

@ -3,13 +3,6 @@
domain_seed = 'bcd0ceca2c68b5b9a5975156a0ec0a04aebe3300d9928a04dc57001cc96db252', domain_seed = 'bcd0ceca2c68b5b9a5975156a0ec0a04aebe3300d9928a04dc57001cc96db252',
hide_domain = true, hide_domain = true,
opkg = {
--[[ old
openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
]]
lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
},
prefix4 = '10.90.96.0/19', prefix4 = '10.90.96.0/19',
prefix6 = 'fdef:f30f:1337:cafe::/64', prefix6 = 'fdef:f30f:1337:cafe::/64',
extra_prefixes6 = {'2a00:9d80:6000:0103::/64'}, extra_prefixes6 = {'2a00:9d80:6000:0103::/64'},
@ -22,10 +15,8 @@
ap = { ap = {
ssid = 'test.ffrgb.net', ssid = 'test.ffrgb.net',
}, },
ibss = { mesh = {
ssid = 'mesh.ffrgb_test', id = 'mesh_ffrgb_tst_11s',
bssid = '02:0E:8E:1E:61:03',
mcast_rate = 12000,
}, },
}, },
@ -35,11 +26,9 @@
ap = { ap = {
ssid = 'test.freifunk.net', ssid = 'test.freifunk.net',
}, },
ibss = { mesh = {
ssid = 'mesh.ffrgb_test', id = 'mesh_ffrgb_tst_11s',
bssid = '02:0E:8E:1E:61:03', },
mcast_rate = 12000,
}
}, },
dns = { dns = {
@ -59,6 +48,7 @@
filter_membership_reports = false, filter_membership_reports = false,
batman_adv = { batman_adv = {
gw_sel_class = 1, gw_sel_class = 1,
routing_algo = 'BATMAN_IV',
}, },
}, },
@ -108,12 +98,12 @@
branches = { branches = {
stable = { stable = {
mirrors = { mirrors = {
'http://fw.services.ffrgb/firmware-ng/stable/sysupgrade/', 'http://fw.services.ffrgb/firmware-11s/stable/sysupgrade/',
}, },
}, },
experimental = { experimental = {
mirrors = { mirrors = {
'http://fw.services.ffrgb/firmware-ng/experimental/sysupgrade/', 'http://fw.services.ffrgb/firmware-11s/experimental/sysupgrade/',
}, },
}, },
}, },

26
domains/ffrgb_uml.conf
View File

@ -2,13 +2,6 @@
domain_names = { ffrgb_uml = 'Regensburg Umland' }, domain_names = { ffrgb_uml = 'Regensburg Umland' },
domain_seed = 'f3d54e3dfc4108dd3356664bbab4baef3b2920ad943c27edce4b284a68e776fd', domain_seed = 'f3d54e3dfc4108dd3356664bbab4baef3b2920ad943c27edce4b284a68e776fd',
opkg = {
--[[ old
openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
]]
lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
},
prefix4 = '10.90.64.0/19', prefix4 = '10.90.64.0/19',
prefix6 = 'fdef:f20f:1337:cafe::/64', prefix6 = 'fdef:f20f:1337:cafe::/64',
extra_prefixes6 = {'2a00:9d80:6000:0102::/64'}, extra_prefixes6 = {'2a00:9d80:6000:0102::/64'},
@ -21,10 +14,8 @@
ap = { ap = {
ssid = 'land.regensburg.freifunk.net', ssid = 'land.regensburg.freifunk.net',
}, },
ibss = { mesh = {
ssid = 'mesh.ffrgb_uml', id = 'Ishei42esh11s',
bssid = '02:0E:8E:1E:61:02',
mcast_rate = 12000,
}, },
}, },
@ -34,11 +25,9 @@
ap = { ap = {
ssid = 'land.regensburg.freifunk.net', ssid = 'land.regensburg.freifunk.net',
}, },
ibss = { mesh = {
ssid = 'mesh.ffrgb_uml', id = 'Ishei42esh11s',
bssid = '02:0E:8E:1E:61:02', },
mcast_rate = 12000,
}
}, },
dns = { dns = {
@ -58,6 +47,7 @@
filter_membership_reports = false, filter_membership_reports = false,
batman_adv = { batman_adv = {
gw_sel_class = 1, gw_sel_class = 1,
routing_algo = 'BATMAN_IV',
}, },
}, },
@ -107,12 +97,12 @@
branches = { branches = {
stable = { stable = {
mirrors = { mirrors = {
'http://fw.services.ffrgb/firmware-ng/stable/sysupgrade/', 'http://fw.services.ffrgb/firmware-11s/stable/sysupgrade/',
}, },
}, },
experimental = { experimental = {
mirrors = { mirrors = {
'http://fw.services.ffrgb/firmware-ng/experimental/sysupgrade/', 'http://fw.services.ffrgb/firmware-11s/experimental/sysupgrade/',
}, },
}, },
}, },

13
site.conf
View File

@ -2,13 +2,10 @@
hostname_prefix = '', hostname_prefix = '',
site_name = 'Freifunk Regensburg', site_name = 'Freifunk Regensburg',
site_code = 'ffrgb', site_code = 'ffrgb',
default_domain = 'ffrgb', default_domain = 'ffrgb_cty',
opkg = { opkg = {
--[[ old openwrt = 'http://downloads.openwrt.org/snapshots/packages/%A',
openwrt = 'http://downloads.openwrt.org/%n/%v/%S/packages',
]]
lede = 'http://downloads.lede-project.org/snapshots/packages/%A',
}, },
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
@ -18,12 +15,6 @@
regdom = 'DE', regdom = 'DE',
wifi24 = {
-- disable 802.11b support:
supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000}, -- List of supported wifi rates (optional)
basic_rate = {6000, 9000, 18000, 36000, 54000}, -- List of basic wifi rates (optional, required if supported_rates is set)
},
mesh_vpn = { mesh_vpn = {
mtu = 1426, mtu = 1426,
fastd = { fastd = {

4
site.mk
View File

@ -209,9 +209,11 @@ DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d')
# Allow overriding the release number from the command line # Allow overriding the release number from the command line
GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
GLUON_DEPRECATED ?= 1
GLUON_PRIORITY ?= 0 GLUON_PRIORITY ?= 0
# Languages to include # Languages to include
GLUON_LANGS ?= en de GLUON_LANGS ?= en de
GLUON_WLAN_MESH := ibss GLUON_WLAN_MESH := 11s
GLUON_MULTIDOMAIN=1 GLUON_MULTIDOMAIN=1