init babel

This commit is contained in:
Martin Geno 2017-06-28 09:51:29 +02:00
parent faa69c640c
commit 182a9591f9
No known key found for this signature in database
GPG Key ID: F0D39A37E925E941
5 changed files with 50 additions and 64 deletions

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "gluon"]
path = gluon
url = https://github.com/freifunk-gluon/gluon.git
url = https://github.com/freifunk-ffm/gluon.git

2
gluon

@ -1 +1 @@
Subproject commit 0d2b078a1742c0f7f5860734d6783d7aee281a03
Subproject commit 78ccc7fa4e3dedc3565813c96cb490584140a2fe

View File

@ -1,4 +1,5 @@
GLUON_SITE_FEEDS='ffhb'
PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
PACKAGES_FFHB_COMMIT=d3ec6bba927f755e1a6f43c132aae8c97217bd8d
PACKAGES_FFHB_BRANCH=develop
PACKAGES_FFHB_COMMIT=2efc6fced03e687700c71ce8c067b78a25e4c308

View File

@ -1,9 +1,14 @@
{
site_name = 'Freifunk Bremen',
site_code = 'ffhb',
site_seed = '48a9de099ffe3b2d4410955afd65c33edec2f109a638393b9ee66d837f12c514',
prefix4 = '10.196.0.0/17',
prefix6 = 'fd2f:5119:0f2c::/64',
babel_mesh = { prefix = 'fd2f:5119:0f2d::/64', },
vxlan_id = 4123, -- gluon package bug
timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
ntp_servers = {
@ -22,75 +27,57 @@
ap = {
ssid = 'bremen.freifunk.net',
},
ibss = {
ssid = 'mesh.ffhb.de',
bssid = '32:06:1C:1F:B9:E8',
mcast_rate = 6000,
mesh = {
id = 'babel.ffhb.de',
mcast_rate = 12000,
},
--mesh = {
-- id = 'mesh.ffhb.de',
-- mcast_rate = 6000,
--},
},
wifi5 = {
channel = 44,
ap = {
ssid = 'bremen.freifunk.net',
},
ibss = {
ssid = 'mesh.ffhb.de',
bssid = '32:06:1C:1F:B9:E8',
mcast_rate = 6000,
mesh = {
id = 'babel.ffhb.de',
mcast_rate = 12000,
},
--mesh = {
-- id = 'mesh.ffhb.de',
-- mcast_rate = 6000,
--},
},
next_node = {
name = 'node.ffhb.de',
ip4 = '10.196.0.127',
ip6 = 'fd2f:5119:0f2c::127',
mac = '16:41:95:40:f7:dc',
},
fastd_mesh_vpn = {
dns = {
cacheentries = 5000,
servers = { 'fd2f:5119:0f2c::5', },
},
mesh_vpn = {
mtu = 1280,
fastd = {
methods = {'salsa2012+umac'},
enabled = true,
configurable = true,
mtu = 1280,
groups = {
backbone = {
limit = 1,
peers = {
vpn01 = {
key = 'df444c4366880735d8101ec4e8bcd8288a7e617024c08f0f81027927ba794f9f',
remotes = {'"vpn01.bremen.freifunk.net" port 50000', '"vpn01.ffhb.de" port 50000'},
},
vpn02 = {
key = '93a15a14d85a165b86624c89d69c481043cb60542bfa3d2896615b66a57ab02c',
remotes = {'"vpn02.bremen.freifunk.net" port 50000', '"vpn02.ffhb.de" port 50000'},
},
vpn03 = {
key = '6c16136b58da06e3cc83bc92ef09bb19b7dfa787e390929a0ac0d4bbebddee2b',
remotes = {'"vpn03.bremen.freifunk.net" port 50000', '"vpn03.ffhb.de" port 50000'},
},
vpn05 = {
key = '6cff5957231ca2936aabaa75ae5a7985f4077246b8956273b2ce2da559f344a9',
remotes = {'"vpn05.bremen.freifunk.net" port 50000', '"vpn05.ffhb.de" port 50000'},
},
vpn06 = {
key = '99cb85ea2e6346b52abf5eb5ca824f7f037324d4e476f4f068c48b9da98f30e3',
remotes = {'"vpn06.bremen.freifunk.net" port 50000', '"vpn06.ffhb.de" port 50000'},
},
},
},
},
bandwidth_limit = {
enabled = false,
egress = 1800,
ingress = 14400,
},
groups = {
backbone = {
limit = 1,
peers = {
vpn05 = {
key = '6cff5957231ca2936aabaa75ae5a7985f4077246b8956273b2ce2da559f344a9',
remotes = {'"vpn05.bremen.freifunk.net" port 50001', '"vpn05.ffhb.de" port 50001'},
},
},
},
},
},
},
opkg = {

24
site.mk
View File

@ -1,5 +1,6 @@
GLUON_SITE_PACKAGES := \
gluon-mesh-batman-adv-14 \
gluon-mesh-babel \
gluon-l3roamd \
gluon-respondd \
respondd-module-airtime \
gluon-autoupdater \
@ -9,26 +10,23 @@ GLUON_SITE_PACKAGES := \
gluon-config-mode-mesh-vpn \
gluon-config-mode-geo-location \
gluon-config-mode-contact-info \
gluon-ebtables-filter-multicast \
gluon-ebtables-filter-ra-dhcp \
gluon-ebtables-segment-mld \
gluon-luci-admin \
gluon-luci-autoupdater \
gluon-luci-mesh-vpn-fastd \
gluon-luci-portconfig \
gluon-luci-private-wifi \
gluon-luci-wifi-config \
gluon-web-admin \
gluon-web-autoupdater \
gluon-web-mesh-vpn-fastd \
gluon-web-private-wifi \
gluon-web-wifi-config \
gluon-mesh-vpn-fastd \
gluon-next-node \
gluon-radv-filterd \
gluon-client-bridge \
gluon-radvd \
gluon-setup-mode \
gluon-speedtest \
gluon-status-page \
iputils-ping6 \
tcpdump \
ip-tiny \
iwinfo \
iptables \
firewall \
haveged
# Variables set with ?= can be overwritten from the command line
@ -37,4 +35,4 @@ export GLUON_BRANCH ?= stable
GLUON_PRIORITY ?= 7
GLUON_LANGS ?= en de
GLUON_REGION ?= eu
GLUON_ATH10K_MESH ?= ibss
GLUON_ATH10K_MESH ?= 11s