...
 
Commits (24)
......@@ -12,7 +12,7 @@ msgstr ""
msgid "gluon-config-mode:welcome"
msgstr ""
"Welcome the the setup wizard of your new Freifunk Braunschweig node. "
"Welcome to the setup wizard of your new Freifunk Braunschweig node. "
"Please fill out the following form and transmit it."
msgid "gluon-config-mode:pubkey"
......
GLUON_SITE_FEEDS='packages_ffbs'
PACKAGES_PACKAGES_FFBS_REPO=https://gitli.stratum0.org/ffbs/ffbs-packages.git
PACKAGES_PACKAGES_FFBS_COMMIT=b19f4a069896c96602c47308282aa5d522c7a926
PACKAGES_PACKAGES_FFBS_BRANCH=master
PACKAGES_PACKAGES_FFBS_COMMIT=53adfeaaa500c215f43d483c1126daaf7b569929
PACKAGES_PACKAGES_FFBS_BRANCH=next
{
authorized_keys = {
'ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAvKxyTng9ik/oFf3W+0CItmX127rKhmXXX5rB3n+trO/4pPE/YOkTq5rMuNpeRl8+AqY9ZW9qQHyIc8D4IqtJNhe9OfFeIDHrSxilHGh/IXwdZ/MpexaeGUzqyck8xNxIeqqbs6ouBXHhWcBIjQQlXEj5fGTU6MFbUauvJd0bc8c7OhW2PzQkjbahriH0C/o+xoxovXFEa8Vrerxyv8lWSsm92j2qXBXdO1woOV0npruhq6hVzELdhSVpaHYg3n7HQCaB39QiQBM9kU+Px7cjz9H5XUBtaS6YtMEyCKckA2RvwnAkWu/QDWsDvYAXnGU9/hrYAmG26plFvrNYi+U3pAzZDoEaDmckof5yO7bCl6LvQKGUKCZg8GNnnzKfOQVSsNlTaThhUDqZ88lToksLtQavNKZkWahNdAF6ZC+iRUDak01KqgeeuHKj7C2IfU/H4U4FoMtQwSoVnVNN+kLDrsN6wmT1wVOjvBIp5mTk0gY3w3gXCW3N5BpqNhDTt5Cd2yFbaXl2OcAdax8MreY+Ql1VCR3wWJfj/ikwqDYnyBt/lYdeqm8X5HEw57JvWc1ckGMW/olV5a/MrW5GYTp9G9fOBkPgM8ypl340RoDMoNe7b7Pr9zTyLMjfdtvbRq7uehiT8VDn5OVWPTBsjKjcj1orrKN+3zJiH49UBP4FWW0=',
'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDpA48TpFAdr7EpwF8Htisf48R4ououADEyVVLHyt5kyQeZhBetTsWKzCzBosEt/cHMMuS/uQaqE8tRLqvox2kc4gjgJh/drPqXnf4UJILvSi/nHkQXOqY7/H/Fn2UvYZWlsecegzKaBSFemigJ8G21RxosA22nu+QJv3M0Ra0jyuHjdfxheLPJpM+76x/H0ploONOtGAo8iycJKfl+OitB2KJjoq2ohX4+tX32coifF9BKtQUbLva6llSfZpjJ9lrI7O6hk0xQtV/jMaDyCoZ6yRx8YiO2fk5ixoL0WIgdexeixDf4fffJXQuORR5kXoeXKk8BH5W68AokrUqqaSyUGMhBzl9WVVt2yV5basufC9uAFiMrG+ry1X2Yt5M+yAIELQQ1D8olc37xhXPIn/QDg9o5oTH+iJg9mTEMRndrA2Q0QnOYvS0D7umU0t3AADqE6rG3LOS2XV+Y4iBNqSDbJhESBNJs/Vq5BuUf4yUm7+ExQARJX5bwm8vuA7mW8+1m74phtKFFNcAqAON2J24gDh7IhyGZ76fEJXB1YQlJxOdfumqp85oqth+fKVsMwngCld+CJ4B/PHpgfUnmve3mm28aVGcPdlr40uQ/3K6V9GsW778MFyIO5bsY8ZS1VRVMwzf3VA785EpkCsZ51O7YBDzZ7ROwNppXU9F2gvTqNQ==',
'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEWpbjL6mqW3l69pEMTSuiI3VR7Z55k4onUIksDpqRFej+jOap9yX48f8JrCxuCr9KdnYlncRANAT+bIr4cVDGX7sPW09dVdll6SIx4z3zOCePgy+3zCDIsGpxwtWIqgiXckQlm7eV2McIuoZNoW1Z7I/TU7BcpS03Np6nYW12VG/F2eElwrDoNRJ18qUm6DxeINetfi5Ob/T9Zjuo9HsSpZNhXPP15AHlL9ttk3ActKBmS1LHOL33czcpoFEr4s3GsCOGDRaFdzQinh/A8yywYpap/lXgRS0sXOj+zAI44X1vKun115hBgKukyubrZMZ5UzjSs/CFtGOdyoZq/YXf',
'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClXiNtzvLk9wZPC6uoUWuXwGzKY9/fkX0+FtfQncg2sd9cWRG9GMw70qR6d4JudzLgXE/+t5oLFHwi20lgtoTsm7xizRgxRMsgM9rIXXlz/kK8aMtOS63AyV7bpicAAc/clhVG99fJq8ooDbDg3xp2TonYbpowqTTQiRMjE4TK3jhM88i2Sw2lfLiAX7ksOOBlYepzHbuEmQH4u9Gq3Qk45bAzuhWf5Jv67C//g07NthR9uvEUzO23Co+yLvzDPKujuh7mFJsjmw3Tq4fW0q3gQgBJH+fUeVyzqoWbYzZZ+wwemFgV/KtD8tl++bqaAKsmh8/XDb96fS0U+/EpIH6d FFBS Parker Key (Emantor)',
'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9mTCbcQ/el1DAiXQPGVmSLTFTo5A8rNM4Aj0GMHzXKQrBIFUatxYk62IetA9Hus3FLDZqHXEG4rCcxSrBM4IeVf7KBah0zNc4OSsKzYaS549EzQQ5AJfOWrSxepQsy1Jm5hRiVifAeg7dneo5oMQ/gzFtWPn1PmJqt56a/CjdDFO+zmfs9KPjzGOv/YM4pzLrOewyILy/ZFt0iD8kq2mB05fPHK2Nbwy8ybAVB0WiLoVb71mmgtxRSdu0CwDq0kaGnv/3ZfrmDOlFRIUb9UEENBxMHrwIH9MG6O9XAfcAKHbfJWqB6iA1pYEwJIPlIPFnYHWhjsyH/vyhldPdgHWH matthias@hephaistos'
},
hostname_prefix = 'freifunk',
site_name = 'Freifunk Braunschweig',
site_code = 'ffbs',
prefix4 = '10.38.0.0/16',
prefix6 = '2001:bf7:380::/64',
-- this prefix needs to be outside of the currently used parker
-- address range since the next_node mechanics are broken at the
-- moment.
prefix6 = '2001:bf7:38ff::/64',
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
ntp_servers = {'1.ntp.services.ffbs', '2.ntp.services.ffbs'},
ntp_servers = {'172.16.0.123'},
regdom = 'DE',
domain_seed = "efc1987284a08584db63cef75d6e2e483f80bc7110d267a4c9a22bf04b6dd752",
domain_seed = "ca95f6e5c63886922a3154b6bf90a4938ef04e176180ff5308f2b2aba1c90b88",
wifi24 = {
channel = 1,
......@@ -21,12 +32,10 @@ domain_seed = "efc1987284a08584db63cef75d6e2e483f80bc7110d267a4c9a22bf04b6dd752"
basic_rate = {6000, 9000, 18000, 36000, 54000},
ap = {
ssid = 'Freifunk',
},
ibss = {
ssid = '02:d1:11:37:fc:38',
bssid = '02:d1:11:37:fc:38',
ssid = 'Freifunk-next',
},
mesh = {
id = 'eseB6Qlu',
mcast_rate = 12000,
},
aliases = { },
......@@ -35,12 +44,7 @@ domain_seed = "efc1987284a08584db63cef75d6e2e483f80bc7110d267a4c9a22bf04b6dd752"
channel = 44,
htmode = 'HT40+',
ap = {
ssid = 'Freifunk',
},
ibss = {
ssid = '02:d1:11:37:fc:38',
bssid = '02:d1:11:37:fc:38',
mcast_rate = 12000,
ssid = 'Freifunk-next',
},
--[[mesh = {
id = 'eseB6Qlu',
......@@ -49,6 +53,10 @@ domain_seed = "efc1987284a08584db63cef75d6e2e483f80bc7110d267a4c9a22bf04b6dd752"
aliases = { },
},
dns = {
servers = { '172.16.0.53', '2001:bf7:382:0::53', },
},
next_node = {
ip4 = '10.38.0.127',
ip6 = '2001:bf7:380::7f',
......@@ -111,7 +119,7 @@ domain_seed = "efc1987284a08584db63cef75d6e2e483f80bc7110d267a4c9a22bf04b6dd752"
autoupdater = {
branch = 'AUTOUPDATERBRANCH',
enabled = 1,
enabled = 0,
branches = {
stable = {
name = 'stable',
......@@ -130,7 +138,10 @@ domain_seed = "efc1987284a08584db63cef75d6e2e483f80bc7110d267a4c9a22bf04b6dd752"
pubkeys = {
'24e810335660d4b4e6da8d115dfa8e4283c931a5da5b337391311f14ef7fe445', -- oni
'4efefc817e93fed2df1176f07621f432d088ef1f534bf455195b363870278bb1', -- jenkins
'9626ac01ba74cb834d587aebb01838b3ff45596a2413e86a70ac0e4852574ffd', -- chrissi
'9626ac01ba74cb834d587aebb01838b3ff45596a2413e86a70ac0e4852574ffd', -- chrissi
'5c5e8b827e16f2cba06a18ab10795cec71cc6cb1ca9d41c0bce45a32f63510bc', -- kasa
'fe87524673c463352991751c95173f0c87f176f786e7283f557dd6504f52720d', -- emantor
'5b6cbc7829938949e1afbda3d0eb7827b9f0ccb733ef0ee67c8861733ac8e96a', -- larsan
},
},
beta = {
......@@ -140,7 +151,10 @@ domain_seed = "efc1987284a08584db63cef75d6e2e483f80bc7110d267a4c9a22bf04b6dd752"
pubkeys = {
'24e810335660d4b4e6da8d115dfa8e4283c931a5da5b337391311f14ef7fe445', -- oni
'4efefc817e93fed2df1176f07621f432d088ef1f534bf455195b363870278bb1', -- jenkins
'9626ac01ba74cb834d587aebb01838b3ff45596a2413e86a70ac0e4852574ffd', -- chrissi
'9626ac01ba74cb834d587aebb01838b3ff45596a2413e86a70ac0e4852574ffd', -- chrissi
'5c5e8b827e16f2cba06a18ab10795cec71cc6cb1ca9d41c0bce45a32f63510bc', -- kasa
'fe87524673c463352991751c95173f0c87f176f786e7283f557dd6504f52720d', -- emantor
'5b6cbc7829938949e1afbda3d0eb7827b9f0ccb733ef0ee67c8861733ac8e96a', -- larsan
},
},
experimental = {
......@@ -150,7 +164,23 @@ domain_seed = "efc1987284a08584db63cef75d6e2e483f80bc7110d267a4c9a22bf04b6dd752"
pubkeys = {
'24e810335660d4b4e6da8d115dfa8e4283c931a5da5b337391311f14ef7fe445', -- oni
'4efefc817e93fed2df1176f07621f432d088ef1f534bf455195b363870278bb1', -- jenkins
'9626ac01ba74cb834d587aebb01838b3ff45596a2413e86a70ac0e4852574ffd', -- chrissi
'9626ac01ba74cb834d587aebb01838b3ff45596a2413e86a70ac0e4852574ffd', -- chrissi
'5c5e8b827e16f2cba06a18ab10795cec71cc6cb1ca9d41c0bce45a32f63510bc', -- kasa
'fe87524673c463352991751c95173f0c87f176f786e7283f557dd6504f52720d', -- emantor
'5b6cbc7829938949e1afbda3d0eb7827b9f0ccb733ef0ee67c8861733ac8e96a', -- larsan
},
},
parker_beta = {
name = 'parker_beta',
mirrors = {'http://firmware.freifunk-bs.de/parker_beta/sysupgrade'},
good_signatures = 1,
pubkeys = {
'24e810335660d4b4e6da8d115dfa8e4283c931a5da5b337391311f14ef7fe445', -- oni
'4efefc817e93fed2df1176f07621f432d088ef1f534bf455195b363870278bb1', -- jenkins
'9626ac01ba74cb834d587aebb01838b3ff45596a2413e86a70ac0e4852574ffd', -- chrissi
'5c5e8b827e16f2cba06a18ab10795cec71cc6cb1ca9d41c0bce45a32f63510bc', -- kasa
'fe87524673c463352991751c95173f0c87f176f786e7283f557dd6504f52720d', -- emantor
'5b6cbc7829938949e1afbda3d0eb7827b9f0ccb733ef0ee67c8861733ac8e96a', -- larsan
},
},
},
......@@ -162,6 +192,11 @@ config_mode = {
},
},
radv_filterd = {
-- default setting. only here for reference..
threshold = 20,
},
legacy = {
version_files = {'/etc/.freifunk_version_keep', '/etc/.lff_version_keep'},
old_files = {'/etc/config/config_mode', '/etc/config/ffbs', '/etc/config/freifunk'},
......
GLUON_SITE_PACKAGES := \
gluon-mesh-batman-adv-14 \
gluon-alfred \
gluon-mesh-batman-adv-15 \
gluon-autoupdater \
gluon-authorized-keys \
gluon-config-mode-autoupdater \
gluon-config-mode-core \
gluon-config-mode-geo-location \
gluon-config-mode-hostname \
gluon-config-mode-mesh-vpn \
gluon-ebtables-filter-multicast \
gluon-ebtables-filter-ra-dhcp \
gluon-web-admin \
gluon-web-autoupdater \
gluon-web-wifi-config \
gluon-mesh-vpn-fastd \
gluon-web-logging \
gluon-radvd \
gluon-setup-mode \
gluon-status-page \
......@@ -20,10 +18,26 @@ GLUON_SITE_PACKAGES := \
iwinfo \
iptables \
gluon-web-network \
gluon-ebtables-source-filter \
haveged \
gluon-ffbs-rm-contactinfo
wireguard \
gluon-ffbsnext-nodeconfig \
gluon-ffbsnext-wireguardkeys \
usign \
-gluon-ebtables-limit-arp \
gluon-status-page-mesh-batman-adv \
respondd \
respondd-module-airtime \
gluon-wireguard \
gluon-radv-filterd
# activate for wifi fallback later in production
# gluon-ffbs-autoupdater-wifi-fallback
# gluon-ebtables-source-filter \
# gluon-ebtables-filter-multicast \
# gluon-ebtables-filter-ra-dhcp \
# gluon-alfred \
# gluon-mesh-vpn-fastd \
# x86-generic
ifeq ($(GLUON_TARGET),x86-generic)
......@@ -42,7 +56,8 @@ endif
# enable images for ath10k based devices
# see: http://gluon.readthedocs.io/en/v2017.1.x/user/getting_started.html#getting-started-make-variables
GLUON_ATH10K_MESH=ibss
GLUON_ATH10K_MESH=11s
GLUON_WLAN_MESH=11s
DEFAULT_GLUON_RELEASE := $(shell ${GLUON_SITEDIR}/getRelease.sh)-$(shell date '+%Y%m%d')-snapshot
......