krombel/site-ffmuc
1
0
Fork 0
forked from remote/site-ffmuc
Code Issues 4 Pull Requests 1 Releases Wiki Activity

Compare commits

base: krombel:5a7f4f60c5899798a007aaf15d3e8ad65b144011
Branches Tags
krombel:krombel/v2018.1 krombel:release-v2018.1 krombel:release-v2018.0 krombel:krombel/v2018.0-on2016 krombel:stable krombel:master krombel:site-select-foo krombel:babel-test krombel:new_buildserver_key krombel:experimental krombel:welcome krombel:umland krombel:babel krombel:altdorf
krombel:v2018.0-rc1 krombel:v2018.1-krombel
...
compare: krombel:krombel/v2018.1
Branches Tags
krombel:release-v2018.1 krombel:release-v2018.0 krombel:krombel/v2018.0-on2016 krombel:krombel/v2018.1 krombel:stable krombel:master krombel:site-select-foo krombel:babel-test krombel:new_buildserver_key krombel:experimental krombel:welcome krombel:umland krombel:babel krombel:altdorf
krombel:v2018.0-rc1 krombel:v2018.1-krombel

7 Commits
5a7f4f60c5 ... krombel/v2

Author SHA1 Message Date
Krombel
d7363b2351 update to gluon-v2018.2 2019-01-11 23:46:51 +01:00
Krombel
dec054ea6a use freifunkMUC's repo again 2018-12-02 00:37:40 +01:00
Krombel
ffe3314fb0 add public sign key for krombel 2018-11-20 00:47:31 +01:00
Krombel
7a817220f4 fix vxlan config - disable only for used domains 2018-11-19 18:35:49 +01:00
Krombel
c5a9b2e4f8 set default mesh to ibss (legacy) 2018-11-19 17:19:57 +01:00
Krombel
91211e71ac rm ffmuc-mod for arp and multicast (as now handled per upstream) 2018-11-19 15:15:18 +01:00
Krombel
2586e40966 disable vxlan for legacy support 2018-11-19 15:13:26 +01:00
7 changed files with 12 additions and 6 deletions
Expand all files Collapse all files

2
Makefile
View File

@@ -1,6 +1,6 @@
GLUON_BUILD_DIR := gluon-build GLUON_BUILD_DIR := gluon-build
GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
GLUON_GIT_REF := v2018.1.1 GLUON_GIT_REF := v2018.2
SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key

1
domains/ffmuc.conf
View File

@@ -49,6 +49,7 @@
}, },
mesh = { mesh = {
vxlan = false, -- legacy support
batman_adv = { batman_adv = {
gw_sel_class = 3, gw_sel_class = 3,
}, },

1
domains/ffmuc_umland.conf
View File

@@ -49,6 +49,7 @@
}, },
mesh = { mesh = {
vxlan = false, -- legacy support
batman_adv = { batman_adv = {
gw_sel_class = 3, gw_sel_class = 3,
}, },

1
domains/ffmuc_welcome.conf
View File

@@ -49,6 +49,7 @@
}, },
mesh = { mesh = {
vxlan = false, -- legacy support
batman_adv = { batman_adv = {
gw_sel_class = 3, gw_sel_class = 3,
}, },

6
modules
View File

@@ -1,5 +1,5 @@
GLUON_SITE_FEEDS='ffmuc' GLUON_SITE_FEEDS='ffmuc'
PACKAGES_FFMUC_REPO=https://github.com/krombel/gluon-packages.git PACKAGES_FFMUC_REPO=https://github.com/freifunkMUC/gluon-packages.git
PACKAGES_FFMUC_BRANCH=add_domain-migration-ffmuc PACKAGES_FFMUC_BRANCH=master
PACKAGES_FFMUC_COMMIT=d529439a7e9c90a74617158b96e2e538cb777962 PACKAGES_FFMUC_COMMIT=bfbbaa0b9fba5ff1bf8cda945f6c1e757f038c05

2
site.conf
View File

@@ -66,6 +66,7 @@
probability = 0.1, probability = 0.1,
good_signatures = 3, good_signatures = 3,
pubkeys = { pubkeys = {
'5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
'2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
'7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
'56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
@@ -81,6 +82,7 @@
probability = 0.5, probability = 0.5,
good_signatures = 2, good_signatures = 2,
pubkeys = { pubkeys = {
'5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
'2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
'7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
'56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris

5
site.mk
View File

@@ -16,8 +16,6 @@ GLUON_FEATURES := \
radvd \ radvd \
status-page \ status-page \
config-mode-domain-select \ config-mode-domain-select \
ebtables-filter-arp-ffmuc \
ebtables-filter-multicast-ffmuc \
domain-migration-ffmuc domain-migration-ffmuc
GLUON_SITE_PACKAGES := \ GLUON_SITE_PACKAGES := \
@@ -168,6 +166,9 @@ GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_P
DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d') DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d')
# default to ibss meshing (legacy)
GLUON_WLAN_MESH = ibss
# 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)