update to gluon-v2018.2

CHANGELOG.md

@@ -1,18 +1,24 @@
 # Freifunk München Firmware Changelog
 
 ## v2018.1
- - Updated to Gluon v2018.1
+ - Updated to Gluon v2018.1.1
    - Changes:
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.1.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.2.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.3.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.4.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.5.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.6.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.7.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.8.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2018.1.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.1.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.2.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.3.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.4.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.5.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.6.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.7.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.8.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2018.1.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2018.1.1.html
+ - site.conf
+   - use multidomain config
+   - update translations (de,en) and added french
+   - use GLUON_FEATURES
+   - use GLUON_FEATURE web-wizard to have less packages
 
 ## v2017.1
 

Makefile

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

README.md

@@ -12,3 +12,7 @@ make
 
 Look at the [site configuration related Gluon documentation](https://gluon.readthedocs.io/en/v2017.1.x/user/site.html)
 for information on site configuration options and examples from other communities.
+
+## Builds
+
+Currently builds of this repo are provided at https://ffmuc.krombel.de

domains/ffbay_dah.conf

@@ -37,7 +37,7 @@
       ssid = 'muenchen.freifunk.net',
     },
     mesh = {
-      id = 'ffmuc-mesh',
+      id = 'ffmuc-umland-mesh',
       mcast_rate = 12000,
       disabled = true,
     },

domains/ffbay_ebe.conf

@@ -37,7 +37,7 @@
       ssid = 'muenchen.freifunk.net',
     },
     mesh = {
-      id = 'ffmuc-mesh',
+      id = 'ffmuc-umland-mesh',
       mcast_rate = 12000,
       disabled = true,
     },

domains/ffbay_ed.conf

@@ -37,7 +37,7 @@
       ssid = 'muenchen.freifunk.net',
     },
     mesh = {
-      id = 'ffmuc-mesh',
+      id = 'ffmuc-umland-mesh',
       mcast_rate = 12000,
       disabled = true,
     },

domains/ffbay_ffb.conf

@@ -37,7 +37,7 @@
       ssid = 'muenchen.freifunk.net',
     },
     mesh = {
-      id = 'ffmuc-mesh',
+      id = 'ffmuc-umland-mesh',
       mcast_rate = 12000,
       disabled = true,
     },

domains/ffbay_fs.conf

@@ -37,7 +37,7 @@
       ssid = 'muenchen.freifunk.net',
     },
     mesh = {
-      id = 'ffmuc-mesh',
+      id = 'ffmuc-umland-mesh',
       mcast_rate = 12000,
       disabled = true,
     },

domains/ffbay_sta.conf

@@ -37,7 +37,7 @@
       ssid = 'muenchen.freifunk.net',
     },
     mesh = {
-      id = 'ffmuc-mesh',
+      id = 'ffmuc-umland-mesh',
       mcast_rate = 12000,
       disabled = true,
     },

domains/ffbay_tol.conf

@@ -37,7 +37,7 @@
       ssid = 'muenchen.freifunk.net',
     },
     mesh = {
-      id = 'ffmuc-mesh',
+      id = 'ffmuc-umland-mesh',
       mcast_rate = 12000,
       disabled = true,
     },

domains/ffmuc.conf

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

domains/ffmuc_umland.conf

@@ -37,7 +37,7 @@
       ssid = 'muenchen.freifunk.net',
     },
     mesh = {
-      id = 'ffmuc-mesh',
+      id = 'ffmuc-umland-mesh',
       mcast_rate = 12000,
       disabled = true,
     },
@@ -49,6 +49,7 @@
   },
 
   mesh = {
+    vxlan = false, -- legacy support
     batman_adv = {
       gw_sel_class = 3,
     },

domains/ffmuc_welcome.conf

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

modules

@@ -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=d3e97b8b08f253b024d8aac29df217c065fd59c6
+PACKAGES_FFMUC_REPO=https://github.com/freifunkMUC/gluon-packages.git
+PACKAGES_FFMUC_BRANCH=master
+PACKAGES_FFMUC_COMMIT=bfbbaa0b9fba5ff1bf8cda945f6c1e757f038c05

site.conf

@@ -2,7 +2,7 @@
   hostname_prefix = 'ffmuc-',
   site_name = 'Freifunk München',
   site_code = 'ffmuc',
-  default_domain = 'ffmuc_welcome',
+  default_domain = 'ffmuc',
 
   opkg = {
     extra = {
@@ -66,6 +66,7 @@
         probability = 0.1,
         good_signatures = 3,
         pubkeys = {
+          '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
@@ -81,6 +82,7 @@
         probability = 0.5,
         good_signatures = 2,
         pubkeys = {
+          '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris

site.mk

@@ -16,8 +16,6 @@ GLUON_FEATURES := \
 	radvd \
 	status-page \
 	config-mode-domain-select \
-	ebtables-filter-arp-ffmuc \
-	ebtables-filter-multicast-ffmuc \
 	domain-migration-ffmuc
 
 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 to ibss meshing (legacy)
+GLUON_WLAN_MESH = ibss
+
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)