Switch autoupdater URL back to main firmware repo path

Release 2015.6.1
using our own gluon-config-site-select module
2015-10-14 21:14:16 +02:00 · 2015-10-14 19:40:58 +02:00 · 2015-10-11 15:16:09 +02:00 · 2015-10-05 12:33:50 +02:00 · 2015-10-04 15:36:16 +02:00 · 2015-10-04 09:02:34 +02:00
13 changed files with 165 additions and 444 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
 gluon-build
-output
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,29 +1,5 @@
 # Freifunk München Firmware Changelog

-## v2016.1 (not released yet)
- - 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)
- - site.conf
-   - disabled IPv4-only fastd
-   - Changed MTU size to 1280
- - 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
--- a/10
+++ b/10
@@ -1,10 +0,0 @@
-node {
-  stage 'Checkout'
-  checkout scm
-  
-  stage 'Build'
-  sh "make sign V=s"
-  
-  stage 'Archive'
-  archive 'output/**/*'
-}
--- a/17
+++ b/17
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
-GLUON_GIT_URL := https://github.com/freifunkmuc/gluon.git
-GLUON_GIT_REF := 26b13e6c18bdb553413a1d9643dc48c2c4849191
+GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git
+GLUON_GIT_REF := 4268d32a8d70fa734b2d025972c5caca27705142

 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key

@@ -8,7 +8,6 @@ GLUON_TARGETS ?= \
 	ar71xx-generic \
 	ar71xx-nand \
 	mpc85xx-generic \
-	x86-64 \
 	x86-generic \
 	x86-kvm_guest

@@ -43,15 +42,15 @@ build: gluon-prepare

 manifest: build
 	${GLUON_MAKE} manifest
-	mv ${GLUON_BUILD_DIR}/output .
+	mv ${GLUON_BUILD_DIR}/images .

 sign: manifest
-	${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} output/images/sysupgrade/${GLUON_BRANCH}.manifest
+	${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} images/sysupgrade/${GLUON_BRANCH}.manifest

 ${GLUON_BUILD_DIR}:
 	git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}

-gluon-prepare: output-clean ${GLUON_BUILD_DIR}
+gluon-prepare: images-clean ${GLUON_BUILD_DIR}
 	(cd ${GLUON_BUILD_DIR} \
 	  && git remote set-url origin ${GLUON_GIT_URL} \
 	  && git fetch origin \
@@ -62,7 +61,7 @@ gluon-prepare: output-clean ${GLUON_BUILD_DIR}
 gluon-clean:
 	rm -rf ${GLUON_BUILD_DIR}

-output-clean:
-	rm -rf output
+images-clean:
+	rm -rf images

-clean: gluon-clean output-clean
+clean: gluon-clean images-clean
--- a/README.md
+++ b/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/v2016.1/user/site.html)
+Look at the [site configuration related Gluon documentation](http://gluon.readthedocs.org/en/v2014.3.1/user/site.html)
 for information on site configuration options and examples from other communities.
--- a/extra/ffmuc.conf
+++ b/extra/ffmuc.conf
@@ -2,10 +2,7 @@
  hostname_prefix = '',
  site_name = 'Freifunk München',
  site_code = 'ffmuc',
-
-  opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
-  },
+  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',

  prefix4 = '10.80.32.0/19',
  prefix6 = 'fdef:ffc0:4fff::/64',
@@ -18,41 +15,21 @@
  regdom = 'DE',

  wifi24 = {
-    channel = 6,
-    ap = {
    ssid = 'muenchen.freifunk.net',
-    },
-    --mesh = {
-    --  id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
-    --},
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
+    channel = 6,
+    htmode = 'HT20',
+    mesh_ssid = 'mesh.ffmuc',
+    mesh_bssid = '02:0E:8E:1E:61:17',
+    mesh_mcast_rate = 12000,
  },

  wifi5 = {
-    channel = 44,
-    ap = {
    ssid = 'muenchen.freifunk.net',
-    },
-    --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,
-    },
+    channel = 44,
+    htmode = 'HT40+',
+    mesh_ssid = 'mesh.ffmuc',
+    mesh_bssid = '02:0E:8E:1E:61:17',
+    mesh_mcast_rate = 12000,
  },

  next_node = {
@@ -63,7 +40,7 @@

  fastd_mesh_vpn = {
    methods = {'salsa2012+umac'},
-    mtu = 1280,
+    mtu = 1426,
    groups = {
      backbone = {
      limit = 1,
@@ -71,67 +48,62 @@
          gw03 = {
            key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
            remotes = {
-              '"gw03.ffmuc.net" port 10001',
-              '"gw03.freifunk-muenchen.de" port 10001',
+              'ipv4 "gw03.ffmuc.net" port 10000',
+              'ipv4 "gw03.freifunk-muenchen.de" port 10000',
            },
          },
          gw04 = {
            key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
            remotes = {
-              '"gw04.ffmuc.net" port 10001',
-              '"gw04.freifunk-muenchen.de" port 10001',
+              'ipv4 "gw04.ffmuc.net" port 10000',
+              'ipv4 "gw04.freifunk-muenchen.de" port 10000',
            },
          },
          gw05 = {
            key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
            remotes = {
-              '"gw05.ffmuc.net" port 10001',
-              '"gw05.freifunk-muenchen.de" port 10001',
+              'ipv4 "gw05.ffmuc.net" port 10000',
+              'ipv4 "gw05.freifunk-muenchen.de" port 10000',
            },
          },
          gw06 = {
            key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
            remotes = {
-              '"gw06.ffmuc.net" port 10001',
-              '"gw06.freifunk-muenchen.de" port 10001',
+              'ipv4 "gw06.ffmuc.net" port 10000',
+              'ipv4 "gw06.freifunk-muenchen.de" port 10000',
            },
          },
          gw07 = {
            key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
            remotes = {
-              '"gw07.ffmuc.net" port 10001',
-              '"gw07.freifunk-muenchen.de" port 10001',
+              'ipv4 "gw07.ffmuc.net" port 10000',
+              'ipv4 "gw07.freifunk-muenchen.de" port 10000',
            },
          },
          gw08 = {
            key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
            remotes = {
-              '"gw08.ffmuc.net" port 10001',
-              '"gw08.freifunk-muenchen.de" port 10001',
+              'ipv4 "gw08.ffmuc.net" port 10000',
+              'ipv4 "gw08.freifunk-muenchen.de" port 10000',
            },
          },
          gw09 = {
            key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
            remotes = {
-              '"gw09.ffmuc.net" port 10001',
-              '"gw09.freifunk-muenchen.de" port 10001',
+              'ipv4 "gw09.ffmuc.net" port 10000',
+              'ipv4 "gw09.freifunk-muenchen.de" port 10000',
            },
          },
          gw10 = {
            key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf',
            remotes = {
-              '"gw10.ffmuc.net" port 10001',
-              '"gw10.freifunk-muenchen.de" port 10001',
+              'ipv4 "gw10.ffmuc.net" port 10000',
+              'ipv4 "gw10.freifunk-muenchen.de" port 10000',
            },
          },
        },
      },
    },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
-    },
  },

  autoupdater = {
@@ -145,12 +117,12 @@
          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
        },
        probability = 0.1,
-        good_signatures = 3,
+        good_signatures = 2,
        pubkeys = {
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
        },
      },
      experimental = {
@@ -165,11 +137,19 @@
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
        },
      },
    },
  },

+  simple_tc = {
+    mesh_vpn = {
+      ifname = 'mesh-vpn',
+      enabled = false,
+      limit_egress = 1200,
+      limit_ingress = 12000,
+    },
+  },
 }
 -- vim: set ft=lua:ts=2:sw=2:et
--- a/extra/ffmuc_umland.conf
+++ b/extra/ffmuc_umland.conf
@@ -2,10 +2,7 @@
  hostname_prefix = '',
  site_name = 'Freifunk München Umland',
  site_code = 'ffmuc_umland',
-
-  opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
-  },
+  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',

  prefix4 = '10.80.96.0/19',
  prefix6 = 'fdef:ffc0:4fff:2::/64',
@@ -18,41 +15,21 @@
  regdom = 'DE',

  wifi24 = {
-    channel = 6,
-    ap = {
    ssid = 'muenchen.freifunk.net',
-    },
-    --mesh = {
-    --  id = 'ffmuc-umland-mesh',
-    --  mcast_rate = 12000,
-    --},
-    ibss = {
-      ssid = 'mesh.ffmuc.umland',
-      bssid = '02:0E:8E:1E:61:19',
-      mcast_rate = 12000,
-    },
+    channel = 6,
+    htmode = 'HT20',
+    mesh_ssid = 'mesh.ffmuc.umland',
+    mesh_bssid = '02:0E:8E:1E:61:19',
+    mesh_mcast_rate = 12000,
  },

  wifi5 = {
-    channel = 44,
-    ap = {
    ssid = 'muenchen.freifunk.net',
-    },
-    --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,
-    },
+    channel = 44,
+    htmode = 'HT40+',
+    mesh_ssid = 'mesh.ffmuc.umland',
+    mesh_bssid = '02:0E:8E:1E:61:19',
+    mesh_mcast_rate = 12000,
  },

  next_node = {
@@ -63,7 +40,7 @@

  fastd_mesh_vpn = {
    methods = {'salsa2012+umac'},
-    mtu = 1280,
+    mtu = 1426,
    groups = {
      backbone = {
      limit = 1,
@@ -71,46 +48,41 @@
          gwu01 = {
            key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
            remotes = {
-              '"gwu01.ffmuc.net" port 10015',
-              '"gwu01.freifunk-muenchen.de" port 10015',
+              'ipv4 "gwu01.ffmuc.net" port 10010',
+              'ipv4 "gwu01.freifunk-muenchen.de" port 10010',
            },
          },
          gwu02 = {
            key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
            remotes = {
-              '"gwu02.ffmuc.net" port 10015',
-              '"gwu02.freifunk-muenchen.de" port 10015',
+              'ipv4 "gwu02.ffmuc.net" port 10011',
+              'ipv4 "gwu02.freifunk-muenchen.de" port 10011',
            },
          },
          gwu03 = {
            key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
            remotes = {
-              '"gwu03.ffmuc.net" port 10015',
-              '"gwu03.freifunk-muenchen.de" port 10015',
+              'ipv4 "gwu03.ffmuc.net" port 10012',
+              'ipv4 "gwu03.freifunk-muenchen.de" port 10012',
            },
          },
          gwu04 = {
            key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
            remotes = {
-              '"gwu04.ffmuc.net" port 10015',
-              '"gwu04.freifunk-muenchen.de" port 10015',
+              'ipv4 "gwu04.ffmuc.net" port 10013',
+              'ipv4 "gwu04.freifunk-muenchen.de" port 10013',
            },
          },
          gwu05 = {
            key = 'b6de9fec8569b1fcdea8e7c45224ec30513d24e01af71148c6d640b5df471950',
            remotes = {
-              '"gwu05.ffmuc.net" port 10015',
-              '"gwu05.freifunk-muenchen.de" port 10015',
+              'ipv4 "gwu05.ffmuc.net" port 10014',
+              'ipv4 "gwu05.freifunk-muenchen.de" port 10014',
            },
          },
        },
      },
    },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
-    },
  },

  autoupdater = {
@@ -124,12 +96,12 @@
          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
        },
        probability = 0.1,
-        good_signatures = 3,
+        good_signatures = 2,
        pubkeys = {
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
        },
      },
      experimental = {
@@ -144,11 +116,19 @@
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
        },
      },
    },
  },

+  simple_tc = {
+    mesh_vpn = {
+      ifname = 'mesh-vpn',
+      enabled = false,
+      limit_egress = 1200,
+      limit_ingress = 12000,
+    },
+  },
 }
 -- vim: set ft=lua:ts=2:sw=2:et
--- a/extra/ffmuc_welcome.conf
+++ b/extra/ffmuc_welcome.conf
@@ -2,10 +2,7 @@
  hostname_prefix = 'welcome',
  site_name = 'Freifunk München Welcome',
  site_code = 'ffmuc_welcome',
-
-  opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
-  },
+  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',

  prefix4 = '10.80.64.0/19',
  prefix6 = 'fdef:ffc0:4fff:1::/64',
@@ -18,41 +15,21 @@
  regdom = 'DE',

  wifi24 = {
-    channel = 6,
-    ap = {
    ssid = 'muenchen.freifunk.net',
-    },
-    --mesh = {
-    --  id = 'ffmuc-welcome-mesh',
-    --  mcast_rate = 12000,
-    --},
-    ibss = {
-      ssid = 'mesh.ffmuc.welcome',
-      bssid = '02:0E:8E:1E:61:18',
-      mcast_rate = 12000,
-    },
+    channel = 6,
+    htmode = 'HT20',
+    mesh_ssid = 'mesh.ffmuc.welcome',
+    mesh_bssid = '02:0E:8E:1E:61:18',
+    mesh_mcast_rate = 12000,
  },

  wifi5 = {
-    channel = 44,
-    ap = {
    ssid = 'muenchen.freifunk.net',
-    },
-    --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,
-    },
+    channel = 44,
+    htmode = 'HT40+',
+    mesh_ssid = 'mesh.ffmuc.welcome',
+    mesh_bssid = '02:0E:8E:1E:61:18',
+    mesh_mcast_rate = 12000,
  },

  next_node = {
@@ -63,7 +40,7 @@

  fastd_mesh_vpn = {
    methods = {'salsa2012+umac'},
-    mtu = 1280,
+    mtu = 1426,
    groups = {
      backbone = {
      limit = 1,
@@ -71,39 +48,34 @@
          gwf01 = {
            key = '89951ed50d591c0a4682ae50cb38806efe44dd736ba91ef64c9ef06b20ec186e',
            remotes = {
-              '"gwf01.ffmuc.net" port 11001',
-              '"gwf01.freifunk-muenchen.de" port 11001',
+              'ipv4 "gwf01.ffmuc.net" port 11000',
+              'ipv4 "gwf01.freifunk-muenchen.de" port 11000',
            },
          },
          gwf02 = {
            key = 'e255f2671c56f28a65173719be61939e5d48518eaa4da0d19283fd5395908e35',
            remotes = {
-              '"gwf02.ffmuc.net" port 11001',
-              '"gwf02.freifunk-muenchen.de" port 11001',
+              'ipv4 "gwf02.ffmuc.net" port 11000',
+              'ipv4 "gwf02.freifunk-muenchen.de" port 11001',
            },
          },
          gwf03 = {
            key = 'bf16080ab05a4416285638208e6f17055ea8f92cfd496c61eee1f1160cf6d386',
            remotes = {
-              '"gwf03.ffmuc.net" port 11001',
-              '"gwf03.freifunk-muenchen.de" port 11001',
+              'ipv4 "gwf03.ffmuc.net" port 11000',
+              'ipv4 "gwf03.freifunk-muenchen.de" port 11002',
            },
          },
          gwf04 = {
            key = '421a2c8e78f86d08fa7c8c7660b0dc073640ff365acb308ab92155c33488c539',
            remotes = {
-              '"gwf04.ffmuc.net" port 11001',
-              '"gwf04.freifunk-muenchen.de" port 11001',
+              'ipv4 "gwf04.ffmuc.net" port 11000',
+              'ipv4 "gwf04.freifunk-muenchen.de" port 11003',
            },
          },
        },
      },
    },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
-    },
  },

  autoupdater = {
@@ -117,12 +89,12 @@
          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
        },
        probability = 0.1,
-        good_signatures = 3,
+        good_signatures = 2,
        pubkeys = {
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
        },
      },
      experimental = {
@@ -137,11 +109,19 @@
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
        },
      },
    },
  },

+  simple_tc = {
+    mesh_vpn = {
+      ifname = 'mesh-vpn',
+      enabled = false,
+      limit_egress = 1200,
+      limit_ingress = 12000,
+    },
+  },
 }
 -- vim: set ft=lua:ts=2:sw=2:et
--- a/i18n/de.po
+++ b/i18n/de.po
@@ -18,7 +18,6 @@ msgstr ""

 msgid "gluon-config-mode:pubkey"
 msgstr ""
-" "

 msgid "gluon-config-mode:reboot"
 msgstr ""
--- a/i18n/en.po
+++ b/i18n/en.po
@@ -17,7 +17,6 @@ msgstr ""

 msgid "gluon-config-mode:pubkey"
 msgstr ""
-" "

 msgid "gluon-config-mode:reboot"
 msgstr ""
--- a/7
+++ b/7
@@ -1,5 +1,4 @@
-GLUON_SITE_FEEDS='ffmuc'
+GLUON_SITE_FEEDS='ffmuc_packages'

-PACKAGES_FFMUC_REPO=https://github.com/freifunkMUC/gluon-packages.git
-PACKAGES_FFMUC_BRANCH=bf_2016.1_json
-PACKAGES_FFMUC_COMMIT=c734351ddbfb0d974d05f0f75e7ad660ec7ababe
+PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/freifunkMUC/gluon-packages.git
+PACKAGES_FFMUC_PACKAGES_COMMIT=985bfad86005c7a9f754ddc8432d88641d8183b3
--- a/site.conf
+++ b/site.conf
@@ -1,14 +1,11 @@
 {
  hostname_prefix = '',
-  site_name = 'Freifunk München',
-  site_code = 'ffmuc',
+  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.32.0/19',
-  prefix6 = 'fdef:ffc0:4fff::/64',
+  prefix4 = '10.80.96.0/19',
+  prefix6 = 'fdef:ffc0:4fff:2::/64',

  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
  ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
@@ -18,120 +15,74 @@
  regdom = 'DE',

  wifi24 = {
-    channel = 6,
-    ap = {
    ssid = 'muenchen.freifunk.net',
-    },
-    --mesh = {
-    --  id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
-    --},
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
+    channel = 6,
+    htmode = 'HT20',
+    mesh_ssid = 'mesh.ffmuc.umland',
+    mesh_bssid = '02:0E:8E:1E:61:19',
+    mesh_mcast_rate = 12000,
  },

  wifi5 = {
-    channel = 44,
-    ap = {
    ssid = 'muenchen.freifunk.net',
-    },
-    --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,
-    },
+    channel = 44,
+    htmode = 'HT40+',
+    mesh_ssid = 'mesh.ffmuc.umland',
+    mesh_bssid = '02:0E:8E:1E:61:19',
+    mesh_mcast_rate = 12000,
  },

  next_node = {
-    ip4 = '10.80.32.1',
-    ip6 = 'fdef:ffc0:4fff::1',
+    ip4 = '10.80.96.1',
+    ip6 = 'fdef:ffc0:4fff:2::1',
    mac = '16:41:95:40:f7:dc',
  },

  fastd_mesh_vpn = {
    methods = {'salsa2012+umac'},
-    mtu = 1280,
+    mtu = 1426,
    groups = {
      backbone = {
      limit = 1,
        peers = {
-          gw03 = {
-            key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
+          gwu01 = {
+            key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
            remotes = {
-              '"gw03.ffmuc.net" port 10001',
-              '"gw03.freifunk-muenchen.de" port 10001',
+              'ipv4 "gwu01.ffmuc.net" port 10010',
+              'ipv4 "gwu01.freifunk-muenchen.de" port 10010',
            },
          },
-          gw04 = {
-            key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
+          gwu02 = {
+            key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
            remotes = {
-              '"gw04.ffmuc.net" port 10001',
-              '"gw04.freifunk-muenchen.de" port 10001',
+              'ipv4 "gwu02.ffmuc.net" port 10011',
+              'ipv4 "gwu02.freifunk-muenchen.de" port 10011',
            },
          },
-          gw05 = {
-            key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
+          gwu03 = {
+            key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
            remotes = {
-              '"gw05.ffmuc.net" port 10001',
-              '"gw05.freifunk-muenchen.de" port 10001',
+              'ipv4 "gwu03.ffmuc.net" port 10012',
+              'ipv4 "gwu03.freifunk-muenchen.de" port 10012',
            },
          },
-          gw06 = {
-            key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
+          gwu04 = {
+            key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
            remotes = {
-              '"gw06.ffmuc.net" port 10001',
-              '"gw06.freifunk-muenchen.de" port 10001',
+              'ipv4 "gwu04.ffmuc.net" port 10013',
+              'ipv4 "gwu04.freifunk-muenchen.de" port 10013',
            },
          },
-          gw07 = {
-            key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
+          gwu05 = {
+            key = 'b6de9fec8569b1fcdea8e7c45224ec30513d24e01af71148c6d640b5df471950',
            remotes = {
-              '"gw07.ffmuc.net" port 10001',
-              '"gw07.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw08 = {
-            key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
-            remotes = {
-              '"gw08.ffmuc.net" port 10001',
-              '"gw08.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw09 = {
-            key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
-            remotes = {
-              '"gw09.ffmuc.net" port 10001',
-              '"gw09.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw10 = {
-            key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf',
-            remotes = {
-              '"gw10.ffmuc.net" port 10001',
-              '"gw10.freifunk-muenchen.de" port 10001',
+              'ipv4 "gwu05.ffmuc.net" port 10014',
+              'ipv4 "gwu05.freifunk-muenchen.de" port 10014',
            },
          },
        },
      },
    },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
-    },
  },

  autoupdater = {
@@ -145,12 +96,12 @@
          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
        },
        probability = 0.1,
-        good_signatures = 3,
+        good_signatures = 2,
        pubkeys = {
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
        },
      },
      experimental = {
@@ -165,11 +116,19 @@
          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '07a118c2ece480bbff5d43ffc39796285d10de9a8e2ce878cade49207886eb0f', -- build.ffmuc.net
+          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
        },
      },
    },
  },

+  simple_tc = {
+    mesh_vpn = {
+      ifname = 'mesh-vpn',
+      enabled = false,
+      limit_egress = 1200,
+      limit_ingress = 12000,
+    },
+  },
 }
 -- vim: set ft=lua:ts=2:sw=2:et
--- a/site.mk
+++ b/site.mk
@@ -1,7 +1,7 @@
 GLUON_SITE_PACKAGES := \
 	gluon-mesh-batman-adv-15 \
 	gluon-alfred \
-	gluon-respondd \
+	gluon-announced \
 	gluon-autoupdater \
 	gluon-config-mode-core \
 	gluon-config-mode-autoupdater \
@@ -29,145 +29,6 @@ GLUON_SITE_PACKAGES := \
 	gluon-ebtables-filter-multicast-ffmuc


-# 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')

 # Allow overriding the release number from the command line
Author	SHA1	Message	Date
Franz Pletz	0937f79688	Switch autoupdater URL back to main firmware repo path	2015-10-14 21:14:16 +02:00
Franz Pletz	3d1631e71e	Release 2015.6.1	2015-10-14 19:40:58 +02:00
Christian Obersteiner	a3a5af5b00	using our own gluon-config-site-select module	2015-10-11 15:16:09 +02:00
Franz Pletz	0548f8483b	Remove extra site symlink	2015-10-05 12:33:50 +02:00
Franz Pletz	02595a4f1f	Merge branch 'site-select' into umland	2015-10-04 15:36:16 +02:00
Franz Pletz	2d331cad34	Change site code to ffmuc_umland	2015-10-04 09:02:34 +02:00
Franz Pletz	ff8cd69569	Merge pull request #21 from freifunkMUC/t-offline-patch-1 Update site.conf	2015-09-26 20:42:28 +02:00
Christian	895775d8e3	Update site.conf	2015-09-26 20:22:15 +02:00
Franz Pletz	01d6d18948	Fix typos in mesh ssid & gwu02 port	2015-09-26 02:39:01 +02:00
Franz Pletz	4c52f1b3d8	If you're happy and you know it: syntax error	2015-09-25 23:57:02 +02:00
Franz Pletz	64b42e68d5	Changes for ffmuc-umland segment	2015-09-25 18:30:46 +02:00