mirror of
https://github.com/ffrgb/site-ffrgb.git
synced 2024-12-29 01:11:51 +01:00
Test for domain-select
This commit is contained in:
parent
ce3b2aa62c
commit
a420d3856a
6
Makefile
6
Makefile
@ -1,6 +1,6 @@
|
|||||||
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/kb-light/gluon
|
||||||
GLUON_GIT_REF := v2017.1.4
|
GLUON_GIT_REF := c644d5276c8183799b852b51c818c45f740b21e0
|
||||||
|
|
||||||
#https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43
|
#https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43
|
||||||
|
|
||||||
@ -8,7 +8,7 @@ SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
|
|||||||
|
|
||||||
GLUON_TARGETS ?= \
|
GLUON_TARGETS ?= \
|
||||||
ar71xx-tiny \
|
ar71xx-tiny \
|
||||||
ar71xx-generic \
|
ar71xx-generic #\
|
||||||
ar71xx-nand \
|
ar71xx-nand \
|
||||||
brcm2708-bcm2708 \
|
brcm2708-bcm2708 \
|
||||||
brcm2708-bcm2709 \
|
brcm2708-bcm2709 \
|
||||||
|
127
domains/ffrgb_cty.conf
Normal file
127
domains/ffrgb_cty.conf
Normal file
@ -0,0 +1,127 @@
|
|||||||
|
{
|
||||||
|
hostname_prefix = '',
|
||||||
|
site_name = 'Freifunk Regensburg Stadt',
|
||||||
|
site_code = 'ffrgb_cty',
|
||||||
|
|
||||||
|
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',
|
||||||
|
prefix6 = 'fdef:f10f:1337:cafe::/64',
|
||||||
|
|
||||||
|
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
|
||||||
|
ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'},
|
||||||
|
|
||||||
|
mesh_on_wan = true,
|
||||||
|
|
||||||
|
regdom = 'DE',
|
||||||
|
|
||||||
|
wifi24 = {
|
||||||
|
supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
|
||||||
|
basic_rate = {6000, 9000, 18000, 36000, 54000},
|
||||||
|
channel = 1,
|
||||||
|
ap = {
|
||||||
|
ssid = 'regensburg.freifunk.net',
|
||||||
|
},
|
||||||
|
ibss = {
|
||||||
|
ssid = 'mesh.ffrgb_cty',
|
||||||
|
bssid = '02:0E:8E:1E:61:01',
|
||||||
|
mcast_rate = 12000,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
wifi5 = {
|
||||||
|
channel = 44,
|
||||||
|
ap = {
|
||||||
|
ssid = 'regensburg.freifunk.net',
|
||||||
|
},
|
||||||
|
ibss = {
|
||||||
|
ssid = 'mesh.ffrgb_cty',
|
||||||
|
bssid = '02:0E:8E:1E:61:01',
|
||||||
|
mcast_rate = 12000,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
dns = {
|
||||||
|
cacheentries = 5000,
|
||||||
|
servers = { 'fdef:f10f:1337:cafe::11', },
|
||||||
|
},
|
||||||
|
|
||||||
|
next_node = {
|
||||||
|
ip4 = '10.90.32.1',
|
||||||
|
ip6 = 'fdef:f10f:1337:cafe::1',
|
||||||
|
mac = '16:41:95:40:f7:01',
|
||||||
|
},
|
||||||
|
|
||||||
|
mesh_vpn = {
|
||||||
|
mtu = 1280,
|
||||||
|
fastd = {
|
||||||
|
configurable = true,
|
||||||
|
methods = {'salsa2012+umac'},
|
||||||
|
groups = {
|
||||||
|
backbone = {
|
||||||
|
limit = 1,
|
||||||
|
peers = {
|
||||||
|
gwpri = { --[[ primary ]]
|
||||||
|
key = '86a4dcdbaba87fe30da03cc398a083d7a0725c44dac733b583515b188fdc63dd',
|
||||||
|
remotes = {
|
||||||
|
'ipv4 "gw11.ffrgb.net" port 10010',
|
||||||
|
'ipv4 "gw11.ffrgb.net" port 10011',
|
||||||
|
'ipv4 "gw11.ffrgb.net" port 10012',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
gwsec = { --[[ coldstandby ]]
|
||||||
|
key = '',
|
||||||
|
remotes = {
|
||||||
|
'ipv4 "gw12.ffrgb.net" port 10010',
|
||||||
|
'ipv4 "gw12.ffrgb.net" port 10011',
|
||||||
|
'ipv4 "gw12.ffrgb.net" port 10012',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
bandwidth_limit = {
|
||||||
|
enabled = false,
|
||||||
|
ingress = 12000,
|
||||||
|
egress = 1200,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
autoupdater = {
|
||||||
|
enabled = 1,
|
||||||
|
branch = 'stable',
|
||||||
|
branches = {
|
||||||
|
stable = {
|
||||||
|
name = 'stable',
|
||||||
|
mirrors = {
|
||||||
|
'http://fw.services.ffrgb/firmware-ng/stable/sysupgrade/',
|
||||||
|
},
|
||||||
|
good_signatures = 1,
|
||||||
|
pubkeys = {
|
||||||
|
'4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
|
||||||
|
'130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
|
||||||
|
'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
|
||||||
|
},
|
||||||
|
},
|
||||||
|
experimental = {
|
||||||
|
name = 'experimental',
|
||||||
|
mirrors = {
|
||||||
|
'http://fw.services.ffrgb/firmware-ng/experimental/sysupgrade/',
|
||||||
|
},
|
||||||
|
good_signatures = 1,
|
||||||
|
pubkeys = {
|
||||||
|
'4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
|
||||||
|
'130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
|
||||||
|
'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
-- vim: set ft=lua:ts=2:sw=2:et
|
@ -24,6 +24,15 @@ msgstr ""
|
|||||||
"Knoten befindet, auszuwählen. Bitte denke daran, dass dein Router "
|
"Knoten befindet, auszuwählen. Bitte denke daran, dass dein Router "
|
||||||
"sich nur mit dem Netz der ausgewählten Region verbindet."
|
"sich nur mit dem Netz der ausgewählten Region verbindet."
|
||||||
|
|
||||||
|
msgid "gluon-config-mode:domain"
|
||||||
|
msgstr "Domäne"
|
||||||
|
|
||||||
|
msgid "gluon-config-mode:domain-select"
|
||||||
|
msgstr ""
|
||||||
|
"Hier hast du die Möglichkeit, die Domäne, in der sich dein Knoten befindet, "
|
||||||
|
"auszuwählen. Bitte denke daran, dass sich dein Knoten nur mit den Knoten der "
|
||||||
|
"ausgewählten Domäne verbinden kann."
|
||||||
|
|
||||||
msgid "gluon-config-mode:pubkey"
|
msgid "gluon-config-mode:pubkey"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
" "
|
" "
|
||||||
|
@ -21,6 +21,15 @@ msgstr ""
|
|||||||
"your node is placed. Please keep in mind that your router "
|
"your node is placed. Please keep in mind that your router "
|
||||||
"connects only with the mesh of the selected region"
|
"connects only with the mesh of the selected region"
|
||||||
|
|
||||||
|
msgid "gluon-config-mode:domain"
|
||||||
|
msgstr "Domain"
|
||||||
|
|
||||||
|
msgid "gluon-config-mode:domain-select"
|
||||||
|
msgstr ""
|
||||||
|
"Here you have the possibility of selecting the domain in which your node is "
|
||||||
|
"placed. Please keep in mind that your router only connects with the nodes of "
|
||||||
|
"the selected domain"
|
||||||
|
|
||||||
msgid "gluon-config-mode:pubkey"
|
msgid "gluon-config-mode:pubkey"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
" "
|
" "
|
||||||
|
Loading…
Reference in New Issue
Block a user