add sign key of awlnx

v2017 and later have some changes which causes config loss
when upgraded directly.

This release basically aims to keep the config for a future release
of a current gluon (which then has a better hardware support)

.gitignore

@@ -1 +1,2 @@
 gluon-build
+output

CHANGELOG.md

@@ -1,5 +1,62 @@
 # Freifunk München Firmware Changelog
 
+## v2018.0
+
+ - Updated to Gluon v2016.2.7-3-g35c9f9ae
+   - ar71xx: fix MAC addresses on TP-Link TL-WR1043ND v4
+   - modules: update url to chaos calmer git repository after upstream move
+   - ar71xx: sysupgrade: improve CPE/WBS 210/510 validation
+
+ - Makefile
+   - Enabled firmware with ath10k WLAN driver
+
+## v2017.1
+
+ - Updated to Gluon v2016.2.7
+   - Changes:
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.7.html
+
+## v2017.0
+
+ - Updated to Gluon v2016.2.6 (upstream)
+   - Changes:
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.1.6.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.1.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.2.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.3.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.4.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.5.html
+     - https://gluon.readthedocs.io/en/v2016.2.7/releases/v2016.2.6.html
+ - site.mk
+   - added GLUON_REGION = eu setting
+
+## v2016.0
+ - Updated to Gluon v2016.1.5 (ffmuc fork)
+   - Changes:
+     - https://gluon.readthedocs.org/en/v2016.1/releases/v2016.1.html
+     - https://gluon.readthedocs.org/en/v2016.1.1/releases/v2016.1.1.html
+     - https://gluon.readthedocs.org/en/v2016.1.2/releases/v2016.1.2.html
+     - https://gluon.readthedocs.org/en/v2016.1.3/releases/v2016.1.3.html
+     - https://gluon.readthedocs.org/en/v2016.1.4/releases/v2016.1.4.html
+     - https://gluon.readthedocs.org/en/v2016.1.5/releases/v2016.1.5.html
+     - mesh_no_rebroadcast for mesh-on-wan (8b66da95f1887fc6068a6e9d6b6494c2ff4d2fb4)
+     - preserve wifi channels feature (76a77902e3624167e81ca6e200519468bb66d5f7)
+     - new package tecff-ath9k-broken-wifi-workaround (freifunkmuc/gluon-packages)
+     - added fix for autoupdater (8f5a7c90019085dd8f02f96ab0e7a905f82e1be0)
+ - site.conf
+   - changed MTU size to 1280
+   - due to the decreased MTU fastd can now support IPv6
+ - site.mk
+   - added USB support for various devices
+
+## v2015.7
+ * New stable unified firmware for all segments with site-select feature
+ * Raised required signatures for stable release to 3
+
+## v2015.6.2
+ * Bugfix build for welcome version
+
 ## v2015.6.1
  * Added support of site selection in config mode
  * Switch autoupdater URL back to main firmware repo path

Jenkinsfile

@@ -0,0 +1,51 @@
+def _pipelineNotify(String buildStatus = 'STARTED') {
+    // build status of null means successful
+    buildStatus =  buildStatus ?: 'SUCCESSFUL'
+
+    // Default values
+    def colorName = 'RED'
+    def colorCode = '#FF0000'
+    def subject = "${buildStatus}: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'"
+    def summary = "${subject} (${env.BUILD_URL})"
+
+    // Override default values based on build status
+    if (buildStatus == 'STARTED') {
+        color = 'YELLOW'
+        colorCode = '#FFFF00'
+    } else if (buildStatus == 'SUCCESSFUL') {
+        color = 'GREEN'
+        colorCode = '#00FF00'
+    } else {
+        color = 'RED'
+        colorCode = '#FF0000'
+    }
+
+    try {
+        mattermostSend (color: colorCode, message: summary)
+    }
+    catch (e) {
+        echo 'Unable to sent Mattermost notification'
+    }
+}
+
+node {
+  try {
+      _pipelineNotify()
+
+      stage 'Checkout'
+      checkout scm
+
+      stage 'Build'
+      sh "make V=s"
+
+      stage 'Archive'
+      archive 'output/**/*'
+  }
+  catch (e) {
+      currentBuild.result = "FAILED"
+      throw e
+  }
+  finally {
+      _pipelineNotify(currentBuild.result)
+  }
+}

Makefile

@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
-GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git
+GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := 4268d32a8d70fa734b2d025972c5caca27705142
+GLUON_GIT_REF := 35c9f9aecc5de53324ee61904faa1c5763d61134  # latest v2016.2.x
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
@@ -8,8 +8,11 @@ GLUON_TARGETS ?= \
 	ar71xx-generic \
 	ar71xx-nand \
 	mpc85xx-generic \
+	x86-64 \
 	x86-generic \
-	x86-kvm_guest
+	x86-kvm_guest \
+	brcm2708-bcm2708 \
+	brcm2708-bcm2709
 
 GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
 ifneq (,$(shell git describe --exact-match --tags 2>/dev/null))
@@ -22,7 +25,8 @@ JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
 
 GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
 			GLUON_RELEASE=${GLUON_RELEASE} \
-			GLUON_BRANCH=${GLUON_BRANCH}
+			GLUON_BRANCH=${GLUON_BRANCH} \
+			GLUON_ATH10K_MESH=ibss
 
 all: info
 	${MAKE} manifest
@@ -42,15 +46,15 @@ build: gluon-prepare
 
 manifest: build
 	${GLUON_MAKE} manifest
-	mv ${GLUON_BUILD_DIR}/images .
+	mv ${GLUON_BUILD_DIR}/output .
 
 sign: manifest
-	${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} images/sysupgrade/${GLUON_BRANCH}.manifest
+	${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} output/images/sysupgrade/${GLUON_BRANCH}.manifest
 
 ${GLUON_BUILD_DIR}:
 	git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}
 
-gluon-prepare: images-clean ${GLUON_BUILD_DIR}
+gluon-prepare: output-clean ${GLUON_BUILD_DIR}
 	(cd ${GLUON_BUILD_DIR} \
 	  && git remote set-url origin ${GLUON_GIT_URL} \
 	  && git fetch origin \
@@ -61,7 +65,7 @@ gluon-prepare: images-clean ${GLUON_BUILD_DIR}
 gluon-clean:
 	rm -rf ${GLUON_BUILD_DIR}
 
-images-clean:
+output-clean:
-	rm -rf images
+	rm -rf output
 
-clean: gluon-clean images-clean
+clean: gluon-clean output-clean

README.md

@@ -8,5 +8,5 @@ Check out this repository and execute `make`, i.e. like this:
 
 ## Further Resources
 
-Look at the [site configuration related Gluon documentation](http://gluon.readthedocs.org/en/v2014.3.1/user/site.html)
+Look at the [site configuration related Gluon documentation](https://gluon.readthedocs.io/en/v2016.2.3/user/site.html)
 for information on site configuration options and examples from other communities.

extra/ffmuc.conf

@@ -2,7 +2,10 @@
   hostname_prefix = '',
   site_name = 'Freifunk München',
   site_code = 'ffmuc',
-  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+
+  opkg = {
+    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+  },
 
   prefix4 = '10.80.32.0/19',
   prefix6 = 'fdef:ffc0:4fff::/64',
@@ -15,21 +18,41 @@
   regdom = 'DE',
 
   wifi24 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 6,
-    htmode = 'HT20',
+    ap = {
-    mesh_ssid = 'mesh.ffmuc',
+      ssid = 'muenchen.freifunk.net',
-    mesh_bssid = '02:0E:8E:1E:61:17',
+    },
-    mesh_mcast_rate = 12000,
+    --mesh = {
+    --  id = 'ffmuc-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc',
+      bssid = '02:0E:8E:1E:61:17',
+      mcast_rate = 12000,
+    },
   },
 
   wifi5 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 44,
-    htmode = 'HT40+',
+    ap = {
-    mesh_ssid = 'mesh.ffmuc',
+      ssid = 'muenchen.freifunk.net',
-    mesh_bssid = '02:0E:8E:1E:61:17',
+    },
-    mesh_mcast_rate = 12000,
+    --mesh = {
+    --  id = 'ffmuc-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc',
+      bssid = '02:0E:8E:1E:61:17',
+      mcast_rate = 12000,
+    },
+  },
+
+  mesh = {
+    batman_adv = {
+      gw_sel_class = 3,
+    },
   },
 
   next_node = {
@@ -40,70 +63,54 @@
 
   fastd_mesh_vpn = {
     methods = {'salsa2012+umac'},
-    mtu = 1426,
+    mtu = 1280,
     groups = {
       backbone = {
       limit = 1,
         peers = {
+          gw01 = {
+            key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
+            remotes = {
+              '"gw01.ffmuc.net" port 10001',
+              '"gw01.freifunk-muenchen.de" port 10001',
+            },
+          },
+          gw02 = {
+            key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
+            remotes = {
+              '"gw02.ffmuc.net" port 10001',
+              '"gw02.freifunk-muenchen.de" port 10001',
+            },
+          },
           gw03 = {
             key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
             remotes = {
-              'ipv4 "gw03.ffmuc.net" port 10000',
+              '"gw03.ffmuc.net" port 10001',
-              'ipv4 "gw03.freifunk-muenchen.de" port 10000',
+              '"gw03.freifunk-muenchen.de" port 10001',
             },
           },
           gw04 = {
             key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
             remotes = {
-              'ipv4 "gw04.ffmuc.net" port 10000',
+              '"gw04.ffmuc.net" port 10001',
-              'ipv4 "gw04.freifunk-muenchen.de" port 10000',
+              '"gw04.freifunk-muenchen.de" port 10001',
             },
           },
           gw05 = {
             key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
             remotes = {
-              'ipv4 "gw05.ffmuc.net" port 10000',
+              '"gw05.ffmuc.net" port 10001',
-              'ipv4 "gw05.freifunk-muenchen.de" port 10000',
+              '"gw05.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw06 = {
-            key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
-            remotes = {
-              'ipv4 "gw06.ffmuc.net" port 10000',
-              'ipv4 "gw06.freifunk-muenchen.de" port 10000',
-            },
-          },
-          gw07 = {
-            key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
-            remotes = {
-              'ipv4 "gw07.ffmuc.net" port 10000',
-              'ipv4 "gw07.freifunk-muenchen.de" port 10000',
-            },
-          },
-          gw08 = {
-            key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
-            remotes = {
-              'ipv4 "gw08.ffmuc.net" port 10000',
-              'ipv4 "gw08.freifunk-muenchen.de" port 10000',
-            },
-          },
-          gw09 = {
-            key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
-            remotes = {
-              'ipv4 "gw09.ffmuc.net" port 10000',
-              'ipv4 "gw09.freifunk-muenchen.de" port 10000',
-            },
-          },
-          gw10 = {
-            key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf',
-            remotes = {
-              'ipv4 "gw10.ffmuc.net" port 10000',
-              'ipv4 "gw10.freifunk-muenchen.de" port 10000',
             },
           },
         },
       },
     },
+    bandwidth_limit = {
+      enabled = false,
+      egress = 1500,
+      ingress = 12000,
+    },
   },
 
   autoupdater = {
@@ -117,7 +124,7 @@
           'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
         },
         probability = 0.1,
-        good_signatures = 2,
+        good_signatures = 3,
         pubkeys = {
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
@@ -143,13 +150,5 @@
     },
   },
 
-  simple_tc = {
-    mesh_vpn = {
-      ifname = 'mesh-vpn',
-      enabled = false,
-      limit_egress = 1200,
-      limit_ingress = 12000,
-    },
-  },
 }
 -- vim: set ft=lua:ts=2:sw=2:et

extra/ffmuc_umland.conf

@@ -2,7 +2,10 @@
   hostname_prefix = '',
   site_name = 'Freifunk München Umland',
   site_code = 'ffmuc_umland',
-  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+
+  opkg = {
+    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+  },
 
   prefix4 = '10.80.96.0/19',
   prefix6 = 'fdef:ffc0:4fff:2::/64',
@@ -15,21 +18,41 @@
   regdom = 'DE',
 
   wifi24 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 6,
-    htmode = 'HT20',
+    ap = {
-    mesh_ssid = 'mesh.ffmuc.umland',
+      ssid = 'muenchen.freifunk.net',
-    mesh_bssid = '02:0E:8E:1E:61:19',
+    },
-    mesh_mcast_rate = 12000,
+    --mesh = {
+    --  id = 'ffmuc-umland-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc.umland',
+      bssid = '02:0E:8E:1E:61:19',
+      mcast_rate = 12000,
+    },
   },
 
   wifi5 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 44,
-    htmode = 'HT40+',
+    ap = {
-    mesh_ssid = 'mesh.ffmuc.umland',
+      ssid = 'muenchen.freifunk.net',
-    mesh_bssid = '02:0E:8E:1E:61:19',
+    },
-    mesh_mcast_rate = 12000,
+    --mesh = {
+    --  id = 'ffmuc-umland-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc.umland',
+      bssid = '02:0E:8E:1E:61:19',
+      mcast_rate = 12000,
+    },
+  },
+
+  mesh = {
+    batman_adv = {
+      gw_sel_class = 3,
+    },
   },
 
   next_node = {
@@ -40,7 +63,7 @@
 
   fastd_mesh_vpn = {
     methods = {'salsa2012+umac'},
-    mtu = 1426,
+    mtu = 1280,
     groups = {
       backbone = {
       limit = 1,
@@ -48,41 +71,39 @@
           gwu01 = {
             key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
             remotes = {
-              'ipv4 "gwu01.ffmuc.net" port 10010',
+              '"gwu01.ffmuc.net" port 10015',
-              'ipv4 "gwu01.freifunk-muenchen.de" port 10010',
+              '"gwu01.freifunk-muenchen.de" port 10015',
             },
           },
           gwu02 = {
             key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
             remotes = {
-              'ipv4 "gwu02.ffmuc.net" port 10011',
+              '"gwu02.ffmuc.net" port 10015',
-              'ipv4 "gwu02.freifunk-muenchen.de" port 10011',
+              '"gwu02.freifunk-muenchen.de" port 10015',
             },
           },
           gwu03 = {
             key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
             remotes = {
-              'ipv4 "gwu03.ffmuc.net" port 10012',
+              '"gwu03.ffmuc.net" port 10015',
-              'ipv4 "gwu03.freifunk-muenchen.de" port 10012',
+              '"gwu03.freifunk-muenchen.de" port 10015',
             },
           },
           gwu04 = {
             key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
             remotes = {
-              'ipv4 "gwu04.ffmuc.net" port 10013',
+              '"gwu04.ffmuc.net" port 10015',
-              'ipv4 "gwu04.freifunk-muenchen.de" port 10013',
+              '"gwu04.freifunk-muenchen.de" port 10015',
-            },
-          },
-          gwu05 = {
-            key = 'b6de9fec8569b1fcdea8e7c45224ec30513d24e01af71148c6d640b5df471950',
-            remotes = {
-              'ipv4 "gwu05.ffmuc.net" port 10014',
-              'ipv4 "gwu05.freifunk-muenchen.de" port 10014',
             },
           },
         },
       },
     },
+    bandwidth_limit = {
+      enabled = false,
+      egress = 1500,
+      ingress = 12000,
+    },
   },
 
   autoupdater = {
@@ -96,7 +117,7 @@
           'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
         },
         probability = 0.1,
-        good_signatures = 2,
+        good_signatures = 3,
         pubkeys = {
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
@@ -122,13 +143,5 @@
     },
   },
 
-  simple_tc = {
-    mesh_vpn = {
-      ifname = 'mesh-vpn',
-      enabled = false,
-      limit_egress = 1200,
-      limit_ingress = 12000,
-    },
-  },
 }
 -- vim: set ft=lua:ts=2:sw=2:et

extra/ffmuc_welcome.conf

@@ -2,7 +2,10 @@
   hostname_prefix = 'welcome',
   site_name = 'Freifunk München Welcome',
   site_code = 'ffmuc_welcome',
-  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
+
+  opkg = {
+    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+  },
 
   prefix4 = '10.80.64.0/19',
   prefix6 = 'fdef:ffc0:4fff:1::/64',
@@ -15,21 +18,41 @@
   regdom = 'DE',
 
   wifi24 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 6,
-    htmode = 'HT20',
+    ap = {
-    mesh_ssid = 'mesh.ffmuc.welcome',
+      ssid = 'muenchen.freifunk.net',
-    mesh_bssid = '02:0E:8E:1E:61:18',
+    },
-    mesh_mcast_rate = 12000,
+    --mesh = {
+    --  id = 'ffmuc-welcome-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc.welcome',
+      bssid = '02:0E:8E:1E:61:18',
+      mcast_rate = 12000,
+    },
   },
 
   wifi5 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 44,
-    htmode = 'HT40+',
+    ap = {
-    mesh_ssid = 'mesh.ffmuc.welcome',
+      ssid = 'muenchen.freifunk.net',
-    mesh_bssid = '02:0E:8E:1E:61:18',
+    },
-    mesh_mcast_rate = 12000,
+    --mesh = {
+    --  id = 'ffmuc-welcome-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc.welcome',
+      bssid = '02:0E:8E:1E:61:18',
+      mcast_rate = 12000,
+    },
+  },
+
+  mesh = {
+    batman_adv = {
+      gw_sel_class = 3,
+    },
   },
 
   next_node = {
@@ -40,7 +63,7 @@
 
   fastd_mesh_vpn = {
     methods = {'salsa2012+umac'},
-    mtu = 1426,
+    mtu = 1280,
     groups = {
       backbone = {
       limit = 1,
@@ -48,34 +71,39 @@
           gwf01 = {
             key = '89951ed50d591c0a4682ae50cb38806efe44dd736ba91ef64c9ef06b20ec186e',
             remotes = {
-              'ipv4 "gwf01.ffmuc.net" port 11000',
+              '"gwf01.ffmuc.net" port 11001',
-              'ipv4 "gwf01.freifunk-muenchen.de" port 11000',
+              '"gwf01.freifunk-muenchen.de" port 11001',
             },
           },
           gwf02 = {
             key = 'e255f2671c56f28a65173719be61939e5d48518eaa4da0d19283fd5395908e35',
             remotes = {
-              'ipv4 "gwf02.ffmuc.net" port 11000',
+              '"gwf02.ffmuc.net" port 11001',
-              'ipv4 "gwf02.freifunk-muenchen.de" port 11001',
+              '"gwf02.freifunk-muenchen.de" port 11001',
             },
           },
           gwf03 = {
             key = 'bf16080ab05a4416285638208e6f17055ea8f92cfd496c61eee1f1160cf6d386',
             remotes = {
-              'ipv4 "gwf03.ffmuc.net" port 11000',
+              '"gwf03.ffmuc.net" port 11001',
-              'ipv4 "gwf03.freifunk-muenchen.de" port 11002',
+              '"gwf03.freifunk-muenchen.de" port 11001',
             },
           },
           gwf04 = {
             key = '421a2c8e78f86d08fa7c8c7660b0dc073640ff365acb308ab92155c33488c539',
             remotes = {
-              'ipv4 "gwf04.ffmuc.net" port 11000',
+              '"gwf04.ffmuc.net" port 11001',
-              'ipv4 "gwf04.freifunk-muenchen.de" port 11003',
+              '"gwf04.freifunk-muenchen.de" port 11001',
             },
           },
         },
       },
     },
+    bandwidth_limit = {
+      enabled = false,
+      egress = 1500,
+      ingress = 12000,
+    },
   },
 
   autoupdater = {
@@ -89,7 +117,7 @@
           'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
         },
         probability = 0.1,
-        good_signatures = 2,
+        good_signatures = 3,
         pubkeys = {
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
@@ -115,13 +143,5 @@
     },
   },
 
-  simple_tc = {
-    mesh_vpn = {
-      ifname = 'mesh-vpn',
-      enabled = false,
-      limit_egress = 1200,
-      limit_ingress = 12000,
-    },
-  },
 }
 -- vim: set ft=lua:ts=2:sw=2:et

i18n/de.po

@@ -18,6 +18,7 @@ msgstr ""
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
+" "
 
 msgid "gluon-config-mode:reboot"
 msgstr ""

i18n/en.po

@@ -17,6 +17,7 @@ msgstr ""
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
+" "
 
 msgid "gluon-config-mode:reboot"
 msgstr ""

modules

@@ -1,4 +1,5 @@
-GLUON_SITE_FEEDS='ffmuc_packages'
+GLUON_SITE_FEEDS='ffmuc'
 
-PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/freifunkMUC/gluon-packages.git
+PACKAGES_FFMUC_REPO=https://github.com/freifunkMUC/gluon-packages.git
-PACKAGES_FFMUC_PACKAGES_COMMIT=985bfad86005c7a9f754ddc8432d88641d8183b3
+PACKAGES_FFMUC_BRANCH=pre-new-segments
+PACKAGES_FFMUC_COMMIT=30e645af484633893e63bf8daa19da6954b15029

site.conf

@@ -1,11 +1,14 @@
 {
   hostname_prefix = '',
-  site_name = 'Freifunk München Umland',
+  site_name = 'Freifunk München',
-  site_code = 'ffmuc_umland',
+  site_code = 'ffmuc',
-  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
 
-  prefix4 = '10.80.96.0/19',
+  opkg = {
-  prefix6 = 'fdef:ffc0:4fff:2::/64',
+    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
+  },
+
+  prefix4 = '10.80.32.0/19',
+  prefix6 = 'fdef:ffc0:4fff::/64',
 
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
   ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
@@ -15,74 +18,99 @@
   regdom = 'DE',
 
   wifi24 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 6,
-    htmode = 'HT20',
+    ap = {
-    mesh_ssid = 'mesh.ffmuc.umland',
+      ssid = 'muenchen.freifunk.net',
-    mesh_bssid = '02:0E:8E:1E:61:19',
+    },
-    mesh_mcast_rate = 12000,
+    --mesh = {
+    --  id = 'ffmuc-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc',
+      bssid = '02:0E:8E:1E:61:17',
+      mcast_rate = 12000,
+    },
   },
 
   wifi5 = {
-    ssid = 'muenchen.freifunk.net',
     channel = 44,
-    htmode = 'HT40+',
+    ap = {
-    mesh_ssid = 'mesh.ffmuc.umland',
+      ssid = 'muenchen.freifunk.net',
-    mesh_bssid = '02:0E:8E:1E:61:19',
+    },
-    mesh_mcast_rate = 12000,
+    --mesh = {
+    --  id = 'ffmuc-mesh',
+    --  mcast_rate = 12000,
+    --},
+    ibss = {
+      ssid = 'mesh.ffmuc',
+      bssid = '02:0E:8E:1E:61:17',
+      mcast_rate = 12000,
+    },
+  },
+
+  mesh = {
+    batman_adv = {
+      gw_sel_class = 3,
+    },
   },
 
   next_node = {
-    ip4 = '10.80.96.1',
+    ip4 = '10.80.32.1',
-    ip6 = 'fdef:ffc0:4fff:2::1',
+    ip6 = 'fdef:ffc0:4fff::1',
     mac = '16:41:95:40:f7:dc',
   },
 
   fastd_mesh_vpn = {
     methods = {'salsa2012+umac'},
-    mtu = 1426,
+    mtu = 1280,
     groups = {
       backbone = {
       limit = 1,
         peers = {
-          gwu01 = {
+          gw01 = {
-            key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
+            key = '8ddaa67325583c64adf6e60cbe78e3436e5765fd0a2a632fae9e0ad68c855803',
             remotes = {
-              'ipv4 "gwu01.ffmuc.net" port 10010',
+              '"gw01.ffmuc.net" port 10001',
-              'ipv4 "gwu01.freifunk-muenchen.de" port 10010',
+              '"gw01.freifunk-muenchen.de" port 10001',
             },
           },
-          gwu02 = {
+          gw02 = {
-            key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
+            key = 'b860304fce2e0a701d4c13fa5e01f08832291a5c85d11e191639b9276ab53a45',
             remotes = {
-              'ipv4 "gwu02.ffmuc.net" port 10011',
+              '"gw02.ffmuc.net" port 10001',
-              'ipv4 "gwu02.freifunk-muenchen.de" port 10011',
+              '"gw02.freifunk-muenchen.de" port 10001',
             },
           },
-          gwu03 = {
+          gw03 = {
-            key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
+            key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
             remotes = {
-              'ipv4 "gwu03.ffmuc.net" port 10012',
+              '"gw03.ffmuc.net" port 10001',
-              'ipv4 "gwu03.freifunk-muenchen.de" port 10012',
+              '"gw03.freifunk-muenchen.de" port 10001',
             },
           },
-          gwu04 = {
+          gw04 = {
-            key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
+            key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
             remotes = {
-              'ipv4 "gwu04.ffmuc.net" port 10013',
+              '"gw04.ffmuc.net" port 10001',
-              'ipv4 "gwu04.freifunk-muenchen.de" port 10013',
+              '"gw04.freifunk-muenchen.de" port 10001',
             },
           },
-          gwu05 = {
+          gw05 = {
-            key = 'b6de9fec8569b1fcdea8e7c45224ec30513d24e01af71148c6d640b5df471950',
+            key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
             remotes = {
-              'ipv4 "gwu05.ffmuc.net" port 10014',
+              '"gw05.ffmuc.net" port 10001',
-              'ipv4 "gwu05.freifunk-muenchen.de" port 10014',
+              '"gw05.freifunk-muenchen.de" port 10001',
             },
           },
         },
       },
     },
+    bandwidth_limit = {
+      enabled = false,
+      egress = 1500,
+      ingress = 12000,
+    },
   },
 
   autoupdater = {
@@ -96,8 +124,10 @@
           'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
         },
         probability = 0.1,
-        good_signatures = 2,
+        good_signatures = 3,
         pubkeys = {
+          '6dcfc670a4150e16962c1852066669d9b337f168d0f6a863ed930968c2f047eb', -- awlnx
+          '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
@@ -113,6 +143,8 @@
         probability = 0.5,
         good_signatures = 2,
         pubkeys = {
+          '6dcfc670a4150e16962c1852066669d9b337f168d0f6a863ed930968c2f047eb', -- awlnx
+          '5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
@@ -122,13 +154,5 @@
     },
   },
 
-  simple_tc = {
-    mesh_vpn = {
-      ifname = 'mesh-vpn',
-      enabled = false,
-      limit_egress = 1200,
-      limit_ingress = 12000,
-    },
-  },
 }
 -- vim: set ft=lua:ts=2:sw=2:et

site.mk

@@ -1,7 +1,6 @@
 GLUON_SITE_PACKAGES := \
 	gluon-mesh-batman-adv-15 \
-	gluon-alfred \
+	gluon-respondd \
-	gluon-announced \
 	gluon-autoupdater \
 	gluon-config-mode-core \
 	gluon-config-mode-autoupdater \
@@ -26,7 +25,147 @@ GLUON_SITE_PACKAGES := \
 	iptables \
 	haveged \
 	gluon-ebtables-filter-arp-ffmuc \
-	gluon-ebtables-filter-multicast-ffmuc
+	gluon-ebtables-filter-multicast-ffmuc \
+	tecff-ath9k-broken-wifi-workaround \
+	tecff-respondd-watchdog
+
+# basic support for USB stack
+USB_PACKAGES_BASIC := \
+	kmod-usb-core \
+	kmod-usb2
+
+# storage support for USB devices
+USB_PACKAGES_STORAGE := \
+	block-mount \
+	blkid \
+	kmod-fs-ext4 \
+	kmod-fs-vfat \
+	kmod-usb-storage \
+	kmod-usb-storage-extras \
+	kmod-nls-cp1250 \
+	kmod-nls-cp1251 \
+	kmod-nls-cp437 \
+	kmod-nls-cp775 \
+	kmod-nls-cp850 \
+	kmod-nls-cp852 \
+	kmod-nls-cp866 \
+	kmod-nls-iso8859-1 \
+	kmod-nls-iso8859-13 \
+	kmod-nls-iso8859-15 \
+	kmod-nls-iso8859-2 \
+	kmod-nls-koi8r \
+	kmod-nls-utf8 \
+	swap-utils
+
+# network support for USB devices
+USB_PACKAGES_NET := \
+	kmod-mii \
+	kmod-nls-base \
+	kmod-usb-net \
+	kmod-usb-net-asix \
+	kmod-usb-net-asix-ax88179 \
+	kmod-usb-net-cdc-eem \
+	kmod-usb-net-cdc-ether \
+	kmod-usb-net-cdc-mbim \
+	kmod-usb-net-cdc-ncm \
+	kmod-usb-net-cdc-subset \
+	kmod-usb-net-dm9601-ether \
+	kmod-usb-net-hso \
+	kmod-usb-net-huawei-cdc-ncm \
+	kmod-usb-net-ipheth \
+	kmod-usb-net-kalmia \
+	kmod-usb-net-kaweth \
+	kmod-usb-net-mcs7830 \
+	kmod-usb-net-pegasus \
+	kmod-usb-net-qmi-wwan \
+	kmod-usb-net-rndis \
+	kmod-usb-net-sierrawireless \
+	kmod-usb-net-smsc95xx
+# broken
+#	kmod-usb-net-rtl8150 \
+#	kmod-usb-net-rtl8152 \
+
+# network support for PCI devices
+PCI_PACKAGES_NET := \
+	kmod-3c59x \
+	kmod-e100 \
+	kmod-e1000 \
+	kmod-e1000e \
+	kmod-forcedeth \
+	kmod-natsemi \
+	kmod-ne2k-pci \
+	kmod-pcnet32 \
+	kmod-r8169 \
+	kmod-sis900 \
+	kmod-sky2 \
+	kmod-tg3 \
+	kmod-tulip \
+	kmod-via-rhine
+# broken
+#	kmod-ixgbe \
+#	kmod-r8139too \
+
+# additional packages
+TOOLS_PACKAGES := \
+	iperf \
+	socat \
+	tcpdump \
+	usbutils \
+	vnstat
+# broken
+#	pciutils \
+
+#
+# $(GLUON_TARGET) specific settings:
+#
+
+# x86-generic
+ifeq ($(GLUON_TARGET),x86-generic)
+# support the usb stack on x86 devices
+# and add a few common USB and PCI NICs
+GLUON_SITE_PACKAGES += \
+	kmod-usb-hid \
+	kmod-hid-generic \
+	$(USB_PACKAGES_BASIC) \
+	$(USB_PACKAGES_STORAGE) \
+	$(USB_PACKAGES_NET) \
+	$(PCI_PACKAGES_NET) \
+	$(TOOLS_PACKAGES)
+endif
+
+# x86-64
+ifeq ($(GLUON_TARGET),x86-64)
+# support the usb stack on x86-64 devices
+# and add a few common USB and PCI NICs
+GLUON_SITE_PACKAGES += \
+	kmod-usb-hid \
+	kmod-hid-generic \
+	$(USB_PACKAGES_BASIC) \
+	$(USB_PACKAGES_STORAGE) \
+	$(USB_PACKAGES_NET) \
+	$(PCI_PACKAGES_NET) \
+	$(TOOLS_PACKAGES)
+endif
+
+ifeq ($(GLUON_TARGET),x86-kvm_guest)
+GLUON_SITE_PACKAGES += \
+	$(TOOLS_PACKAGES)
+endif
+
+# ar71xx-generic
+GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+GLUON_TLWR2543_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+GLUON_TLWDR4300_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+GLUON_WNDR3700_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+GLUON_WRT160NL_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+GLUON_ARCHERC7_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+GLUON_GLINET_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+GLUON_WZRHPG450H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+GLUON_WZRHPAG300H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
+
+# mpc85xx-generic
+GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
 
 
 DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d')
@@ -38,3 +177,5 @@ GLUON_PRIORITY ?= 0
 
 # Languages to include
 GLUON_LANGS ?= en de
+
+GLUON_REGION := eu