update to gluon-v2018.2

use freifunkMUC's repo again
add public sign key for krombel
2019-01-11 23:46:51 +01:00 · 2018-12-02 00:37:40 +01:00 · 2018-11-20 00:47:31 +01:00 · 2018-11-19 18:35:49 +01:00 · 2018-11-19 17:19:57 +01:00
7 changed files with 12 additions and 5 deletions
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 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

--- a/domains/ffmuc.conf
+++ b/domains/ffmuc.conf
@@ -49,6 +49,7 @@
  },

  mesh = {
+    vxlan = false, -- legacy support
    batman_adv = {
      gw_sel_class = 3,
    },
--- a/domains/ffmuc_umland.conf
+++ b/domains/ffmuc_umland.conf
@@ -49,6 +49,7 @@
  },

  mesh = {
+    vxlan = false, -- legacy support
    batman_adv = {
      gw_sel_class = 3,
    },
--- a/domains/ffmuc_welcome.conf
+++ b/domains/ffmuc_welcome.conf
@@ -49,6 +49,7 @@
  },

  mesh = {
+    vxlan = false, -- legacy support
    batman_adv = {
      gw_sel_class = 3,
    },
--- a/6
+++ b/6
@@ -1,5 +1,5 @@
 GLUON_SITE_FEEDS='ffmuc'

-PACKAGES_FFMUC_REPO=https://github.com/krombel/gluon-packages.git
-PACKAGES_FFMUC_BRANCH=add_domain-migration-ffmuc
-PACKAGES_FFMUC_COMMIT=d529439a7e9c90a74617158b96e2e538cb777962
+PACKAGES_FFMUC_REPO=https://github.com/freifunkMUC/gluon-packages.git
+PACKAGES_FFMUC_BRANCH=master
+PACKAGES_FFMUC_COMMIT=bfbbaa0b9fba5ff1bf8cda945f6c1e757f038c05
--- a/site.conf
+++ b/site.conf
@@ -40,7 +40,6 @@
  },

  mesh = {
-    vxlan = false, -- legacy support
    batman_adv = {
      gw_sel_class = 3,
    },
@@ -67,6 +66,7 @@
        probability = 0.1,
        good_signatures = 3,
        pubkeys = {
+          '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
@@ -82,6 +82,7 @@
        probability = 0.5,
        good_signatures = 2,
        pubkeys = {
+          '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
--- a/site.mk
+++ b/site.mk
@@ -166,6 +166,9 @@ GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_P

 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
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
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