...
 
Commits (7)
......@@ -11,28 +11,23 @@
'ntp.intern.freifunk-bs.de'},
regdom = 'DE',
domain_seed = "efc1987284a08584db63cef75d6e2e483f80bc7110d267a4c9a22bf04b6dd752",
domain_seed = "efc1987284a08584db63cef75d6e2e483f80bc7110d267a4c9a22bf04b6dd752",
wifi24 = {
channel = 1,
-- htmode = 'HT40+',
-- Disabling 802.11b Rates according to gluon doc
-- http://gluon.readthedocs.io/en/v2016.2.5/user/site.html?highlight=site.conf
supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
basic_rate = {6000, 9000, 18000, 36000, 54000},
ap = {
ssid = 'Freifunk',
},
mesh = {
id = 'ffbs-mesh',
mcast_rate = 12000,
},
aliases = { },
aliases = { },
},
wifi5 = {
channel = 44,
outdoor_chanlist = '100-140',
outdoors = 'preset',
htmode = 'HT40+',
ap = {
ssid = 'Freifunk',
......@@ -41,7 +36,7 @@ domain_seed = "efc1987284a08584db63cef75d6e2e483f80bc7110d267a4c9a22bf04b6dd752"
id = 'ffbs-mesh',
mcast_rate = 12000,
},
aliases = { },
aliases = { },
},
next_node = {
......@@ -51,52 +46,58 @@ domain_seed = "efc1987284a08584db63cef75d6e2e483f80bc7110d267a4c9a22bf04b6dd752"
mac = '72:02:46:6a:1c:27',
},
mesh = {
vxlan = false,
},
mesh = {
vxlan = false,
batman_adv = {
-- select which routing algo to use
-- when both mesh-batman-adv-14 and mesh-batman-adv-15 are
-- included in site.mk
routing_algo = 'BATMAN_IV_LEGACY',
},
},
mesh_vpn = {
mtu = 1426,
fastd = {
methods = {'salsa2012+umac'},
enabled = True,
methods = {'salsa2012+umac'},
enabled = True,
--- setting configurable = false allows the updater to overwrite the fastd-configuration on updates.
--- with configurable = true and package gluon-web-mesh-vpn-fastd a user could tamper with the configuration.
configurable = false,
--- setting configurable = false allows the updater to overwrite the fastd-configuration on updates.
--- with configurable = true and package gluon-web-mesh-vpn-fastd a user could tamper with the configuration.
configurable = false,
groups = {
backbone = {
limit = 1,
peers = {
gw06 = {
key = '18c072c40578647d8d743a88d785e845e2a575984d3c4610007805a8abfbf7eb',
remotes = {'ipv4 "gw06.freifunk-bs.de" port 10001'},
},
gw05 = {
key = '0ac2d975b71d0171a1b3fe19ce6f039769310ddc8898b19243fbbbedfd1f98c9',
remotes = {'ipv4 "gw05.freifunk-bs.de" port 10001'},
},
gw04 = {
key = '8e6a913db1b5361f86af26c14c060e70b283eddccd006e768c14413b445bd650',
remotes = {'ipv4 "gw04.freifunk-bs.de" port 10001'},
},
gw03 = {
key = '872cac3b00096a8ee763e80df2be331ba1ffa5dbe00d1e025a85d25c3cee82fb',
remotes = {'ipv4 "gw03.freifunk-bs.de" port 10001'},
},
gw02 = {
key = '1b3d401d841a1496970f1f7abc6fe21c01bfdc6cf391835d91a6798250ea8faf',
remotes = {'ipv4 "gw02.freifunk-bs.de" port 10000'},
},
gw01 = {
key = 'c7b3985fa8efbcf0f79f29ad62a30bfcf35e6b115e4caeb258f4f5b6b7264c9f',
remotes = {'ipv4 "gw01.freifunk-bs.de" port 10001'},
groups = {
backbone = {
limit = 1,
peers = {
gw06 = {
key = '18c072c40578647d8d743a88d785e845e2a575984d3c4610007805a8abfbf7eb',
remotes = {'ipv4 "gw06.freifunk-bs.de" port 10001'},
},
gw05 = {
key = '0ac2d975b71d0171a1b3fe19ce6f039769310ddc8898b19243fbbbedfd1f98c9',
remotes = {'ipv4 "gw05.freifunk-bs.de" port 10001'},
},
gw04 = {
key = '8e6a913db1b5361f86af26c14c060e70b283eddccd006e768c14413b445bd650',
remotes = {'ipv4 "gw04.freifunk-bs.de" port 10001'},
},
gw03 = {
key = '872cac3b00096a8ee763e80df2be331ba1ffa5dbe00d1e025a85d25c3cee82fb',
remotes = {'ipv4 "gw03.freifunk-bs.de" port 10001'},
},
gw02 = {
key = '1b3d401d841a1496970f1f7abc6fe21c01bfdc6cf391835d91a6798250ea8faf',
remotes = {'ipv4 "gw02.freifunk-bs.de" port 10000'},
},
gw01 = {
key = 'c7b3985fa8efbcf0f79f29ad62a30bfcf35e6b115e4caeb258f4f5b6b7264c9f',
remotes = {'ipv4 "gw01.freifunk-bs.de" port 10001'},
},
},
},
},
},
},
bandwidth_limit = {
enabled = false,
ingress = 3000,
......@@ -106,7 +107,7 @@ domain_seed = "efc1987284a08584db63cef75d6e2e483f80bc7110d267a4c9a22bf04b6dd752"
autoupdater = {
branch = 'AUTOUPDATERBRANCH',
enabled = 1,
enabled = 1,
branches = {
stable = {
name = 'stable',
......@@ -163,29 +164,29 @@ domain_seed = "efc1987284a08584db63cef75d6e2e483f80bc7110d267a4c9a22bf04b6dd752"
},
},
config_mode = {
remote_login = {
show_password_form = true,
},
geo_location = {
osm = {
center = {
lat = 52.26469,
lon = 10.52378,
config_mode = {
remote_login = {
show_password_form = true,
},
geo_location = {
osm = {
center = {
lat = 52.26469,
lon = 10.52378,
},
},
show_altitude = true,
},
show_altitude = true,
},
},
legacy = {
version_files = {'/etc/.freifunk_version_keep', '/etc/.lff_version_keep'},
old_files = {'/etc/config/config_mode', '/etc/config/ffbs', '/etc/config/freifunk'},
version_files = {'/etc/.freifunk_version_keep', '/etc/.lff_version_keep'},
old_files = {'/etc/config/config_mode', '/etc/config/ffbs', '/etc/config/freifunk'},
config_mode_configs = {'config_mode', 'ffbs', 'freifunk'},
fastd_configs = {'ffbs_mesh_vpn', 'mesh_vpn'},
mesh_ifname = 'freifunk',
tc_configs = {'ffbs', 'freifunk'},
wifi_names = {'wifi_freifunk', 'wifi_freifunk5', 'wifi_mesh', 'wifi_mesh5'},
config_mode_configs = {'config_mode', 'ffbs', 'freifunk'},
fastd_configs = {'ffbs_mesh_vpn', 'mesh_vpn'},
mesh_ifname = 'freifunk',
tc_configs = {'ffbs', 'freifunk'},
wifi_names = {'wifi_freifunk', 'wifi_freifunk5', 'wifi_mesh', 'wifi_mesh5'},
},
}
......@@ -49,7 +49,11 @@ 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
# enable factory and sysupgrade-images for all devices:
# see: https://gluon.readthedocs.io/en/latest/user/site.html#user-site-build-configuration
GLUON_DEPRECATED=full
DEFAULT_GLUON_RELEASE := $(shell ${GLUON_SITEDIR}/getRelease.sh)-$(shell date '+%Y%m%d')-snapshot
......