rm ffmuc-mod for arp and multicast (as now handled per upstream)

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/v2018.1.1/releases/v2017.1.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.1.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.1.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.2.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.2.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.3.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.3.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.4.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.4.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.5.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.5.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.6.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.6.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.7.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/releases/v2017.1.7.html
-     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2017.1.8.html
+     - https://gluon.readthedocs.io/en/v2018.1.1/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/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.1.1
 
 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_umland.conf

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

modules

@@ -2,4 +2,4 @@ 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_COMMIT=d529439a7e9c90a74617158b96e2e538cb777962

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 = {
@@ -40,6 +40,7 @@
   },
 
   mesh = {
+    vxlan = false, -- legacy support
     batman_adv = {
       gw_sel_class = 3,
     },

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 := \