Update site.conf

Merging Ffmuc v2015.5 stable to altdorf branch

Conflicts:
	CHANGELOG.md

.gitignore

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

CHANGELOG.md

@@ -1,38 +1,9 @@
 # Freifunk München Firmware Changelog
 
-## v2016.1 (not released yet)
+## v2015.5-altdorf
- - Updated to Gluon v2016.1.5 (ffmuc fork)
+ - Added additional Autoupdate Server for altdorf
-   - Changes:
+ - Added additional Autoupdate Signatures for altdorf
-     - https://gluon.readthedocs.org/en/v2016.1/releases/v2016.1.html
+ - Made changes necessary for Altdorf in i18n folder
-     - 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
-   - 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
-
-## v2015.6
- - Updated to Gluon 2015.1.2
-   - Changes: https://gluon.readthedocs.org/en/v2015.1.2/releases/v2015.1.2.html
 
 ## v2015.5
  - Updated to Gluon 2015.1.1
@@ -75,6 +46,10 @@
  - Use internal NTP server 0.ntp.ffmuc.net
  - Connections from nodes to gateways only over IPv4 for now (MTU issues)
 
+## v2015.1-altdorf
+ - Changed SSID to altdorf.freifunk.net
+ - Changed Autoupdater URLs for altdorf firmware
+
 ## v2015.1
  - Updated to Gluon 2014.4 release
  - Autoupdater

Jenkinsfile

@@ -1,10 +0,0 @@
-node {
-  stage 'Checkout'
-  checkout scm
-  
-  stage 'Build'
-  sh "make V=s"
-  
-  stage 'Archive'
-  archive 'output/**/*'
-}

Makefile

@@ -1,15 +1,12 @@
 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 := dddade25de0c20207385c339d66d3ac7b8092136
+GLUON_GIT_REF := v2015.1.1
 
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
 
 GLUON_TARGETS ?= \
 	ar71xx-generic \
 	ar71xx-nand \
-	mpc85xx-generic \
-	x86-64 \
-	x86-generic \
 	x86-kvm_guest
 
 GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
@@ -19,9 +16,7 @@ else
   GLUON_BRANCH := experimental
 endif
 
-JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
+GLUON_MAKE := ${MAKE} -C ${GLUON_BUILD_DIR} \
-
-GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
 			GLUON_RELEASE=${GLUON_RELEASE} \
 			GLUON_BRANCH=${GLUON_BRANCH}
 
@@ -31,7 +26,7 @@ all: info
 info:
 	@echo
 	@echo '#########################'
-	@echo '# FFMUC Firmware build'
+	@echo '# FFMUC Firmare build'
 	@echo '# Building release ${GLUON_RELEASE} for branch ${GLUON_BRANCH}'
 	@echo
 
@@ -43,15 +38,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 +57,7 @@ gluon-prepare: output-clean ${GLUON_BUILD_DIR}
 gluon-clean:
 	rm -rf ${GLUON_BUILD_DIR}
 
-output-clean:
+images-clean:
-	rm -rf output
+	rm -rf images
 
-clean: gluon-clean output-clean
+clean: gluon-clean images-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/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.

extra/ffmuc.conf

@@ -1,175 +0,0 @@
-{
-  hostname_prefix = '',
-  site_name = 'Freifunk München',
-  site_code = 'ffmuc',
-
-  opkg = {
-    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' },
-
-  mesh_on_wan = false,
-
-  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,
-    },
-  },
-
-  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,
-    },
-  },
-
-  next_node = {
-    ip4 = '10.80.32.1',
-    ip6 = 'fdef:ffc0:4fff::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
-    mtu = 1280,
-    groups = {
-      backbone = {
-      limit = 1,
-        peers = {
-          gw03 = {
-            key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
-            remotes = {
-              '"gw03.ffmuc.net" port 10001',
-              '"gw03.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw04 = {
-            key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
-            remotes = {
-              '"gw04.ffmuc.net" port 10001',
-              '"gw04.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw05 = {
-            key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
-            remotes = {
-              '"gw05.ffmuc.net" port 10001',
-              '"gw05.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw06 = {
-            key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
-            remotes = {
-              '"gw06.ffmuc.net" port 10001',
-              '"gw06.freifunk-muenchen.de" port 10001',
-            },
-          },
-          gw07 = {
-            key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
-            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',
-            },
-          },
-        },
-      },
-    },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
-    },
-  },
-
-  autoupdater = {
-    enabled = 1,
-    branch = 'stable',
-    branches = {
-      stable = {
-        name = 'stable',
-        mirrors = {
-          'http://firmware.ffmuc.net/stable/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
-        },
-        probability = 0.1,
-        good_signatures = 3,
-        pubkeys = {
-          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
-          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
-          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
-        },
-      },
-      experimental = {
-        name = 'experimental',
-        mirrors = {
-          'http://firmware.ffmuc.net/experimental/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
-        },
-        probability = 0.5,
-        good_signatures = 2,
-        pubkeys = {
-          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
-          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
-          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
-        },
-      },
-    },
-  },
-
-}
--- vim: set ft=lua:ts=2:sw=2:et

extra/ffmuc_umland.conf

@@ -1,154 +0,0 @@
-{
-  hostname_prefix = '',
-  site_name = 'Freifunk München Umland',
-  site_code = 'ffmuc_umland',
-
-  opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
-  },
-
-  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' },
-
-  mesh_on_wan = false,
-
-  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,
-    },
-  },
-
-  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,
-    },
-  },
-
-  next_node = {
-    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,
-    groups = {
-      backbone = {
-      limit = 1,
-        peers = {
-          gwu01 = {
-            key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b',
-            remotes = {
-              '"gwu01.ffmuc.net" port 10015',
-              '"gwu01.freifunk-muenchen.de" port 10015',
-            },
-          },
-          gwu02 = {
-            key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5',
-            remotes = {
-              '"gwu02.ffmuc.net" port 10015',
-              '"gwu02.freifunk-muenchen.de" port 10015',
-            },
-          },
-          gwu03 = {
-            key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522',
-            remotes = {
-              '"gwu03.ffmuc.net" port 10015',
-              '"gwu03.freifunk-muenchen.de" port 10015',
-            },
-          },
-          gwu04 = {
-            key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1',
-            remotes = {
-              '"gwu04.ffmuc.net" port 10015',
-              '"gwu04.freifunk-muenchen.de" port 10015',
-            },
-          },
-          gwu05 = {
-            key = 'b6de9fec8569b1fcdea8e7c45224ec30513d24e01af71148c6d640b5df471950',
-            remotes = {
-              '"gwu05.ffmuc.net" port 10015',
-              '"gwu05.freifunk-muenchen.de" port 10015',
-            },
-          },
-        },
-      },
-    },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
-    },
-  },
-
-  autoupdater = {
-    enabled = 1,
-    branch = 'stable',
-    branches = {
-      stable = {
-        name = 'stable',
-        mirrors = {
-          'http://firmware.ffmuc.net/stable/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
-        },
-        probability = 0.1,
-        good_signatures = 3,
-        pubkeys = {
-          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
-          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
-          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
-        },
-      },
-      experimental = {
-        name = 'experimental',
-        mirrors = {
-          'http://firmware.ffmuc.net/experimental/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
-        },
-        probability = 0.5,
-        good_signatures = 2,
-        pubkeys = {
-          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
-          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
-          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
-        },
-      },
-    },
-  },
-
-}
--- vim: set ft=lua:ts=2:sw=2:et

extra/ffmuc_welcome.conf

@@ -1,147 +0,0 @@
-{
-  hostname_prefix = 'welcome',
-  site_name = 'Freifunk München Welcome',
-  site_code = 'ffmuc_welcome',
-
-  opkg = {
-    openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
-  },
-
-  prefix4 = '10.80.64.0/19',
-  prefix6 = 'fdef:ffc0:4fff:1::/64',
-
-  timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
-  ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' },
-
-  mesh_on_wan = false,
-
-  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,
-    },
-  },
-
-  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,
-    },
-  },
-
-  next_node = {
-    ip4 = '10.80.64.1',
-    ip6 = 'fdef:ffc0:4fff:1::1',
-    mac = '16:41:95:40:f7:dc',
-  },
-
-  fastd_mesh_vpn = {
-    methods = {'salsa2012+umac'},
-    mtu = 1280,
-    groups = {
-      backbone = {
-      limit = 1,
-        peers = {
-          gwf01 = {
-            key = '89951ed50d591c0a4682ae50cb38806efe44dd736ba91ef64c9ef06b20ec186e',
-            remotes = {
-              '"gwf01.ffmuc.net" port 11001',
-              '"gwf01.freifunk-muenchen.de" port 11001',
-            },
-          },
-          gwf02 = {
-            key = 'e255f2671c56f28a65173719be61939e5d48518eaa4da0d19283fd5395908e35',
-            remotes = {
-              '"gwf02.ffmuc.net" port 11001',
-              '"gwf02.freifunk-muenchen.de" port 11001',
-            },
-          },
-          gwf03 = {
-            key = 'bf16080ab05a4416285638208e6f17055ea8f92cfd496c61eee1f1160cf6d386',
-            remotes = {
-              '"gwf03.ffmuc.net" port 11001',
-              '"gwf03.freifunk-muenchen.de" port 11001',
-            },
-          },
-          gwf04 = {
-            key = '421a2c8e78f86d08fa7c8c7660b0dc073640ff365acb308ab92155c33488c539',
-            remotes = {
-              '"gwf04.ffmuc.net" port 11001',
-              '"gwf04.freifunk-muenchen.de" port 11001',
-            },
-          },
-        },
-      },
-    },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
-    },
-  },
-
-  autoupdater = {
-    enabled = 1,
-    branch = 'stable',
-    branches = {
-      stable = {
-        name = 'stable',
-        mirrors = {
-          'http://firmware.ffmuc.net/stable/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
-        },
-        probability = 0.1,
-        good_signatures = 3,
-        pubkeys = {
-          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
-          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
-          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
-        },
-      },
-      experimental = {
-        name = 'experimental',
-        mirrors = {
-          'http://firmware.ffmuc.net/experimental/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
-        },
-        probability = 0.5,
-        good_signatures = 2,
-        pubkeys = {
-          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
-          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
-          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
-          '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz)
-        },
-      },
-    },
-  },
-
-}
--- vim: set ft=lua:ts=2:sw=2:et

i18n/de.po

@@ -12,31 +12,38 @@ msgstr ""
 
 msgid "gluon-config-mode:welcome"
 msgstr ""
-"Willkommen zum Einrichtungsassistenten für deinen neuen Münchner "
+"Willkommen zum Einrichtungsassistenten für deinen neuen Altdorfer "
 "Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
 "entsprechend aus und sende es ab."
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
-" "
+"Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Der Schlüssel "
+"wird automatisch auf den Servern des Freifunk Altdorf eingetragen "
+"sobald eine Internetverbindung hergestellt wurde."
+"Mit diesem Schlüssel kann sich dein Knoten mit dem Altdorfer Mesh-VPN verbinden. "
 
 msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>Dein Knoten startet gerade neu und wird anschließend versuchen, sich "
 "mit anderen Freifunk-Knoten in seiner Nähe zu verbinden. Weitere "
-"Informationen zur Münchner Freifunk-Community findest du auf "
+"Informationen zur Altdorfer Freifunk-Community findest du auf "
-"<a href=\"https://ffmuc.net/\">unserer Webseite</a>. Wenn "
+"<a href=\"http://www.freifunk-altdorf.de/\">unserer Webseite</a>. Wenn "
 "alles geklappt hat, wirst du in ein paar Minuten unter "
-"<a href=\"https://ffmuc.net/map/\">ffmuc.net/map/</a> "
+"<a href=\"http://map.freifunk-altdorf.de\">map.freifunk-altdorf.de</a> "
 "deinen Knoten finden.</p> "
 "<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
 "Betrieb für drei Sekunden den Reset-Button. Das Gerät wird dann im Config "
 "Mode neustarten.</p>"
-"<p>Wenn Du mehr über Freifunk in München erfahren möchtest, dann besuche "
+"<p>Wenn Du mehr über Freifunk in Altdorf erfahren möchtest, dann besuche "
-"uns doch auf unserem monatlichen Treffen (siehe Webseite). Um mehr "
+"uns doch auf unserem Treffen (siehe Webseite). "
-"auf die Entwicklung zu nehmen, hast Du als Knotenbetreiber "
-"zusätzlich die Möglichkeit in unserem "
-"<a href=\"https://lqfb.freifunk-muenchen.de\">Abstimmungs- und Dokumentationssystem</a> "
-"mitzumachen. Voraussetzung ist eine persönliche Anmeldung auf einem "
-"der Treffen.</p> "
 "<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p>"
+"Melde Dich bitte unbedingt noch bei unserer Mailingliste an! "
+"<a href=\"http://freifunk-altdorf.de/verein/mailingliste.php\">altdorf@freifunk.net</a> "
+"Damit informieren wir Dich wenn es unvorhergesehen Störungen im Freifunk- Netz "
+"geben sollte oder falls Dein Router einen neue Firmware benötigt, "
+"die nicht über ein automatisches Update aufgespielt werden kann. "
+"Bestenfalls einmal im Monat weisen wir auf Zeit und Ort unseres nächsten Treffen hin. "
+"Keine Angst wir versenden garantiert keine Spam-Mails und geben Deine "
+"Mailadresse garantiert nicht weiter.</p> "
+"Dein Freifunk Team Altdorf "

i18n/en.po

@@ -12,18 +12,17 @@ msgstr ""
 
 msgid "gluon-config-mode:welcome"
 msgstr ""
-"Welcome the the setup wizard of your new Freifunk Munich node. "
+"Welcome the the setup wizard of your new Freifunk Altdorf node. "
 "Please fill out the following form and transmit it."
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
-" "
 
 msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>Your node is currently rebooting and will try to connect to other "
 "nearby Freifunk nodes. It should appear on our map at "
-"<a href=\"https://ffmuc.net/map/\">ffmuc.net/map/</a> "
+"<a href=\"http://map.freifunk-altdorf.de.de\">map.freifunk-altdorf.de</a> "
 "in a few minutes.</p> "
 "<p>To get back to this configuration interface, press the reset button for "
 "3 seconds during normal operation. The device will then reboot into config "

modules

@@ -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_PACKAGES_REPO=https://github.com/freifunkMUC/gluon-packages.git
-PACKAGES_FFMUC_BRANCH=ath9k_wifi_fix
+PACKAGES_FFMUC_PACKAGES_COMMIT=82e721ad5d7c9eca8728954cfa1ab1d5b9168487
-PACKAGES_FFMUC_COMMIT=b8c2b7dd024d93bc7ceb552adbe8e20f0e68dc26

site.conf

@@ -1,13 +1,10 @@
 {
   hostname_prefix = '',
-  site_name = 'Freifunk München',
+  site_name = 'Freifunk Altdorf',
   site_code = 'ffmuc',
+  opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
 
-  opkg = {
+  prefix4 = '10.80.0.0/16',
-    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',
@@ -18,120 +15,95 @@
   regdom = 'DE',
 
   wifi24 = {
+    ssid = 'altdorf.freifunk.net',
     channel = 6,
-    ap = {
+    htmode = 'HT20',
-      ssid = 'muenchen.freifunk.net',
+    mesh_ssid = 'mesh.ffmuc',
-    },
+    mesh_bssid = '02:0E:8E:1E:61:17',
-    --mesh = {
+    mesh_mcast_rate = 12000,
-    --  id = 'ffmuc-mesh',
-    --  mcast_rate = 12000,
-    --},
-    ibss = {
-      ssid = 'mesh.ffmuc',
-      bssid = '02:0E:8E:1E:61:17',
-      mcast_rate = 12000,
-    },
   },
 
   wifi5 = {
+    ssid = 'altdorf.freifunk.net',
     channel = 44,
-    ap = {
+    htmode = 'HT40+',
-      ssid = 'muenchen.freifunk.net',
+    mesh_ssid = 'mesh.ffmuc',
-    },
+    mesh_bssid = '02:0E:8E:1E:61:17',
-    --mesh = {
+    mesh_mcast_rate = 12000,
-    --  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.32.1',
+    ip4 = '10.80.0.1',
     ip6 = 'fdef:ffc0:4fff::1',
     mac = '16:41:95:40:f7:dc',
   },
 
   fastd_mesh_vpn = {
     methods = {'salsa2012+umac'},
-    mtu = 1280,
+    mtu = 1426,
     groups = {
       backbone = {
       limit = 1,
         peers = {
-          gw03 = {
+          gw03 = {   --[[ fpletz ]]
             key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41',
             remotes = {
-              '"gw03.ffmuc.net" port 10001',
+              'ipv4 "gw03.ffmuc.net" port 10000',
-              '"gw03.freifunk-muenchen.de" port 10001',
+              'ipv4 "gw03.freifunk-muenchen.de" port 10000',
             },
           },
           gw04 = {
             key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126',
             remotes = {
-              '"gw04.ffmuc.net" port 10001',
+              'ipv4 "gw04.ffmuc.net" port 10000',
-              '"gw04.freifunk-muenchen.de" port 10001',
+              'ipv4 "gw04.freifunk-muenchen.de" port 10000',
             },
           },
           gw05 = {
             key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e',
             remotes = {
-              '"gw05.ffmuc.net" port 10001',
+              'ipv4 "gw05.ffmuc.net" port 10000',
-              '"gw05.freifunk-muenchen.de" port 10001',
+              'ipv4 "gw05.freifunk-muenchen.de" port 10000',
             },
           },
           gw06 = {
             key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0',
             remotes = {
-              '"gw06.ffmuc.net" port 10001',
+              'ipv4 "gw06.ffmuc.net" port 10000',
-              '"gw06.freifunk-muenchen.de" port 10001',
+              'ipv4 "gw06.freifunk-muenchen.de" port 10000',
             },
           },
           gw07 = {
             key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6',
             remotes = {
-              '"gw07.ffmuc.net" port 10001',
+              'ipv4 "gw07.ffmuc.net" port 10000',
-              '"gw07.freifunk-muenchen.de" port 10001',
+              'ipv4 "gw07.freifunk-muenchen.de" port 10000',
             },
           },
           gw08 = {
             key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055',
             remotes = {
-              '"gw08.ffmuc.net" port 10001',
+              'ipv4 "gw08.ffmuc.net" port 10000',
-              '"gw08.freifunk-muenchen.de" port 10001',
+              'ipv4 "gw08.freifunk-muenchen.de" port 10000',
             },
           },
           gw09 = {
             key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0',
             remotes = {
-              '"gw09.ffmuc.net" port 10001',
+              'ipv4 "gw09.ffmuc.net" port 10000',
-              '"gw09.freifunk-muenchen.de" port 10001',
+              'ipv4 "gw09.freifunk-muenchen.de" port 10000',
             },
           },
           gw10 = {
             key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf',
             remotes = {
-              '"gw10.ffmuc.net" port 10001',
+              'ipv4 "gw10.ffmuc.net" port 10000',
-              '"gw10.freifunk-muenchen.de" port 10001',
+              'ipv4 "gw10.freifunk-muenchen.de" port 10000',
             },
           },
         },
       },
     },
-    bandwidth_limit = {
-      enabled = false,
-      egress = 1500,
-      ingress = 12000,
-    },
   },
 
   autoupdater = {
@@ -141,12 +113,17 @@
       stable = {
         name = 'stable',
         mirrors = {
-          'http://firmware.ffmuc.net/stable/sysupgrade/',
+          'http://fw1.tecff.de/altdorf/stable/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/',
+	  'http://fw2.tecff.de/altdorf/stable/sysupgrade/',
+          'http://firmware.ffmuc.net/altdorf/stable/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/altdorf/stable/sysupgrade/',
         },
         probability = 0.1,
-        good_signatures = 3,
+        good_signatures = 2,
         pubkeys = {
+          
+          'a9ba1d78b5d48d1539c5c6824ca62d8c7ce7a79913d2f3fcf28e4f7fe4e777a8', -- walter hartl
+          'ed09d23552225f71da8a3763b17a09eb8e126ad3c4938275bd51d6d564e0ac0b', -- walter henz
           '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
           '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
           '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
@@ -156,20 +133,31 @@
       experimental = {
         name = 'experimental',
         mirrors = {
-          'http://firmware.ffmuc.net/experimental/sysupgrade/',
+          'http://fw1.tecff.de/altdorf/experimental/sysupgrade/',
-          'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/',
+	  'http://fw2.tecff.de/altdorf/experimental/sysupgrade/',
+          'http://firmware.ffmuc.net/altdorf/experimental/sysupgrade/',
+          'http://[fdef:ffc0:4fff::130]/altdorf/experimental/sysupgrade/',
         },
         probability = 0.5,
-        good_signatures = 2,
+        good_signatures = 1,
         pubkeys = {
-          '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
+
-          '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz
+         'a9ba1d78b5d48d1539c5c6824ca62d8c7ce7a79913d2f3fcf28e4f7fe4e777a8', -- walter hartl
-          '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
+         'ed09d23552225f71da8a3763b17a09eb8e126ad3c4938275bd51d6d564e0ac0b', -- walter henz
          '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
+

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 \
@@ -9,7 +9,6 @@ GLUON_SITE_PACKAGES := \
 	gluon-config-mode-mesh-vpn \
 	gluon-config-mode-geo-location \
 	gluon-config-mode-contact-info \
-	gluon-config-mode-site-select \
 	gluon-ebtables-filter-multicast \
 	gluon-ebtables-filter-ra-dhcp \
 	gluon-luci-admin \
@@ -26,148 +25,7 @@ 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 \
-	babeld \
-	ip
-
-# 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')