From 17105d054d97414297c809575550504f1773788d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 19 Jun 2015 23:42:49 +0200 Subject: [PATCH 01/39] Build gluon target x86-generic by default --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index a6659d9..4a2e0f9 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key GLUON_TARGETS ?= \ ar71xx-generic \ ar71xx-nand \ + x86-generic \ x86-kvm_guest GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) From 68e7a2e7ac08e879aa9d898500ee8ea01c9ddb57 Mon Sep 17 00:00:00 2001 From: Christian Obersteiner Date: Mon, 10 Aug 2015 21:22:45 +0200 Subject: [PATCH 02/39] bumped to v2015.1.2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4a2e0f9..d478ec1 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := v2015.1.1 +GLUON_GIT_REF := v2015.1.2 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 73fa45d03fb479bacea7373a46ca7de8ee4b3c6a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 19 Aug 2015 18:09:35 +0200 Subject: [PATCH 03/39] Update changelog for v2015.6 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e1d9aa..35183d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Freifunk München Firmware Changelog +## 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 - Fixes some problems with mesh on LAN setups From 11059b8851af77e655bec65ed4b6948128c44bd5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 19 Aug 2015 20:29:30 +0200 Subject: [PATCH 04/39] Decrease fastd mtu to 1280 & use port 10001 --- site.conf | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/site.conf b/site.conf index 7fdd7e3..7a8986d 100644 --- a/site.conf +++ b/site.conf @@ -40,7 +40,7 @@ fastd_mesh_vpn = { methods = {'salsa2012+umac'}, - mtu = 1426, + mtu = 1280, groups = { backbone = { limit = 1, @@ -48,57 +48,57 @@ gw03 = { --[[ fpletz ]] key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', remotes = { - 'ipv4 "gw03.ffmuc.net" port 10000', - 'ipv4 "gw03.freifunk-muenchen.de" port 10000', + 'ipv4 "gw03.ffmuc.net" port 10001', + 'ipv4 "gw03.freifunk-muenchen.de" port 10001', }, }, gw04 = { key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', remotes = { - 'ipv4 "gw04.ffmuc.net" port 10000', - 'ipv4 "gw04.freifunk-muenchen.de" port 10000', + 'ipv4 "gw04.ffmuc.net" port 10001', + 'ipv4 "gw04.freifunk-muenchen.de" port 10001', }, }, gw05 = { key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', remotes = { - 'ipv4 "gw05.ffmuc.net" port 10000', - 'ipv4 "gw05.freifunk-muenchen.de" port 10000', + 'ipv4 "gw05.ffmuc.net" port 10001', + 'ipv4 "gw05.freifunk-muenchen.de" port 10001', }, }, gw06 = { key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0', remotes = { - 'ipv4 "gw06.ffmuc.net" port 10000', - 'ipv4 "gw06.freifunk-muenchen.de" port 10000', + 'ipv4 "gw06.ffmuc.net" port 10001', + 'ipv4 "gw06.freifunk-muenchen.de" port 10001', }, }, gw07 = { key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6', remotes = { - 'ipv4 "gw07.ffmuc.net" port 10000', - 'ipv4 "gw07.freifunk-muenchen.de" port 10000', + 'ipv4 "gw07.ffmuc.net" port 10001', + 'ipv4 "gw07.freifunk-muenchen.de" port 10001', }, }, gw08 = { key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055', remotes = { - 'ipv4 "gw08.ffmuc.net" port 10000', - 'ipv4 "gw08.freifunk-muenchen.de" port 10000', + 'ipv4 "gw08.ffmuc.net" port 10001', + 'ipv4 "gw08.freifunk-muenchen.de" port 10001', }, }, gw09 = { key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0', remotes = { - 'ipv4 "gw09.ffmuc.net" port 10000', - 'ipv4 "gw09.freifunk-muenchen.de" port 10000', + 'ipv4 "gw09.ffmuc.net" port 10001', + 'ipv4 "gw09.freifunk-muenchen.de" port 10001', }, }, gw10 = { key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf', remotes = { - 'ipv4 "gw10.ffmuc.net" port 10000', - 'ipv4 "gw10.freifunk-muenchen.de" port 10000', + 'ipv4 "gw10.ffmuc.net" port 10001', + 'ipv4 "gw10.freifunk-muenchen.de" port 10001', }, }, }, From 192c43f69b24e365079b64688bf3ccf0c08b677a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 5 Sep 2015 20:05:20 +0200 Subject: [PATCH 05/39] Revert "Makefile: Remove JOBS option" This reverts commit 176d7e01e08651202f1c425b6d894964dcfe5c2a. --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d478ec1..6500b04 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,9 @@ else GLUON_BRANCH := experimental endif -GLUON_MAKE := ${MAKE} -C ${GLUON_BUILD_DIR} \ +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} From 9f56af29e90cef415a2ae756d5859b9d6ff1f463 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 5 Sep 2015 20:11:48 +0200 Subject: [PATCH 06/39] Add default building for architecture mpc85xx-generic --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 6500b04..e79eb83 100644 --- a/Makefile +++ b/Makefile @@ -7,6 +7,7 @@ SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key GLUON_TARGETS ?= \ ar71xx-generic \ ar71xx-nand \ + mpc85xx-generic \ x86-generic \ x86-kvm_guest From eb6a462b809f3ac584b38698b870d129bae71258 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 5 Sep 2015 20:16:49 +0200 Subject: [PATCH 07/39] Makefile: Fix typo --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e79eb83..e98ad15 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ all: info info: @echo @echo '#########################' - @echo '# FFMUC Firmare build' + @echo '# FFMUC Firmware build' @echo '# Building release ${GLUON_RELEASE} for branch ${GLUON_BRANCH}' @echo From a9baeb4dbb8e559a3603fbb49c683bd184658908 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 6 Sep 2015 00:59:22 +0200 Subject: [PATCH 08/39] Due to mtu change, we now support ipv6 fastd connections --- site.conf | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/site.conf b/site.conf index 7a8986d..28ab655 100644 --- a/site.conf +++ b/site.conf @@ -48,57 +48,57 @@ gw03 = { --[[ fpletz ]] key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', remotes = { - 'ipv4 "gw03.ffmuc.net" port 10001', - 'ipv4 "gw03.freifunk-muenchen.de" port 10001', + '"gw03.ffmuc.net" port 10001', + '"gw03.freifunk-muenchen.de" port 10001', }, }, gw04 = { key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', remotes = { - 'ipv4 "gw04.ffmuc.net" port 10001', - 'ipv4 "gw04.freifunk-muenchen.de" port 10001', + '"gw04.ffmuc.net" port 10001', + '"gw04.freifunk-muenchen.de" port 10001', }, }, gw05 = { key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', remotes = { - 'ipv4 "gw05.ffmuc.net" port 10001', - 'ipv4 "gw05.freifunk-muenchen.de" port 10001', + '"gw05.ffmuc.net" port 10001', + '"gw05.freifunk-muenchen.de" port 10001', }, }, gw06 = { key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0', remotes = { - 'ipv4 "gw06.ffmuc.net" port 10001', - 'ipv4 "gw06.freifunk-muenchen.de" port 10001', + '"gw06.ffmuc.net" port 10001', + '"gw06.freifunk-muenchen.de" port 10001', }, }, gw07 = { key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6', remotes = { - 'ipv4 "gw07.ffmuc.net" port 10001', - 'ipv4 "gw07.freifunk-muenchen.de" port 10001', + '"gw07.ffmuc.net" port 10001', + '"gw07.freifunk-muenchen.de" port 10001', }, }, gw08 = { key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055', remotes = { - 'ipv4 "gw08.ffmuc.net" port 10001', - 'ipv4 "gw08.freifunk-muenchen.de" port 10001', + '"gw08.ffmuc.net" port 10001', + '"gw08.freifunk-muenchen.de" port 10001', }, }, gw09 = { key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0', remotes = { - 'ipv4 "gw09.ffmuc.net" port 10001', - 'ipv4 "gw09.freifunk-muenchen.de" port 10001', + '"gw09.ffmuc.net" port 10001', + '"gw09.freifunk-muenchen.de" port 10001', }, }, gw10 = { key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf', remotes = { - 'ipv4 "gw10.ffmuc.net" port 10001', - 'ipv4 "gw10.freifunk-muenchen.de" port 10001', + '"gw10.ffmuc.net" port 10001', + '"gw10.freifunk-muenchen.de" port 10001', }, }, }, From 1a080761975e57d4fef3c43d33be33e40b793922 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 6 Sep 2015 02:04:39 +0200 Subject: [PATCH 09/39] Update gluon to our own fork --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e98ad15..4ba61ae 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build -GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := v2015.1.2 +GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git +GLUON_GIT_REF := 459cf490442892229a8806c01c16f634f08dd636 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 469b08b665d231c225ecf2023141321d320e4042 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 6 Sep 2015 18:46:10 +0200 Subject: [PATCH 10/39] Revert "Due to mtu change, we now support ipv6 fastd connections" This reverts commit a9baeb4dbb8e559a3603fbb49c683bd184658908. --- site.conf | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/site.conf b/site.conf index 28ab655..7a8986d 100644 --- a/site.conf +++ b/site.conf @@ -48,57 +48,57 @@ gw03 = { --[[ fpletz ]] key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', remotes = { - '"gw03.ffmuc.net" port 10001', - '"gw03.freifunk-muenchen.de" port 10001', + 'ipv4 "gw03.ffmuc.net" port 10001', + 'ipv4 "gw03.freifunk-muenchen.de" port 10001', }, }, gw04 = { key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', remotes = { - '"gw04.ffmuc.net" port 10001', - '"gw04.freifunk-muenchen.de" port 10001', + 'ipv4 "gw04.ffmuc.net" port 10001', + 'ipv4 "gw04.freifunk-muenchen.de" port 10001', }, }, gw05 = { key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', remotes = { - '"gw05.ffmuc.net" port 10001', - '"gw05.freifunk-muenchen.de" port 10001', + 'ipv4 "gw05.ffmuc.net" port 10001', + 'ipv4 "gw05.freifunk-muenchen.de" port 10001', }, }, gw06 = { key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0', remotes = { - '"gw06.ffmuc.net" port 10001', - '"gw06.freifunk-muenchen.de" port 10001', + 'ipv4 "gw06.ffmuc.net" port 10001', + 'ipv4 "gw06.freifunk-muenchen.de" port 10001', }, }, gw07 = { key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6', remotes = { - '"gw07.ffmuc.net" port 10001', - '"gw07.freifunk-muenchen.de" port 10001', + 'ipv4 "gw07.ffmuc.net" port 10001', + 'ipv4 "gw07.freifunk-muenchen.de" port 10001', }, }, gw08 = { key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055', remotes = { - '"gw08.ffmuc.net" port 10001', - '"gw08.freifunk-muenchen.de" port 10001', + 'ipv4 "gw08.ffmuc.net" port 10001', + 'ipv4 "gw08.freifunk-muenchen.de" port 10001', }, }, gw09 = { key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0', remotes = { - '"gw09.ffmuc.net" port 10001', - '"gw09.freifunk-muenchen.de" port 10001', + 'ipv4 "gw09.ffmuc.net" port 10001', + 'ipv4 "gw09.freifunk-muenchen.de" port 10001', }, }, gw10 = { key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf', remotes = { - '"gw10.ffmuc.net" port 10001', - '"gw10.freifunk-muenchen.de" port 10001', + 'ipv4 "gw10.ffmuc.net" port 10001', + 'ipv4 "gw10.freifunk-muenchen.de" port 10001', }, }, }, From aa20154294390007450b199edc60e157c1042bd7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 6 Sep 2015 18:46:14 +0200 Subject: [PATCH 11/39] Revert "Decrease fastd mtu to 1280 & use port 10001" This reverts commit 11059b8851af77e655bec65ed4b6948128c44bd5. --- site.conf | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/site.conf b/site.conf index 7a8986d..7fdd7e3 100644 --- a/site.conf +++ b/site.conf @@ -40,7 +40,7 @@ fastd_mesh_vpn = { methods = {'salsa2012+umac'}, - mtu = 1280, + mtu = 1426, groups = { backbone = { limit = 1, @@ -48,57 +48,57 @@ gw03 = { --[[ fpletz ]] key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', remotes = { - 'ipv4 "gw03.ffmuc.net" port 10001', - 'ipv4 "gw03.freifunk-muenchen.de" port 10001', + 'ipv4 "gw03.ffmuc.net" port 10000', + 'ipv4 "gw03.freifunk-muenchen.de" port 10000', }, }, gw04 = { key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', remotes = { - 'ipv4 "gw04.ffmuc.net" port 10001', - 'ipv4 "gw04.freifunk-muenchen.de" port 10001', + 'ipv4 "gw04.ffmuc.net" port 10000', + 'ipv4 "gw04.freifunk-muenchen.de" port 10000', }, }, gw05 = { key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', remotes = { - 'ipv4 "gw05.ffmuc.net" port 10001', - 'ipv4 "gw05.freifunk-muenchen.de" port 10001', + 'ipv4 "gw05.ffmuc.net" port 10000', + 'ipv4 "gw05.freifunk-muenchen.de" port 10000', }, }, gw06 = { key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0', remotes = { - 'ipv4 "gw06.ffmuc.net" port 10001', - 'ipv4 "gw06.freifunk-muenchen.de" port 10001', + 'ipv4 "gw06.ffmuc.net" port 10000', + 'ipv4 "gw06.freifunk-muenchen.de" port 10000', }, }, gw07 = { key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6', remotes = { - 'ipv4 "gw07.ffmuc.net" port 10001', - 'ipv4 "gw07.freifunk-muenchen.de" port 10001', + 'ipv4 "gw07.ffmuc.net" port 10000', + 'ipv4 "gw07.freifunk-muenchen.de" port 10000', }, }, gw08 = { key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055', remotes = { - 'ipv4 "gw08.ffmuc.net" port 10001', - 'ipv4 "gw08.freifunk-muenchen.de" port 10001', + 'ipv4 "gw08.ffmuc.net" port 10000', + 'ipv4 "gw08.freifunk-muenchen.de" port 10000', }, }, gw09 = { key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0', remotes = { - 'ipv4 "gw09.ffmuc.net" port 10001', - 'ipv4 "gw09.freifunk-muenchen.de" port 10001', + 'ipv4 "gw09.ffmuc.net" port 10000', + 'ipv4 "gw09.freifunk-muenchen.de" port 10000', }, }, gw10 = { key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf', remotes = { - 'ipv4 "gw10.ffmuc.net" port 10001', - 'ipv4 "gw10.freifunk-muenchen.de" port 10001', + 'ipv4 "gw10.ffmuc.net" port 10000', + 'ipv4 "gw10.freifunk-muenchen.de" port 10000', }, }, }, From df2df8043933d51cf2ff00d464348bacc6b5bd48 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 7 Sep 2015 19:59:45 +0200 Subject: [PATCH 12/39] Add fastd port 10002 for gw03 & gw04 --- site.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/site.conf b/site.conf index 7fdd7e3..a09483d 100644 --- a/site.conf +++ b/site.conf @@ -49,14 +49,18 @@ key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', remotes = { 'ipv4 "gw03.ffmuc.net" port 10000', + 'ipv4 "gw03.ffmuc.net" port 10002', 'ipv4 "gw03.freifunk-muenchen.de" port 10000', + 'ipv4 "gw03.freifunk-muenchen.de" port 10002', }, }, gw04 = { key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', remotes = { 'ipv4 "gw04.ffmuc.net" port 10000', + 'ipv4 "gw04.ffmuc.net" port 10002', 'ipv4 "gw04.freifunk-muenchen.de" port 10000', + 'ipv4 "gw04.freifunk-muenchen.de" port 10002', }, }, gw05 = { From ea3ae61a74d974a13c632298972e9637c512c12e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 7 Sep 2015 22:43:37 +0200 Subject: [PATCH 13/39] Real peers needed for random port selection instead of remotes --- site.conf | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/site.conf b/site.conf index a09483d..5bb70ae 100644 --- a/site.conf +++ b/site.conf @@ -45,21 +45,31 @@ backbone = { limit = 1, peers = { - gw03 = { --[[ fpletz ]] + gw03_10000 = { key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', remotes = { 'ipv4 "gw03.ffmuc.net" port 10000', - 'ipv4 "gw03.ffmuc.net" port 10002', 'ipv4 "gw03.freifunk-muenchen.de" port 10000', + }, + }, + gw03_10002 = { + key = '0c76609762e99e278f2112a09046970b9025aa768d0c30c27242491453579fe7', + remotes = { + 'ipv4 "gw03.ffmuc.net" port 10002', 'ipv4 "gw03.freifunk-muenchen.de" port 10002', }, }, - gw04 = { + gw04_10000 = { key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', remotes = { 'ipv4 "gw04.ffmuc.net" port 10000', - 'ipv4 "gw04.ffmuc.net" port 10002', 'ipv4 "gw04.freifunk-muenchen.de" port 10000', + }, + }, + gw04_10002 = { + key = 'e6f0f50d2fa155a078316b6e3acad4595adcf453b959f85f20070c68df328065', + remotes = { + 'ipv4 "gw04.ffmuc.net" port 10002', 'ipv4 "gw04.freifunk-muenchen.de" port 10002', }, }, From 14d38932267dc66333366aa6cde277da07435f29 Mon Sep 17 00:00:00 2001 From: chris007de Date: Wed, 9 Sep 2015 10:05:18 +0200 Subject: [PATCH 14/39] Changing required number of signatures to 3 for stable and ext Um das bereits lang angedachte (und schon ewig kommunizierte) >4 Augen Prinzip bei FW Releases einzufuehren, wird die Anzahl der benoetigten Signaturen hochgesetzt. Dies ist auch bei Experimental Images der Fall, da Images die ueber Experimental Autoupdater ins Produktivnetz ausgerollt werden, bereits vorher in einem autarken Testbed getestet worden sein sollen. --- site.conf | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/site.conf b/site.conf index 5bb70ae..95eeb70 100644 --- a/site.conf +++ b/site.conf @@ -131,7 +131,7 @@ 'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/', }, probability = 0.1, - good_signatures = 2, + good_signatures = 3, pubkeys = { '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz @@ -146,8 +146,11 @@ 'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/', }, probability = 0.5, - good_signatures = 1, + good_signatures = 3, pubkeys = { + '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole + '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz + '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz) }, }, From b6763ddfe13ecc8adb68feceece0eee4173ac140 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 9 Sep 2015 22:34:43 +0200 Subject: [PATCH 15/39] Update gluon --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4ba61ae..2528e73 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git -GLUON_GIT_REF := 459cf490442892229a8806c01c16f634f08dd636 +GLUON_GIT_REF := 833ee39bc319c377bb1de5ae07f9f4d3ef772e00 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 9a9c8b31628e0c96b9e0b22704deba5b49c6de72 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 10 Sep 2015 21:40:52 +0200 Subject: [PATCH 16/39] Update gluon --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2528e73..24a64a8 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git -GLUON_GIT_REF := 833ee39bc319c377bb1de5ae07f9f4d3ef772e00 +GLUON_GIT_REF := 4268d32a8d70fa734b2d025972c5caca27705142 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 0e421661c015e7f3532c95d9954bbde4f81e6b37 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 19 Sep 2015 01:10:33 +0200 Subject: [PATCH 17/39] Remove fastd gateways peers with alternate ports --- site.conf | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/site.conf b/site.conf index 5bb70ae..2b07c4a 100644 --- a/site.conf +++ b/site.conf @@ -45,34 +45,20 @@ backbone = { limit = 1, peers = { - gw03_10000 = { + gw03 = { key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', remotes = { 'ipv4 "gw03.ffmuc.net" port 10000', 'ipv4 "gw03.freifunk-muenchen.de" port 10000', }, }, - gw03_10002 = { - key = '0c76609762e99e278f2112a09046970b9025aa768d0c30c27242491453579fe7', - remotes = { - 'ipv4 "gw03.ffmuc.net" port 10002', - 'ipv4 "gw03.freifunk-muenchen.de" port 10002', - }, - }, - gw04_10000 = { + gw04 = { key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', remotes = { 'ipv4 "gw04.ffmuc.net" port 10000', 'ipv4 "gw04.freifunk-muenchen.de" port 10000', }, }, - gw04_10002 = { - key = 'e6f0f50d2fa155a078316b6e3acad4595adcf453b959f85f20070c68df328065', - remotes = { - 'ipv4 "gw04.ffmuc.net" port 10002', - 'ipv4 "gw04.freifunk-muenchen.de" port 10002', - }, - }, gw05 = { key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', remotes = { From b5c478230e5855280b6f20b90d32a2f331faed1d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 19 Sep 2015 20:46:02 +0200 Subject: [PATCH 18/39] Require 2 signatures for experimental (LQFB i139) --- site.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 2b07c4a..7abb91d 100644 --- a/site.conf +++ b/site.conf @@ -132,8 +132,11 @@ 'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/', }, probability = 0.5, - good_signatures = 1, + good_signatures = 2, pubkeys = { + '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole + '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz + '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz) }, }, From ce57afabe0e6faf871b87d54e0a8dd9de46dfc7f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 26 Sep 2015 20:13:02 +0200 Subject: [PATCH 19/39] Fix prefix4 & next_node.ip4, fixes #19 --- site.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site.conf b/site.conf index 7abb91d..81c4667 100644 --- a/site.conf +++ b/site.conf @@ -4,7 +4,7 @@ site_code = 'ffmuc', opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages', - prefix4 = '10.80.0.0/16', + prefix4 = '10.80.32.0/19', prefix6 = 'fdef:ffc0:4fff::/64', timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', @@ -33,7 +33,7 @@ }, next_node = { - ip4 = '10.80.0.1', + ip4 = '10.80.32.1', ip6 = 'fdef:ffc0:4fff::1', mac = '16:41:95:40:f7:dc', }, From 0b5aeca9b8aa73fab6e4297ed6c9429a1b60d273 Mon Sep 17 00:00:00 2001 From: x29a <0.x29a.0@gmail.com> Date: Sun, 27 Sep 2015 16:53:00 +0200 Subject: [PATCH 20/39] update url to webpage and meshviewer/map --- i18n/de.po | 4 ++-- i18n/en.po | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/i18n/de.po b/i18n/de.po index 95726e0..1de0778 100644 --- a/i18n/de.po +++ b/i18n/de.po @@ -24,9 +24,9 @@ msgstr "" "

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 " -"unserer Webseite. Wenn " +"unserer Webseite. Wenn " "alles geklappt hat, wirst du in ein paar Minuten unter " -"map.freifunk-muenchen.de " +"ffmuc.net/map/ " "deinen Knoten finden.

" "

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 " diff --git a/i18n/en.po b/i18n/en.po index a8c1913..9d2a560 100644 --- a/i18n/en.po +++ b/i18n/en.po @@ -22,7 +22,7 @@ msgid "gluon-config-mode:reboot" msgstr "" "

Your node is currently rebooting and will try to connect to other " "nearby Freifunk nodes. It should appear on our map at " -"map.freifunk-muenchen.de " +"ffmuc.net/map/ " "in a few minutes.

" "

To get back to this configuration interface, press the reset button for " "3 seconds during normal operation. The device will then reboot into config " From 4d9c61e8d1c0bbb86ace59559c405e7fb64a1440 Mon Sep 17 00:00:00 2001 From: Christian Obersteiner Date: Mon, 28 Sep 2015 20:57:34 +0200 Subject: [PATCH 21/39] Integration of the gluon-config-site-select package LUA does not like '-', so ffmuc-umland was renamed to ffmuc_umland Several testing has still to be done (especially upgrade to/from a firmware with site-select) --- extra/ffmuc.conf | 155 +++++++++++++++++++++++++++++++++++++++ extra/ffmuc_umland.conf | 134 ++++++++++++++++++++++++++++++++++ modules | 5 ++ site.conf | 156 +--------------------------------------- site.mk | 7 +- 5 files changed, 299 insertions(+), 158 deletions(-) create mode 100644 extra/ffmuc.conf create mode 100644 extra/ffmuc_umland.conf mode change 100644 => 120000 site.conf diff --git a/extra/ffmuc.conf b/extra/ffmuc.conf new file mode 100644 index 0000000..81c4667 --- /dev/null +++ b/extra/ffmuc.conf @@ -0,0 +1,155 @@ +{ + hostname_prefix = '', + site_name = 'Freifunk München', + site_code = 'ffmuc', + opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%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 = { + ssid = 'muenchen.freifunk.net', + channel = 6, + htmode = 'HT20', + mesh_ssid = 'mesh.ffmuc', + mesh_bssid = '02:0E:8E:1E:61:17', + mesh_mcast_rate = 12000, + }, + + wifi5 = { + ssid = 'muenchen.freifunk.net', + channel = 44, + htmode = 'HT40+', + mesh_ssid = 'mesh.ffmuc', + mesh_bssid = '02:0E:8E:1E:61:17', + mesh_mcast_rate = 12000, + }, + + 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 = 1426, + groups = { + backbone = { + limit = 1, + peers = { + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + 'ipv4 "gw03.ffmuc.net" port 10000', + 'ipv4 "gw03.freifunk-muenchen.de" port 10000', + }, + }, + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + 'ipv4 "gw04.ffmuc.net" port 10000', + 'ipv4 "gw04.freifunk-muenchen.de" port 10000', + }, + }, + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + 'ipv4 "gw05.ffmuc.net" port 10000', + 'ipv4 "gw05.freifunk-muenchen.de" port 10000', + }, + }, + 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', + }, + }, + }, + }, + }, + }, + + 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 = 2, + 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) + }, + }, + }, + }, + + simple_tc = { + mesh_vpn = { + ifname = 'mesh-vpn', + enabled = false, + limit_egress = 1200, + limit_ingress = 12000, + }, + }, +} +-- vim: set ft=lua:ts=2:sw=2:et diff --git a/extra/ffmuc_umland.conf b/extra/ffmuc_umland.conf new file mode 100644 index 0000000..a5ecdbd --- /dev/null +++ b/extra/ffmuc_umland.conf @@ -0,0 +1,134 @@ +{ + hostname_prefix = '', + site_name = 'Freifunk München Umland', + site_code = 'ffmuc_umland', + opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%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 = { + ssid = 'muenchen.freifunk.net', + channel = 6, + htmode = 'HT20', + mesh_ssid = 'mesh.ffmuc.umland', + mesh_bssid = '02:0E:8E:1E:61:19', + mesh_mcast_rate = 12000, + }, + + wifi5 = { + ssid = 'muenchen.freifunk.net', + 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.96.1', + ip6 = 'fdef:ffc0:4fff:2::1', + mac = '16:41:95:40:f7:dc', + }, + + fastd_mesh_vpn = { + methods = {'salsa2012+umac'}, + mtu = 1426, + groups = { + backbone = { + limit = 1, + peers = { + gwu01 = { + key = '70299e3a589522a89306732fdfe43f35d9af083e4db322d87be52cf45c89771b', + remotes = { + 'ipv4 "gwu01.ffmuc.net" port 10010', + 'ipv4 "gwu01.freifunk-muenchen.de" port 10010', + }, + }, + gwu02 = { + key = '32765d3337be727de5840930a221962a59cf5529ae6c1d3753e58ad460e510a5', + remotes = { + 'ipv4 "gwu02.ffmuc.net" port 10011', + 'ipv4 "gwu02.freifunk-muenchen.de" port 10011', + }, + }, + gwu03 = { + key = '61fe3197ed7e934284adc2571523104d8e5391db2427dca9528f0d34bb60a522', + remotes = { + 'ipv4 "gwu03.ffmuc.net" port 10012', + 'ipv4 "gwu03.freifunk-muenchen.de" port 10012', + }, + }, + gwu04 = { + key = '443898162e1e9ec09da0904d72d8145026f4452a4b1e880a07dc6699418c69d1', + remotes = { + 'ipv4 "gwu04.ffmuc.net" port 10013', + 'ipv4 "gwu04.freifunk-muenchen.de" port 10013', + }, + }, + gwu05 = { + key = 'b6de9fec8569b1fcdea8e7c45224ec30513d24e01af71148c6d640b5df471950', + remotes = { + 'ipv4 "gwu05.ffmuc.net" port 10014', + 'ipv4 "gwu05.freifunk-muenchen.de" port 10014', + }, + }, + }, + }, + }, + }, + + autoupdater = { + enabled = 1, + branch = 'stable', + branches = { + stable = { + name = 'stable', + mirrors = { + 'http://firmware.ffmuc.net/umland/stable/sysupgrade/', + 'http://[fdef:ffc0:4fff::130]/umland/stable/sysupgrade/', + }, + probability = 0.1, + good_signatures = 2, + pubkeys = { + '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole + '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz + '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris + '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz) + }, + }, + experimental = { + name = 'experimental', + mirrors = { + 'http://firmware.ffmuc.net/umland/experimental/sysupgrade/', + 'http://[fdef:ffc0:4fff::130]/umland/experimental/sysupgrade/', + }, + probability = 0.5, + good_signatures = 2, + pubkeys = { + '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole + '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz + '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris + '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 diff --git a/modules b/modules index a505384..e88705d 100644 --- a/modules +++ b/modules @@ -2,3 +2,8 @@ GLUON_SITE_FEEDS='ffmuc_packages' PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/freifunkMUC/gluon-packages.git PACKAGES_FFMUC_PACKAGES_COMMIT=82e721ad5d7c9eca8728954cfa1ab1d5b9168487 + +GLUON_SITE_FEEDS='gluon_community_repositorys' + +PACKAGES_GLUON_COMMUNITY_REPOSITORYS_REPO=https://github.com/freifunk-gcp/v2015.1 +PACKAGES_GLUON_COMMUNITY_REPOSITORYS_COMMIT=2e7326aa903273485617f28cdf17dc06dfe44a87 diff --git a/site.conf b/site.conf deleted file mode 100644 index 81c4667..0000000 --- a/site.conf +++ /dev/null @@ -1,155 +0,0 @@ -{ - hostname_prefix = '', - site_name = 'Freifunk München', - site_code = 'ffmuc', - opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%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 = { - ssid = 'muenchen.freifunk.net', - channel = 6, - htmode = 'HT20', - mesh_ssid = 'mesh.ffmuc', - mesh_bssid = '02:0E:8E:1E:61:17', - mesh_mcast_rate = 12000, - }, - - wifi5 = { - ssid = 'muenchen.freifunk.net', - channel = 44, - htmode = 'HT40+', - mesh_ssid = 'mesh.ffmuc', - mesh_bssid = '02:0E:8E:1E:61:17', - mesh_mcast_rate = 12000, - }, - - 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 = 1426, - groups = { - backbone = { - limit = 1, - peers = { - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - 'ipv4 "gw03.ffmuc.net" port 10000', - 'ipv4 "gw03.freifunk-muenchen.de" port 10000', - }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - 'ipv4 "gw04.ffmuc.net" port 10000', - 'ipv4 "gw04.freifunk-muenchen.de" port 10000', - }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - 'ipv4 "gw05.ffmuc.net" port 10000', - 'ipv4 "gw05.freifunk-muenchen.de" port 10000', - }, - }, - 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', - }, - }, - }, - }, - }, - }, - - 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 = 2, - 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) - }, - }, - }, - }, - - simple_tc = { - mesh_vpn = { - ifname = 'mesh-vpn', - enabled = false, - limit_egress = 1200, - limit_ingress = 12000, - }, - }, -} --- vim: set ft=lua:ts=2:sw=2:et diff --git a/site.conf b/site.conf new file mode 120000 index 0000000..ab6cfe3 --- /dev/null +++ b/site.conf @@ -0,0 +1 @@ +./extra/ffmuc.conf \ No newline at end of file diff --git a/site.mk b/site.mk index e3e819b..04814ad 100644 --- a/site.mk +++ b/site.mk @@ -9,6 +9,7 @@ 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 \ @@ -23,9 +24,9 @@ GLUON_SITE_PACKAGES := \ gluon-status-page \ iwinfo \ iptables \ - haveged \ - gluon-ebtables-filter-arp-ffmuc \ - gluon-ebtables-filter-multicast-ffmuc + haveged #\ +# gluon-ebtables-filter-arp-ffmuc \ +# gluon-ebtables-filter-multicast-ffmuc DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d') From 48c96b7ed42b7e1307a45636aff2dc03c8ace66e Mon Sep 17 00:00:00 2001 From: Christian Obersteiner Date: Mon, 28 Sep 2015 21:38:47 +0200 Subject: [PATCH 22/39] Softlinking site.conf to the default .conf does not work --- site.conf | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 155 insertions(+), 1 deletion(-) mode change 120000 => 100644 site.conf diff --git a/site.conf b/site.conf deleted file mode 120000 index ab6cfe3..0000000 --- a/site.conf +++ /dev/null @@ -1 +0,0 @@ -./extra/ffmuc.conf \ No newline at end of file diff --git a/site.conf b/site.conf new file mode 100644 index 0000000..81c4667 --- /dev/null +++ b/site.conf @@ -0,0 +1,155 @@ +{ + hostname_prefix = '', + site_name = 'Freifunk München', + site_code = 'ffmuc', + opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%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 = { + ssid = 'muenchen.freifunk.net', + channel = 6, + htmode = 'HT20', + mesh_ssid = 'mesh.ffmuc', + mesh_bssid = '02:0E:8E:1E:61:17', + mesh_mcast_rate = 12000, + }, + + wifi5 = { + ssid = 'muenchen.freifunk.net', + channel = 44, + htmode = 'HT40+', + mesh_ssid = 'mesh.ffmuc', + mesh_bssid = '02:0E:8E:1E:61:17', + mesh_mcast_rate = 12000, + }, + + 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 = 1426, + groups = { + backbone = { + limit = 1, + peers = { + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + 'ipv4 "gw03.ffmuc.net" port 10000', + 'ipv4 "gw03.freifunk-muenchen.de" port 10000', + }, + }, + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + 'ipv4 "gw04.ffmuc.net" port 10000', + 'ipv4 "gw04.freifunk-muenchen.de" port 10000', + }, + }, + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + 'ipv4 "gw05.ffmuc.net" port 10000', + 'ipv4 "gw05.freifunk-muenchen.de" port 10000', + }, + }, + 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', + }, + }, + }, + }, + }, + }, + + 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 = 2, + 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) + }, + }, + }, + }, + + simple_tc = { + mesh_vpn = { + ifname = 'mesh-vpn', + enabled = false, + limit_egress = 1200, + limit_ingress = 12000, + }, + }, +} +-- vim: set ft=lua:ts=2:sw=2:et From c4652bc691b7b8e122bd971270ae378ced514288 Mon Sep 17 00:00:00 2001 From: chris007de Date: Wed, 30 Sep 2015 18:32:23 +0200 Subject: [PATCH 23/39] experimental: 2 signatures see https://lqfb.freifunk-muenchen.de/lf/issue/show/77.html --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 95eeb70..83a66e3 100644 --- a/site.conf +++ b/site.conf @@ -146,7 +146,7 @@ 'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/', }, probability = 0.5, - good_signatures = 3, + good_signatures = 2, pubkeys = { '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz From 575c48c2843a0a56638a426754df8dfd045e1c77 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 4 Oct 2015 11:24:13 +0200 Subject: [PATCH 24/39] Try symlinking extra/ffmuc.conf to site.conf --- extra/ffmuc.conf | 156 +---------------------------------------------- 1 file changed, 1 insertion(+), 155 deletions(-) mode change 100644 => 120000 extra/ffmuc.conf diff --git a/extra/ffmuc.conf b/extra/ffmuc.conf deleted file mode 100644 index 81c4667..0000000 --- a/extra/ffmuc.conf +++ /dev/null @@ -1,155 +0,0 @@ -{ - hostname_prefix = '', - site_name = 'Freifunk München', - site_code = 'ffmuc', - opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%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 = { - ssid = 'muenchen.freifunk.net', - channel = 6, - htmode = 'HT20', - mesh_ssid = 'mesh.ffmuc', - mesh_bssid = '02:0E:8E:1E:61:17', - mesh_mcast_rate = 12000, - }, - - wifi5 = { - ssid = 'muenchen.freifunk.net', - channel = 44, - htmode = 'HT40+', - mesh_ssid = 'mesh.ffmuc', - mesh_bssid = '02:0E:8E:1E:61:17', - mesh_mcast_rate = 12000, - }, - - 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 = 1426, - groups = { - backbone = { - limit = 1, - peers = { - gw03 = { - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - 'ipv4 "gw03.ffmuc.net" port 10000', - 'ipv4 "gw03.freifunk-muenchen.de" port 10000', - }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - 'ipv4 "gw04.ffmuc.net" port 10000', - 'ipv4 "gw04.freifunk-muenchen.de" port 10000', - }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - 'ipv4 "gw05.ffmuc.net" port 10000', - 'ipv4 "gw05.freifunk-muenchen.de" port 10000', - }, - }, - 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', - }, - }, - }, - }, - }, - }, - - 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 = 2, - 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) - }, - }, - }, - }, - - simple_tc = { - mesh_vpn = { - ifname = 'mesh-vpn', - enabled = false, - limit_egress = 1200, - limit_ingress = 12000, - }, - }, -} --- vim: set ft=lua:ts=2:sw=2:et diff --git a/extra/ffmuc.conf b/extra/ffmuc.conf new file mode 120000 index 0000000..2873803 --- /dev/null +++ b/extra/ffmuc.conf @@ -0,0 +1 @@ +../site.conf \ No newline at end of file From 11e58e4d0caeb3ca06ed335c05783436da261881 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 4 Oct 2015 13:10:15 +0200 Subject: [PATCH 25/39] Reenable ebtables filters --- modules | 8 ++++---- site.mk | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules b/modules index e88705d..25756ab 100644 --- a/modules +++ b/modules @@ -1,9 +1,9 @@ GLUON_SITE_FEEDS='ffmuc_packages' PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/freifunkMUC/gluon-packages.git -PACKAGES_FFMUC_PACKAGES_COMMIT=82e721ad5d7c9eca8728954cfa1ab1d5b9168487 +PACKAGES_FFMUC_PACKAGES_COMMIT=d4d5aa3e3874ca6099e91fd70008ad5d54038169 -GLUON_SITE_FEEDS='gluon_community_repositorys' +GLUON_SITE_FEEDS='gluon_community' -PACKAGES_GLUON_COMMUNITY_REPOSITORYS_REPO=https://github.com/freifunk-gcp/v2015.1 -PACKAGES_GLUON_COMMUNITY_REPOSITORYS_COMMIT=2e7326aa903273485617f28cdf17dc06dfe44a87 +PACKAGES_GLUON_COMMUNITY_REPO=https://github.com/freifunk-gcp/v2015.1 +PACKAGES_GLUON_COMMUNITY_COMMIT=2e7326aa903273485617f28cdf17dc06dfe44a87 diff --git a/site.mk b/site.mk index 04814ad..72171f4 100644 --- a/site.mk +++ b/site.mk @@ -9,7 +9,7 @@ GLUON_SITE_PACKAGES := \ gluon-config-mode-mesh-vpn \ gluon-config-mode-geo-location \ gluon-config-mode-contact-info \ - gluon-config-mode-site-select \ + gluon-config-mode-site-select \ gluon-ebtables-filter-multicast \ gluon-ebtables-filter-ra-dhcp \ gluon-luci-admin \ @@ -24,9 +24,9 @@ GLUON_SITE_PACKAGES := \ gluon-status-page \ iwinfo \ iptables \ - haveged #\ -# gluon-ebtables-filter-arp-ffmuc \ -# gluon-ebtables-filter-multicast-ffmuc + haveged \ + gluon-ebtables-filter-arp-ffmuc \ + gluon-ebtables-filter-multicast-ffmuc DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d') From c1b7beaebbc94712edb9f804887fe5b9a7463acd Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 4 Oct 2015 14:04:59 +0200 Subject: [PATCH 26/39] Don't overwrite GLUON_SITE_FEEDS in modules --- modules | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules b/modules index 25756ab..0723976 100644 --- a/modules +++ b/modules @@ -1,9 +1,7 @@ -GLUON_SITE_FEEDS='ffmuc_packages' +GLUON_SITE_FEEDS='ffmuc_packages gluon_community' PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/freifunkMUC/gluon-packages.git PACKAGES_FFMUC_PACKAGES_COMMIT=d4d5aa3e3874ca6099e91fd70008ad5d54038169 -GLUON_SITE_FEEDS='gluon_community' - PACKAGES_GLUON_COMMUNITY_REPO=https://github.com/freifunk-gcp/v2015.1 PACKAGES_GLUON_COMMUNITY_COMMIT=2e7326aa903273485617f28cdf17dc06dfe44a87 From 4728e2d664d3d2c528b14424495b01024962acb2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 4 Oct 2015 15:29:34 +0200 Subject: [PATCH 27/39] Add ffmuc_welcome site.conf --- extra/ffmuc_welcome.conf | 127 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 extra/ffmuc_welcome.conf diff --git a/extra/ffmuc_welcome.conf b/extra/ffmuc_welcome.conf new file mode 100644 index 0000000..9e17be4 --- /dev/null +++ b/extra/ffmuc_welcome.conf @@ -0,0 +1,127 @@ +{ + 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', + + 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 = { + ssid = 'muenchen.freifunk.net', + channel = 6, + htmode = 'HT20', + mesh_ssid = 'mesh.ffmuc.welcome', + mesh_bssid = '02:0E:8E:1E:61:18', + mesh_mcast_rate = 12000, + }, + + wifi5 = { + ssid = 'muenchen.freifunk.net', + channel = 44, + htmode = 'HT40+', + mesh_ssid = 'mesh.ffmuc.welcome', + mesh_bssid = '02:0E:8E:1E:61:18', + mesh_mcast_rate = 12000, + }, + + 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 = 1426, + groups = { + backbone = { + limit = 1, + peers = { + gwf01 = { + key = '89951ed50d591c0a4682ae50cb38806efe44dd736ba91ef64c9ef06b20ec186e', + remotes = { + 'ipv4 "gwf01.ffmuc.net" port 11000', + 'ipv4 "gwf01.freifunk-muenchen.de" port 11000', + }, + }, + gwf02 = { + key = 'e255f2671c56f28a65173719be61939e5d48518eaa4da0d19283fd5395908e35', + remotes = { + 'ipv4 "gwf02.ffmuc.net" port 11000', + 'ipv4 "gwf02.freifunk-muenchen.de" port 11001', + }, + }, + gwf03 = { + key = 'bf16080ab05a4416285638208e6f17055ea8f92cfd496c61eee1f1160cf6d386', + remotes = { + 'ipv4 "gwf03.ffmuc.net" port 11000', + 'ipv4 "gwf03.freifunk-muenchen.de" port 11002', + }, + }, + gwf04 = { + key = '421a2c8e78f86d08fa7c8c7660b0dc073640ff365acb308ab92155c33488c539', + remotes = { + 'ipv4 "gwf04.ffmuc.net" port 11000', + 'ipv4 "gwf04.freifunk-muenchen.de" port 11003', + }, + }, + }, + }, + }, + }, + + autoupdater = { + enabled = 1, + branch = 'stable', + branches = { + stable = { + name = 'stable', + mirrors = { + 'http://firmware.ffmuc.net/welcome/stable/sysupgrade/', + 'http://[fdef:ffc0:4fff::130]/welcome/stable/sysupgrade/', + }, + probability = 0.1, + good_signatures = 2, + pubkeys = { + '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole + '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz + '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris + '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz) + }, + }, + experimental = { + name = 'experimental', + mirrors = { + 'http://firmware.ffmuc.net/welcome/experimental/sysupgrade/', + 'http://[fdef:ffc0:4fff::130]/welcome/experimental/sysupgrade/', + }, + probability = 0.5, + good_signatures = 2, + pubkeys = { + '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole + '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz + '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris + '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 From 4d1fdf95a7263429dc3261f309b02dd2ab207d5d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 5 Oct 2015 12:35:44 +0200 Subject: [PATCH 28/39] Remove extra site symlink --- extra/ffmuc.conf | 156 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 155 insertions(+), 1 deletion(-) mode change 120000 => 100644 extra/ffmuc.conf diff --git a/extra/ffmuc.conf b/extra/ffmuc.conf deleted file mode 120000 index 2873803..0000000 --- a/extra/ffmuc.conf +++ /dev/null @@ -1 +0,0 @@ -../site.conf \ No newline at end of file diff --git a/extra/ffmuc.conf b/extra/ffmuc.conf new file mode 100644 index 0000000..81c4667 --- /dev/null +++ b/extra/ffmuc.conf @@ -0,0 +1,155 @@ +{ + hostname_prefix = '', + site_name = 'Freifunk München', + site_code = 'ffmuc', + opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%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 = { + ssid = 'muenchen.freifunk.net', + channel = 6, + htmode = 'HT20', + mesh_ssid = 'mesh.ffmuc', + mesh_bssid = '02:0E:8E:1E:61:17', + mesh_mcast_rate = 12000, + }, + + wifi5 = { + ssid = 'muenchen.freifunk.net', + channel = 44, + htmode = 'HT40+', + mesh_ssid = 'mesh.ffmuc', + mesh_bssid = '02:0E:8E:1E:61:17', + mesh_mcast_rate = 12000, + }, + + 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 = 1426, + groups = { + backbone = { + limit = 1, + peers = { + gw03 = { + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + 'ipv4 "gw03.ffmuc.net" port 10000', + 'ipv4 "gw03.freifunk-muenchen.de" port 10000', + }, + }, + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + 'ipv4 "gw04.ffmuc.net" port 10000', + 'ipv4 "gw04.freifunk-muenchen.de" port 10000', + }, + }, + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + 'ipv4 "gw05.ffmuc.net" port 10000', + 'ipv4 "gw05.freifunk-muenchen.de" port 10000', + }, + }, + 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', + }, + }, + }, + }, + }, + }, + + 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 = 2, + 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) + }, + }, + }, + }, + + simple_tc = { + mesh_vpn = { + ifname = 'mesh-vpn', + enabled = false, + limit_egress = 1200, + limit_ingress = 12000, + }, + }, +} +-- vim: set ft=lua:ts=2:sw=2:et From 248c5643564f85ffb70c5f3ac4efbe701bc47c89 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 9 Oct 2015 05:46:54 +0200 Subject: [PATCH 29/39] Revert "Merge pull request #17 from freifunkMUC/chris007de-patch-1" This reverts commit 5e3024a061809a26af3ff5a1a30b7b80cffe60fe, reversing changes made to 4d1fdf95a7263429dc3261f309b02dd2ab207d5d. --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 7ccf490..81c4667 100644 --- a/site.conf +++ b/site.conf @@ -117,7 +117,7 @@ 'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/', }, probability = 0.1, - good_signatures = 3, + good_signatures = 2, pubkeys = { '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz From 08f3a2abfd06e3341ec7569c5a198c0e162f4757 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 11 Oct 2015 10:35:20 +0200 Subject: [PATCH 30/39] Update gluon to fix empty function announce entries --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 24a64a8..cd1a42a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git -GLUON_GIT_REF := 4268d32a8d70fa734b2d025972c5caca27705142 +GLUON_GIT_REF := d5caab23e401f8606cdfab4e2f31212013485eaa SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From ae221b63255ff0ad4cc2da2bcbe9a3dcc1be359e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 11 Oct 2015 10:46:11 +0200 Subject: [PATCH 31/39] Update gluon --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cd1a42a..43e8c76 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git -GLUON_GIT_REF := d5caab23e401f8606cdfab4e2f31212013485eaa +GLUON_GIT_REF := a7e86812c90cf31f0eb123c1fbb7fa4c568dc9a7 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From f05c290a11a131277d89b97908306827cc3128e3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 11 Oct 2015 11:37:12 +0200 Subject: [PATCH 32/39] Revert gluon update --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 43e8c76..24a64a8 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git -GLUON_GIT_REF := a7e86812c90cf31f0eb123c1fbb7fa4c568dc9a7 +GLUON_GIT_REF := 4268d32a8d70fa734b2d025972c5caca27705142 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 7f3333a684e48109130455a1be878fb8df468279 Mon Sep 17 00:00:00 2001 From: Christian Obersteiner Date: Sun, 11 Oct 2015 15:17:53 +0200 Subject: [PATCH 33/39] using our own gluon-config-site-select module --- modules | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules b/modules index 0723976..12768df 100644 --- a/modules +++ b/modules @@ -1,7 +1,4 @@ -GLUON_SITE_FEEDS='ffmuc_packages gluon_community' +GLUON_SITE_FEEDS='ffmuc_packages' PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/freifunkMUC/gluon-packages.git -PACKAGES_FFMUC_PACKAGES_COMMIT=d4d5aa3e3874ca6099e91fd70008ad5d54038169 - -PACKAGES_GLUON_COMMUNITY_REPO=https://github.com/freifunk-gcp/v2015.1 -PACKAGES_GLUON_COMMUNITY_COMMIT=2e7326aa903273485617f28cdf17dc06dfe44a87 +PACKAGES_FFMUC_PACKAGES_COMMIT=985bfad86005c7a9f754ddc8432d88641d8183b3 From 5f53ae04fc9c3db5e440c87a896c3d01752fad1f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 12 Oct 2015 15:38:03 +0200 Subject: [PATCH 34/39] Update gluon --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 24a64a8..c658137 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git -GLUON_GIT_REF := 4268d32a8d70fa734b2d025972c5caca27705142 +GLUON_GIT_REF := 6490cb34142ff75a500aa64b248c8fa32fec0042 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 029b1e212357f0208c34e4f4e6a31501103de278 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 14 Oct 2015 21:14:16 +0200 Subject: [PATCH 35/39] Switch autoupdater URL back to main firmware repo path --- CHANGELOG.md | 4 ++++ extra/ffmuc_umland.conf | 8 ++++---- extra/ffmuc_welcome.conf | 8 ++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35183d5..5e1d2c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Freifunk München Firmware Changelog +## 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 diff --git a/extra/ffmuc_umland.conf b/extra/ffmuc_umland.conf index a5ecdbd..30d53e2 100644 --- a/extra/ffmuc_umland.conf +++ b/extra/ffmuc_umland.conf @@ -92,8 +92,8 @@ stable = { name = 'stable', mirrors = { - 'http://firmware.ffmuc.net/umland/stable/sysupgrade/', - 'http://[fdef:ffc0:4fff::130]/umland/stable/sysupgrade/', + 'http://firmware.ffmuc.net/stable/sysupgrade/', + 'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/', }, probability = 0.1, good_signatures = 2, @@ -107,8 +107,8 @@ experimental = { name = 'experimental', mirrors = { - 'http://firmware.ffmuc.net/umland/experimental/sysupgrade/', - 'http://[fdef:ffc0:4fff::130]/umland/experimental/sysupgrade/', + 'http://firmware.ffmuc.net/experimental/sysupgrade/', + 'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/', }, probability = 0.5, good_signatures = 2, diff --git a/extra/ffmuc_welcome.conf b/extra/ffmuc_welcome.conf index 9e17be4..122f1c6 100644 --- a/extra/ffmuc_welcome.conf +++ b/extra/ffmuc_welcome.conf @@ -85,8 +85,8 @@ stable = { name = 'stable', mirrors = { - 'http://firmware.ffmuc.net/welcome/stable/sysupgrade/', - 'http://[fdef:ffc0:4fff::130]/welcome/stable/sysupgrade/', + 'http://firmware.ffmuc.net/stable/sysupgrade/', + 'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/', }, probability = 0.1, good_signatures = 2, @@ -100,8 +100,8 @@ experimental = { name = 'experimental', mirrors = { - 'http://firmware.ffmuc.net/welcome/experimental/sysupgrade/', - 'http://[fdef:ffc0:4fff::130]/welcome/experimental/sysupgrade/', + 'http://firmware.ffmuc.net/experimental/sysupgrade/', + 'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/', }, probability = 0.5, good_signatures = 2, From d827615aa3fd5d5c6f09e15761d9be33d2076d03 Mon Sep 17 00:00:00 2001 From: Christian Obersteiner Date: Sat, 17 Oct 2015 11:31:49 +0200 Subject: [PATCH 36/39] added support for 841 v10 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c658137..8f6fd93 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git -GLUON_GIT_REF := 6490cb34142ff75a500aa64b248c8fa32fec0042 +GLUON_GIT_REF := 4c3ba39e05bf72d4c2c1e8a370c55001b02c2993 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From ac8de1623d00c36cb8d3e8e191e517860ce8b1c6 Mon Sep 17 00:00:00 2001 From: Christian Obersteiner Date: Sat, 17 Oct 2015 11:39:08 +0200 Subject: [PATCH 37/39] Revert "added support for 841 v10" This reverts commit d827615aa3fd5d5c6f09e15761d9be33d2076d03. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8f6fd93..c658137 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git -GLUON_GIT_REF := 4c3ba39e05bf72d4c2c1e8a370c55001b02c2993 +GLUON_GIT_REF := 6490cb34142ff75a500aa64b248c8fa32fec0042 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 9ce45ff4708f3f486108d7c11267cdba03406037 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 15 Oct 2015 23:03:08 +0200 Subject: [PATCH 38/39] Release 2015.6.2 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e1d2c4..48ac834 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Freifunk München Firmware Changelog +## 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 From 58e5876099406c5971ec66421a124a2842dfec03 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 24 Oct 2015 03:53:08 +0200 Subject: [PATCH 39/39] Release 2015.7 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48ac834..848cc80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Freifunk München Firmware Changelog +## v2015.7 + * New stable unified firmware for all segments with site-select feature + ## v2015.6.2 * Bugfix build for welcome version