From 51d3e91e45a457cee915e7c08a0145f2092d4486 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 22 Aug 2015 15:38:30 +0200 Subject: [PATCH 01/28] Update to gluon babel branch --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d478ec1..91120c6 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_REF := e90067e26e88d29186f9c2b82841e0abfaffd140 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 2cc57e495e3bd55400e1f494da9f0427e54588cb Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 22 Aug 2015 15:38:43 +0200 Subject: [PATCH 02/28] Update site.conf & switch to mesh testing config --- site.conf | 90 +++++++++++++++++-------------------------------------- 1 file changed, 28 insertions(+), 62 deletions(-) diff --git a/site.conf b/site.conf index 7a8986d..1976a5a 100644 --- a/site.conf +++ b/site.conf @@ -15,21 +15,37 @@ regdom = 'DE', wifi24 = { - ssid = 'muenchen.freifunk.net', - channel = 6, + channel = 11, htmode = 'HT20', - mesh_ssid = 'mesh.ffmuc', - mesh_bssid = '02:0E:8E:1E:61:17', - mesh_mcast_rate = 12000, + ap = { + ssid = 'test.muenchen.freifunk.net', + }, + mesh = { + id = 'ffmuc-mesh', + mcast_rate = 12000, + }, + ibss = { + ssid = 'test.mesh.ffmuc', + bssid = '02:0E:8E:1E:61:18', + 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, + ap = { + ssid = 'test.muenchen.freifunk.net', + }, + mesh = { + id = 'ffmuc-mesh', + mcast_rate = 12000, + }, + ibss = { + ssid = 'test.mesh.ffmuc', + bssid = '02:0E:8E:1E:61:18', + mcast_rate = 12000, + }, }, next_node = { @@ -45,60 +61,10 @@ backbone = { limit = 1, peers = { - gw03 = { --[[ fpletz ]] - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + gw_test = { --[[ fpletz ]] + key = '23280df37b96cb587a3eeeb51c806bceeb627b8d063bb7dcc5492f4c9e3af356', remotes = { - 'ipv4 "gw03.ffmuc.net" port 10001', - 'ipv4 "gw03.freifunk-muenchen.de" port 10001', - }, - }, - gw04 = { - key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', - remotes = { - 'ipv4 "gw04.ffmuc.net" port 10001', - 'ipv4 "gw04.freifunk-muenchen.de" port 10001', - }, - }, - gw05 = { - key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', - remotes = { - 'ipv4 "gw05.ffmuc.net" port 10001', - 'ipv4 "gw05.freifunk-muenchen.de" port 10001', - }, - }, - gw06 = { - key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0', - remotes = { - 'ipv4 "gw06.ffmuc.net" port 10001', - 'ipv4 "gw06.freifunk-muenchen.de" port 10001', - }, - }, - gw07 = { - key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6', - remotes = { - 'ipv4 "gw07.ffmuc.net" port 10001', - 'ipv4 "gw07.freifunk-muenchen.de" port 10001', - }, - }, - gw08 = { - key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055', - remotes = { - 'ipv4 "gw08.ffmuc.net" port 10001', - 'ipv4 "gw08.freifunk-muenchen.de" port 10001', - }, - }, - gw09 = { - key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0', - remotes = { - 'ipv4 "gw09.ffmuc.net" port 10001', - 'ipv4 "gw09.freifunk-muenchen.de" port 10001', - }, - }, - gw10 = { - key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf', - remotes = { - 'ipv4 "gw10.ffmuc.net" port 10001', - 'ipv4 "gw10.freifunk-muenchen.de" port 10001', + 'ipv4 "hermes.fnordicwalking.de" port 16000', }, }, }, From c3fa48399683252060b644a47b10d6b3b4191795 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 22 Aug 2015 15:43:46 +0200 Subject: [PATCH 03/28] Enable babel meshing, disable batman --- site.conf | 4 ++++ site.mk | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/site.conf b/site.conf index 1976a5a..1e7e275 100644 --- a/site.conf +++ b/site.conf @@ -48,6 +48,10 @@ }, }, + babel_mesh = { + prefix = 'fdef:ffc0:4fff:ffff::/64', + }, + next_node = { ip4 = '10.80.0.1', ip6 = 'fdef:ffc0:4fff::1', diff --git a/site.mk b/site.mk index e3e819b..bf6d2f9 100644 --- a/site.mk +++ b/site.mk @@ -1,5 +1,5 @@ GLUON_SITE_PACKAGES := \ - gluon-mesh-batman-adv-15 \ + gluon-mesh-babel \ gluon-alfred \ gluon-announced \ gluon-autoupdater \ @@ -23,10 +23,7 @@ GLUON_SITE_PACKAGES := \ gluon-status-page \ iwinfo \ iptables \ - haveged \ - gluon-ebtables-filter-arp-ffmuc \ - gluon-ebtables-filter-multicast-ffmuc - + haveged DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d') From f7ef41a3eb2b1b9d7cec75594ffd7a9168d849eb Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 22 Aug 2015 23:22:56 +0200 Subject: [PATCH 04/28] 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 91120c6..ad15141 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 297375027507487403b5791c8ff7966e5e31a67e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 22 Aug 2015 23:24:28 +0200 Subject: [PATCH 05/28] Revert "Enable babel meshing, disable batman" This reverts commit c3fa48399683252060b644a47b10d6b3b4191795. --- site.conf | 4 ---- site.mk | 7 +++++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/site.conf b/site.conf index 1e7e275..1976a5a 100644 --- a/site.conf +++ b/site.conf @@ -48,10 +48,6 @@ }, }, - babel_mesh = { - prefix = 'fdef:ffc0:4fff:ffff::/64', - }, - next_node = { ip4 = '10.80.0.1', ip6 = 'fdef:ffc0:4fff::1', diff --git a/site.mk b/site.mk index bf6d2f9..e3e819b 100644 --- a/site.mk +++ b/site.mk @@ -1,5 +1,5 @@ GLUON_SITE_PACKAGES := \ - gluon-mesh-babel \ + gluon-mesh-batman-adv-15 \ gluon-alfred \ gluon-announced \ gluon-autoupdater \ @@ -23,7 +23,10 @@ GLUON_SITE_PACKAGES := \ gluon-status-page \ iwinfo \ iptables \ - haveged + haveged \ + gluon-ebtables-filter-arp-ffmuc \ + gluon-ebtables-filter-multicast-ffmuc + DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d') From 4fd79b52ffc964692d861292a98f8b2f94983100 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 22 Aug 2015 23:25:28 +0200 Subject: [PATCH 06/28] Update to gluon master --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ad15141..1b75988 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 := e90067e26e88d29186f9c2b82841e0abfaffd140 +GLUON_GIT_REF := 5cd17b9b9bb4e6b01d3986bbb174beb3fbcccdee SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 7ff33f3d44913b44cab1d55e41b720f383859113 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 29 Aug 2015 01:54:58 +0200 Subject: [PATCH 07/28] Update to current gluon master --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1b75988..6f48f7b 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 := 5cd17b9b9bb4e6b01d3986bbb174beb3fbcccdee +GLUON_GIT_REF := 3dbe4bc80fece006489e7d20388b7093125a30a1 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 0d7507ab6d16d35106cbc3d22af547115f97288a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 29 Aug 2015 16:38:55 +0200 Subject: [PATCH 08/28] Update to ffmuc gluon fork (master + status-page) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6f48f7b..d3dcd08 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 := 3dbe4bc80fece006489e7d20388b7093125a30a1 +GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git +GLUON_GIT_REF := 5cd17b9b9bb4e6b01d3986bbb174beb3fbcccdee SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 3ea1990a14085ce100270303145eb0ee0bef9175 Mon Sep 17 00:00:00 2001 From: Christian Obersteiner Date: Wed, 2 Sep 2015 21:43:03 +0200 Subject: [PATCH 09/28] removing multiple jobs from makefile (again), as it is obviously still broken --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d3dcd08..6774cb7 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,8 @@ else GLUON_BRANCH := experimental endif -JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l) +#JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l) +JOBS ?= 1 GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \ GLUON_RELEASE=${GLUON_RELEASE} \ From 0caf270234da537b1eb49a1279830d59f5478818 Mon Sep 17 00:00:00 2001 From: Christian Obersteiner Date: Wed, 2 Sep 2015 21:54:31 +0200 Subject: [PATCH 10/28] Choosing current head of our own gluon repo (with currently latest status-page branch from original gluon repo) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6774cb7..12b2876 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 := 5cd17b9b9bb4e6b01d3986bbb174beb3fbcccdee +GLUON_GIT_REF := f07e78bd1d21013fcb151bc9710e47d18b1dac32 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 54c7ee40539675bf94df062c0cdcf40e967869d4 Mon Sep 17 00:00:00 2001 From: Christian Obersteiner Date: Wed, 2 Sep 2015 22:41:04 +0200 Subject: [PATCH 11/28] added clean to target build --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 12b2876..c5df56f 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,8 @@ info: @echo '# Building release ${GLUON_RELEASE} for branch ${GLUON_BRANCH}' @echo -build: gluon-prepare +build: clean + gluon-prepare for target in ${GLUON_TARGETS}; do \ echo ""Building target $$target""; \ ${GLUON_MAKE} GLUON_TARGET="$$target"; \ From 7e1e72593ffd9d0b73151be105ccceb015adc2c4 Mon Sep 17 00:00:00 2001 From: Christian Obersteiner Date: Wed, 2 Sep 2015 22:43:12 +0200 Subject: [PATCH 12/28] grml spaces to tab --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c5df56f..b5ef9f8 100644 --- a/Makefile +++ b/Makefile @@ -34,8 +34,8 @@ info: @echo '# Building release ${GLUON_RELEASE} for branch ${GLUON_BRANCH}' @echo -build: clean - gluon-prepare +build: clean + gluon-prepare for target in ${GLUON_TARGETS}; do \ echo ""Building target $$target""; \ ${GLUON_MAKE} GLUON_TARGET="$$target"; \ From a9e8748f14598761481fc941a32c2c18d376c800 Mon Sep 17 00:00:00 2001 From: Christian Obersteiner Date: Wed, 2 Sep 2015 22:49:03 +0200 Subject: [PATCH 13/28] put gluon-clean into gluon-prepare --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b5ef9f8..6df38f2 100644 --- a/Makefile +++ b/Makefile @@ -34,8 +34,7 @@ info: @echo '# Building release ${GLUON_RELEASE} for branch ${GLUON_BRANCH}' @echo -build: clean - gluon-prepare +build: gluon-prepare for target in ${GLUON_TARGETS}; do \ echo ""Building target $$target""; \ ${GLUON_MAKE} GLUON_TARGET="$$target"; \ @@ -51,7 +50,7 @@ sign: manifest ${GLUON_BUILD_DIR}: git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR} -gluon-prepare: images-clean ${GLUON_BUILD_DIR} +gluon-prepare: gluon-clean images-clean ${GLUON_BUILD_DIR} (cd ${GLUON_BUILD_DIR} \ && git remote set-url origin ${GLUON_GIT_URL} \ && git fetch origin \ From c8515daac8a1f155dc8059eca2b8beddc39ec600 Mon Sep 17 00:00:00 2001 From: Christian Obersteiner Date: Fri, 4 Sep 2015 17:00:03 +0200 Subject: [PATCH 14/28] checking if the status-page branch is broken by building currently latest master --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6df38f2..682cbc4 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 := f07e78bd1d21013fcb151bc9710e47d18b1dac32 +GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git +GLUON_GIT_REF := 96033758abae1df069c41e1baae5d48b08979e16 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 77bd955825ca7da77297d1aba5e8470dc07df0ee Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 19 Sep 2015 20:58:19 +0200 Subject: [PATCH 15/28] Update to current gluon master --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 682cbc4..7d19067 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 := 96033758abae1df069c41e1baae5d48b08979e16 +GLUON_GIT_REF := 3f72e682c5c282d4bfcea33f9ffa5534cc7b8253 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 52ae9f407b66224ab545463b487e98e74bf61900 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 4 Oct 2015 22:48:00 +0200 Subject: [PATCH 16/28] Update to current gluon master --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7d19067..3eaf5be 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 := 3f72e682c5c282d4bfcea33f9ffa5534cc7b8253 +GLUON_GIT_REF := 9640e66005e901e8f6c2a16fadb2a67112dc058e SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From dda8b5b8dce045d6485e1ee712043a9102c5a5e8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 5 Oct 2015 11:52:22 +0200 Subject: [PATCH 17/28] Revert "Update site.conf & switch to mesh testing config" This reverts commit 2cc57e495e3bd55400e1f494da9f0427e54588cb. --- site.conf | 90 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 62 insertions(+), 28 deletions(-) diff --git a/site.conf b/site.conf index 1976a5a..7a8986d 100644 --- a/site.conf +++ b/site.conf @@ -15,37 +15,21 @@ regdom = 'DE', wifi24 = { - channel = 11, + ssid = 'muenchen.freifunk.net', + channel = 6, htmode = 'HT20', - ap = { - ssid = 'test.muenchen.freifunk.net', - }, - mesh = { - id = 'ffmuc-mesh', - mcast_rate = 12000, - }, - ibss = { - ssid = 'test.mesh.ffmuc', - bssid = '02:0E:8E:1E:61:18', - mcast_rate = 12000, - }, + 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+', - ap = { - ssid = 'test.muenchen.freifunk.net', - }, - mesh = { - id = 'ffmuc-mesh', - mcast_rate = 12000, - }, - ibss = { - ssid = 'test.mesh.ffmuc', - bssid = '02:0E:8E:1E:61:18', - mcast_rate = 12000, - }, + mesh_ssid = 'mesh.ffmuc', + mesh_bssid = '02:0E:8E:1E:61:17', + mesh_mcast_rate = 12000, }, next_node = { @@ -61,10 +45,60 @@ backbone = { limit = 1, peers = { - gw_test = { --[[ fpletz ]] - key = '23280df37b96cb587a3eeeb51c806bceeb627b8d063bb7dcc5492f4c9e3af356', + gw03 = { --[[ fpletz ]] + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', remotes = { - 'ipv4 "hermes.fnordicwalking.de" port 16000', + 'ipv4 "gw03.ffmuc.net" port 10001', + 'ipv4 "gw03.freifunk-muenchen.de" port 10001', + }, + }, + gw04 = { + key = 'adee58f70829e6a03e568ca8273070b38c1b4cfe0beb69c53eea429646908126', + remotes = { + 'ipv4 "gw04.ffmuc.net" port 10001', + 'ipv4 "gw04.freifunk-muenchen.de" port 10001', + }, + }, + gw05 = { + key = '2242fe7fff1def15233a364487545e57c3c69e1b624d97bd5d72359b9851cb6e', + remotes = { + 'ipv4 "gw05.ffmuc.net" port 10001', + 'ipv4 "gw05.freifunk-muenchen.de" port 10001', + }, + }, + gw06 = { + key = 'd6834aa47a14358d804139630812276b3297e767d159c9cfd13fa6fb638000e0', + remotes = { + 'ipv4 "gw06.ffmuc.net" port 10001', + 'ipv4 "gw06.freifunk-muenchen.de" port 10001', + }, + }, + gw07 = { + key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6', + remotes = { + 'ipv4 "gw07.ffmuc.net" port 10001', + 'ipv4 "gw07.freifunk-muenchen.de" port 10001', + }, + }, + gw08 = { + key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055', + remotes = { + 'ipv4 "gw08.ffmuc.net" port 10001', + 'ipv4 "gw08.freifunk-muenchen.de" port 10001', + }, + }, + gw09 = { + key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0', + remotes = { + 'ipv4 "gw09.ffmuc.net" port 10001', + 'ipv4 "gw09.freifunk-muenchen.de" port 10001', + }, + }, + gw10 = { + key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf', + remotes = { + 'ipv4 "gw10.ffmuc.net" port 10001', + 'ipv4 "gw10.freifunk-muenchen.de" port 10001', }, }, }, From b47a2f68ecee7bfac0d2133bcdc775fe4d295f8a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 5 Oct 2015 11:55:33 +0200 Subject: [PATCH 18/28] site.conf: 802.11s support & new wifi config format --- site.conf | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/site.conf b/site.conf index 7a8986d..2d329b4 100644 --- a/site.conf +++ b/site.conf @@ -15,21 +15,37 @@ 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, + 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 = { - ssid = 'muenchen.freifunk.net', channel = 44, htmode = 'HT40+', - mesh_ssid = 'mesh.ffmuc', - mesh_bssid = '02:0E:8E:1E:61:17', - mesh_mcast_rate = 12000, + 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, + }, }, next_node = { From 9590d9636e7fe96b936889ed82fff2cb24c6283b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 6 Oct 2015 11:32:02 +0200 Subject: [PATCH 19/28] Switch to our gluon fork with new status-page --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3eaf5be..2507eb9 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 := 9640e66005e901e8f6c2a16fadb2a67112dc058e +GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git +GLUON_GIT_REF := f7f71cafceaaf07575313457908a3e2257b83433 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 52b4bc42894b14733ae927977448695aff25af08 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 6 Oct 2015 11:49:21 +0200 Subject: [PATCH 20/28] Switch MTU back to 1426 --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 2d329b4..6a32312 100644 --- a/site.conf +++ b/site.conf @@ -56,7 +56,7 @@ fastd_mesh_vpn = { methods = {'salsa2012+umac'}, - mtu = 1280, + mtu = 1426, groups = { backbone = { limit = 1, From d6dfa0e9fdc2e7dda13c15de5a202a1efb802050 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 6 Oct 2015 11:53:54 +0200 Subject: [PATCH 21/28] Revert "removing multiple jobs from makefile (again), as it is obviously still broken" This reverts commit 3ea1990a14085ce100270303145eb0ee0bef9175. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2507eb9..ae4240e 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,7 @@ else GLUON_BRANCH := experimental endif -#JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l) -JOBS ?= 1 +JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l) GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \ GLUON_RELEASE=${GLUON_RELEASE} \ From 7f2e8f369f82ebfc3ba85aa0d6496ed698fd4c55 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 6 Oct 2015 11:55:29 +0200 Subject: [PATCH 22/28] Don't clean gluon-build dir by default --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ae4240e..4dac9bf 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ sign: manifest ${GLUON_BUILD_DIR}: git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR} -gluon-prepare: gluon-clean images-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 \ From 9dacd3de947879f77eaa37db3cc1c033bd1c6d4f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 14 Oct 2015 21:26:51 +0200 Subject: [PATCH 23/28] Update to current gluon master --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4dac9bf..d41a314 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 := f7f71cafceaaf07575313457908a3e2257b83433 +GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git +GLUON_GIT_REF := 69d18cc9e984abb30a4e1be64ca9e369cdba924a SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From b3dc38716c09edcff69649857473b3e4a0bde2bb Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 14 Oct 2015 21:30:02 +0200 Subject: [PATCH 24/28] Set batman gw selection class to 3 (fast switch) --- site.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site.conf b/site.conf index 6a32312..0ae3c7b 100644 --- a/site.conf +++ b/site.conf @@ -48,6 +48,12 @@ }, }, + mesh = { + batman_adv = { + gw_sel_class = 3, + }, + }, + next_node = { ip4 = '10.80.0.1', ip6 = 'fdef:ffc0:4fff::1', From b3babe75d6856f61e853d0f608a7627249e2d29a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 16 Oct 2015 01:50:32 +0200 Subject: [PATCH 25/28] Update to current gluon master --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d41a314..a964d9d 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 := 69d18cc9e984abb30a4e1be64ca9e369cdba924a +GLUON_GIT_REF := 162c4b0cdd21d492f9de7f2a5e8b1df0e66febec SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 1e49768ce6899c0c899e7d2f8ac01dea7add0f71 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 17 Oct 2015 16:13:10 +0200 Subject: [PATCH 26/28] Update to current gluon master --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a964d9d..8772d67 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 := 162c4b0cdd21d492f9de7f2a5e8b1df0e66febec +GLUON_GIT_REF := 563f9afcc0b38766b6f1a2b776a44aa0f6e80908 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From a8d7aca3121aca0ec5d9e775346b0f7be6e8c30a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 5 Nov 2015 01:46:37 +0100 Subject: [PATCH 27/28] Update to current gluon master --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8772d67..298589b 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 := 563f9afcc0b38766b6f1a2b776a44aa0f6e80908 +GLUON_GIT_REF := 72e554fcff0c9f67c62630a41557eac30fa480a8 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From d116887d1ae5a593281364446d4e6c60a20e2235 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 5 Nov 2015 01:50:07 +0100 Subject: [PATCH 28/28] Images are now placed in output/images --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 298589b..152556c 100644 --- a/Makefile +++ b/Makefile @@ -41,15 +41,15 @@ build: gluon-prepare manifest: build ${GLUON_MAKE} manifest - mv ${GLUON_BUILD_DIR}/images . + mv ${GLUON_BUILD_DIR}/output . sign: manifest - ${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} images/sysupgrade/${GLUON_BRANCH}.manifest + ${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} output/images/sysupgrade/${GLUON_BRANCH}.manifest ${GLUON_BUILD_DIR}: git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR} -gluon-prepare: images-clean ${GLUON_BUILD_DIR} +gluon-prepare: output-clean ${GLUON_BUILD_DIR} (cd ${GLUON_BUILD_DIR} \ && git remote set-url origin ${GLUON_GIT_URL} \ && git fetch origin \ @@ -60,7 +60,7 @@ gluon-prepare: images-clean ${GLUON_BUILD_DIR} gluon-clean: rm -rf ${GLUON_BUILD_DIR} -images-clean: - rm -rf images +output-clean: + rm -rf output -clean: gluon-clean images-clean +clean: gluon-clean output-clean