Merge pull request #48 from freifunk-ffm/next

v4.1 Stable (BATMAN 15 only)

README.md

@@ -1,5 +1,13 @@
 ## Stable-Version der Frankfurter Freifunkfirmware
 
+### v4.1-stable-0103
+- Erstellt am 03.01.2019
+- Nur noch ein BATMAN15-Netz
+- "ffffm-keep-radio-channel" entfernt, siehe https://gluon.readthedocs.io/en/v2019.1.x/releases/v2019.1.html#outdoor-mode
+- Update NTP-Server
+- Angabe der "mcast_rate" für stabileres Mesh
+- Basis ist Gluon [v2019.1](https://gluon.readthedocs.io/en/v2019.1/)
+
 ### v4.0-stable-1210
 - Erstellt am 10.12.2019
 - Migriert legacybat_11s auf ffffm_singledomain

site.conf

@@ -2,19 +2,27 @@
   hostname_prefix = 'Postleitzahl-',
   site_name = 'Freifunk Frankfurt',
   site_code = 'ffffm',
-  default_domain = 'legacybat_11s',
+  default_domain = 'ffffm_singledomain',
 
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
-  ntp_servers = {'ntp.services.ffffm.net', 'ntp2.services.ffffm.net'},
+  ntp_servers = {'ntp.services.ffffm.net', 'ntp.aixit.services.ffffm.net', 'ntp.esh1.services.ffffm.net'},
   regdom = 'DE',
 
   wifi24 = {
     channel = 1,
+
+    mesh = {
+      mcast_rate = 12000,
+    },
   },
 
   wifi5 = {
     channel = 44,
     outdoor_chanlist = '100-140',
+
+    mesh = {
+      mcast_rate = 12000,
+    },
   },
 
   dns = {

site.mk

@@ -4,19 +4,16 @@ GLUON_FEATURES := \
 	ebtables-filter-multicast \
 	ebtables-filter-ra-dhcp \
 	ebtables-source-filter \
-	mesh-batman-adv-14 \
 	mesh-batman-adv-15 \
 	mesh-vpn-fastd \
 	radv-filterd \
 	respondd \
 	status-page \
 	web-wizard \
-	scheduled-domain-switch \
 
 GLUON_SITE_PACKAGES := \
 	iwinfo \
 	haveged \
-	ffffm-keep-radio-channel \
 	ffffm-button-bind \
 	respondd-module-airtime \
 
@@ -30,7 +27,7 @@ GLUON_MULTIDOMAIN := 1
 # This is the Stable branch
 
 # Gluon Base Release
-DEFAULT_GLUON_RELEASE := v4.0
+DEFAULT_GLUON_RELEASE := v4.1
 
 # Development branch information
 GLUON_BRANCH ?= stable