From e107df512fad3699e11e3d3e2f46a50ad04196a2 Mon Sep 17 00:00:00 2001 From: ohrensessel Date: Wed, 10 Sep 2014 19:48:18 +0200 Subject: [PATCH 01/11] Enable mesh vpn by default --- site.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/site.conf b/site.conf index e21b9f8..2971b2f 100644 --- a/site.conf +++ b/site.conf @@ -36,6 +36,7 @@ }, fastd_mesh_vpn = { + enabled = true, methods = {'salsa2012+gmac'}, mtu = 1426, backbone = { From b9e3c3dadc46411cba7746ddd67c74a871a4a23d Mon Sep 17 00:00:00 2001 From: Leo Krueger Date: Mon, 15 Sep 2014 23:53:15 +0200 Subject: [PATCH 02/11] Use ffhh opkg mirror Conflicts: site.conf --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 2971b2f..bcd30bc 100644 --- a/site.conf +++ b/site.conf @@ -8,7 +8,7 @@ timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin ntp_servers = {'1.ntp.services.ffhh','2.ntp.services.ffhh'}, - opkg_repo = 'http://opkg.services.ffki/attitude_adjustment/12.09/%S/packages', -- ffki ipv6 mirror + opkg_repo = 'http://opkg.services.ffhh/attitude_adjustment/12.09/%S/packages', regdom = 'DE', wifi24 = { From c39e58d6be0ad37f54dc67d0e03ccc9018e58416 Mon Sep 17 00:00:00 2001 From: ohrensessel Date: Tue, 21 Oct 2014 01:17:17 +0200 Subject: [PATCH 03/11] Release v0.5.1 --- README.md | 1 + site.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a09c29d..790a100 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ Please see [the official Gluon repository](https://github.com/freifunk-gluon/glu #### Gluon versions used for specific Hamburg Freifunk Firmware builds +- 0.5.1: v2014.3.1 - 0.5: v2014.3 - 0.4.2: v2014.2 - note: no gluon fork used anymore diff --git a/site.mk b/site.mk index 072cd29..b57efa6 100644 --- a/site.mk +++ b/site.mk @@ -19,7 +19,7 @@ GLUON_SITE_PACKAGES := \ haveged -DEFAULT_GLUON_RELEASE := 0.5 +DEFAULT_GLUON_RELEASE := 0.5.1 # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) From 40068ed463735ddd95a11eba5f7e6a23dac06551 Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Tue, 4 Nov 2014 23:40:48 +0100 Subject: [PATCH 04/11] hostname prefix entfernt --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index bcd30bc..c38ac49 100644 --- a/site.conf +++ b/site.conf @@ -1,5 +1,5 @@ { - hostname_prefix = 'freifunk', + hostname_prefix = '', site_name = 'Freifunk Hamburg', site_code = 'ffhh', From 9dcf4d447ee4adb361bbab539cec3546044be72d Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Sun, 23 Nov 2014 17:52:17 +0100 Subject: [PATCH 05/11] neuen gw02 schluessel, atle gws raus, 16-20 raus --- site.conf | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/site.conf b/site.conf index c38ac49..488c70c 100644 --- a/site.conf +++ b/site.conf @@ -47,25 +47,13 @@ remotes = {'ipv4 "gw01.hamburg.freifunk.net" port 10000'}, }, gateway02 = { - key = 'a859bd669358c0bbef4f23b3a803bc5cac37a635fec11babacd9278f2ca86841', -- regenerate key before release + key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0', -- regenerate key before release remotes = {'ipv4 "gw02.hamburg.freifunk.net" port 10000'}, }, - gateway03 = { - key = '49fc60a3d0a7e73d1fce1d002f2644509997f6a188b86ce3ecbaa1a9ccd14b1f', -- regenerate key before release - remotes = {'ipv4 "gw03.hamburg.freifunk.net" port 10000'}, - }, - gateway04 = { - key = 'd794faee2391d1636b8f827e6cb1616360b31705980c3c512ea14ea2ebc17e5a', -- regenerate key before release - remotes = {'ipv4 "gw04.hamburg.freifunk.net" port 10000'}, - }, gateway05 = { key = '84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5', remotes = {'ipv4 "gw05.hamburg.freifunk.net" port 10000'}, }, - gateway06 = { - key = '2dc0ecf682dd786a4b44f0e4daab052202807adc0227fef64d9ccef0814ce88c', -- regenerate key before release - remotes = {'ipv4 "gw06.hamburg.freifunk.net" port 10000'}, - }, gateway07 = { key = '62ea83b5fbb0fd8cf205f1398698cb29180039b8246b1f69778e8f52cd423612', remotes = {'ipv4 "gw07.hamburg.freifunk.net" port 10000'}, @@ -78,14 +66,6 @@ key = '5f483f6d26ac9106d86c0edcd08cf92c18caf67933719a394915ab809d1fb2bc', remotes = {'ipv4 "gw09.hamburg.freifunk.net" port 10000'}, }, - gateway10 = { - key = '878de7af33ca09753610d9bc7c9b0113ddb9cc879913d4939dfda117d100336f', -- regenerate key before release - remotes = {'ipv4 "gw10.hamburg.freifunk.net" port 10000'}, - }, - gateway11 = { - key = 'b2df3c5b5106629aedb55927889129823a0da023d1ed0441fab2090046042c7c', - remotes = {'ipv4 "gw11.hamburg.freifunk.net" port 10000'}, - }, gateway12 = { key = 'facbbfb07525782fcde22b929f36ea508a295619eca35782003d9ca2dd3cc524', remotes = {'ipv4 "gw12.hamburg.freifunk.net" port 10000'}, @@ -102,26 +82,6 @@ key = '05e5ccf23505f9c542b6096e08d7299635984c22237b1aaf773689fe09360bea', remotes = {'ipv4 "gw15.hamburg.freifunk.net" port 10000'}, }, - gateway16 = { - key = 'db11ac9b98479458acf927d501dc8cd4d2a8ec86c9c912ee8f9e1600a01f3c14', - remotes = {'ipv4 "gw16.hamburg.freifunk.net" port 10000'}, - }, - gateway17 = { - key = '47a0ec3055fcc71bf5534287aa832944623747f583f32cf5f9fe26947c278176', - remotes = {'ipv4 "gw17.hamburg.freifunk.net" port 10000'}, - }, - gateway18 = { - key = 'e256557a0df457283407b7e31decd5767be21b6e9835d8b754b63b91748d1764', - remotes = {'ipv4 "gw18.hamburg.freifunk.net" port 10000'}, - }, - gateway19 = { - key = 'b1e4a847fd9bb285dacef321c82b8ba4ab220706d4deb58f05b06ff8c55451f1', - remotes = {'ipv4 "gw19.hamburg.freifunk.net" port 10000'}, - }, - gateway20 = { - key = 'a5b6d39c0f8877938963b988bc062f212ab2df002760da647b8173b5d81b0329', - remotes = {'ipv4 "gw20.hamburg.freifunk.net" port 10000'}, - }, }, }, }, From aa691712e9866e0632e78c98288887ead330c088 Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Sun, 23 Nov 2014 21:29:11 +0100 Subject: [PATCH 06/11] =?UTF-8?q?gw14=20&=2015=20entfernt,=20neue=20Schlue?= =?UTF-8?q?ssel=20f=C3=BCr=20gws?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 3,4,6,10,11 --- site.conf | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/site.conf b/site.conf index 488c70c..12a0c3c 100644 --- a/site.conf +++ b/site.conf @@ -50,10 +50,22 @@ key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0', -- regenerate key before release remotes = {'ipv4 "gw02.hamburg.freifunk.net" port 10000'}, }, + gateway03 = { + key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546', -- regenerate key before release + remotes = {'ipv4 "gw03.hamburg.freifunk.net" port 10000'}, + }, + gateway04 = { + key = 'fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf', -- regenerate key before release + remotes = {'ipv4 "gw04.hamburg.freifunk.net" port 10000'}, + }, gateway05 = { key = '84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5', remotes = {'ipv4 "gw05.hamburg.freifunk.net" port 10000'}, }, + gateway06 = { + key = 'fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6', -- regenerate key before release + remotes = {'ipv4 "gw06.hamburg.freifunk.net" port 10000'}, + }, gateway07 = { key = '62ea83b5fbb0fd8cf205f1398698cb29180039b8246b1f69778e8f52cd423612', remotes = {'ipv4 "gw07.hamburg.freifunk.net" port 10000'}, @@ -66,6 +78,14 @@ key = '5f483f6d26ac9106d86c0edcd08cf92c18caf67933719a394915ab809d1fb2bc', remotes = {'ipv4 "gw09.hamburg.freifunk.net" port 10000'}, }, + gateway10 = { + key = '69c0bafd5c08d4277b339483cf137fe7e732b5bc87c8fbdb636ff7767426b94b', + remotes = {'ipv4 "gw10.hamburg.freifunk.net" port 10000'}, + }, + gateway11 = { + key = 'ee7719551bdba725c27a60a031f2faeb44588162c8065a1c651d35b3c9ebc347', + remotes = {'ipv4 "gw11.hamburg.freifunk.net" port 10000'}, + }, gateway12 = { key = 'facbbfb07525782fcde22b929f36ea508a295619eca35782003d9ca2dd3cc524', remotes = {'ipv4 "gw12.hamburg.freifunk.net" port 10000'}, @@ -74,14 +94,6 @@ key = 'd5556881159c7bc649caabf0a72ba7c33ca8bb5fd0c7f21d52f8cbd071185e28', remotes = {'ipv4 "gw13.hamburg.freifunk.net" port 10000'}, }, - gateway14 = { - key = '259aef981f51bdb99394f7d9e9fff55db84530300e6be600715aae1695a578a2', - remotes = {'ipv4 "gw14.hamburg.freifunk.net" port 10000'}, - }, - gateway15 = { - key = '05e5ccf23505f9c542b6096e08d7299635984c22237b1aaf773689fe09360bea', - remotes = {'ipv4 "gw15.hamburg.freifunk.net" port 10000'}, - }, }, }, }, From 70941228d33314844ad85630cc02e6dcb6e50510 Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Sat, 13 Dec 2014 15:21:54 +0100 Subject: [PATCH 07/11] =?UTF-8?q?MTU=20=C3=84nderung=20f=C3=BCr=20IPv6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MTU um 20 reduziert auf 1406 und alte GWs 5, 7, 8, 9, 12, 13 fastd port auf 10001 Conflicts: site.conf --- site.conf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/site.conf b/site.conf index 12a0c3c..a8143e3 100644 --- a/site.conf +++ b/site.conf @@ -38,7 +38,7 @@ fastd_mesh_vpn = { enabled = true, methods = {'salsa2012+gmac'}, - mtu = 1426, + mtu = 1406, backbone = { limit = 2, peers = { @@ -60,7 +60,7 @@ }, gateway05 = { key = '84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5', - remotes = {'ipv4 "gw05.hamburg.freifunk.net" port 10000'}, + remotes = {'ipv4 "gw05.hamburg.freifunk.net" port 10001'}, }, gateway06 = { key = 'fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6', -- regenerate key before release @@ -68,15 +68,15 @@ }, gateway07 = { key = '62ea83b5fbb0fd8cf205f1398698cb29180039b8246b1f69778e8f52cd423612', - remotes = {'ipv4 "gw07.hamburg.freifunk.net" port 10000'}, + remotes = {'ipv4 "gw07.hamburg.freifunk.net" port 10001'}, }, gateway08 = { key = '67e9b215248ada3f4ffcc9db0bdf897128f6236a0d4e8d660762b77bebc914d4', - remotes = {'ipv4 "gw08.hamburg.freifunk.net" port 10000'}, + remotes = {'ipv4 "gw08.hamburg.freifunk.net" port 10001'}, }, gateway09 = { key = '5f483f6d26ac9106d86c0edcd08cf92c18caf67933719a394915ab809d1fb2bc', - remotes = {'ipv4 "gw09.hamburg.freifunk.net" port 10000'}, + remotes = {'ipv4 "gw09.hamburg.freifunk.net" port 10001'}, }, gateway10 = { key = '69c0bafd5c08d4277b339483cf137fe7e732b5bc87c8fbdb636ff7767426b94b', @@ -88,11 +88,11 @@ }, gateway12 = { key = 'facbbfb07525782fcde22b929f36ea508a295619eca35782003d9ca2dd3cc524', - remotes = {'ipv4 "gw12.hamburg.freifunk.net" port 10000'}, + remotes = {'ipv4 "gw12.hamburg.freifunk.net" port 10001'}, }, gateway13 = { key = 'd5556881159c7bc649caabf0a72ba7c33ca8bb5fd0c7f21d52f8cbd071185e28', - remotes = {'ipv4 "gw13.hamburg.freifunk.net" port 10000'}, + remotes = {'ipv4 "gw13.hamburg.freifunk.net" port 10001'}, }, }, }, From 53cb09b22d211309d12ac886728592babc68a826 Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Sat, 13 Dec 2014 15:23:22 +0100 Subject: [PATCH 08/11] "regenerate key before release" Kommentar entfernt --- site.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/site.conf b/site.conf index a8143e3..0899978 100644 --- a/site.conf +++ b/site.conf @@ -47,15 +47,15 @@ remotes = {'ipv4 "gw01.hamburg.freifunk.net" port 10000'}, }, gateway02 = { - key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0', -- regenerate key before release + key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0', remotes = {'ipv4 "gw02.hamburg.freifunk.net" port 10000'}, }, gateway03 = { - key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546', -- regenerate key before release + key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546', remotes = {'ipv4 "gw03.hamburg.freifunk.net" port 10000'}, }, gateway04 = { - key = 'fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf', -- regenerate key before release + key = 'fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf', remotes = {'ipv4 "gw04.hamburg.freifunk.net" port 10000'}, }, gateway05 = { @@ -63,7 +63,7 @@ remotes = {'ipv4 "gw05.hamburg.freifunk.net" port 10001'}, }, gateway06 = { - key = 'fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6', -- regenerate key before release + key = 'fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6', remotes = {'ipv4 "gw06.hamburg.freifunk.net" port 10000'}, }, gateway07 = { From 1a0fbfadce978a805ae85819b029368d0e0acdbf Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Sat, 13 Dec 2014 19:14:22 +0100 Subject: [PATCH 09/11] Update site.mk --- site.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.mk b/site.mk index b57efa6..d16312a 100644 --- a/site.mk +++ b/site.mk @@ -19,7 +19,7 @@ GLUON_SITE_PACKAGES := \ haveged -DEFAULT_GLUON_RELEASE := 0.5.1 +DEFAULT_GLUON_RELEASE := 0.5.2 # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) From 1ce31f94c6e0d91bc5958da30ce58b02904cc83a Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Sun, 14 Dec 2014 13:34:52 +0100 Subject: [PATCH 10/11] hostname_prefix & Hinweis auf Knotennamen --- site.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 0899978..f4f1561 100644 --- a/site.conf +++ b/site.conf @@ -1,5 +1,5 @@ { - hostname_prefix = '', + hostname_prefix = 'z', site_name = 'Freifunk Hamburg', site_code = 'ffhh', @@ -148,6 +148,7 @@ Willkommen zum Einrichtungsassistenten für deinen neuen Hamburger Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen entsprechend aus und sende es ab. +Den unten anzugebenden Knotennamen kannst du beliebig wählen. Denke Dir also etwas schönes aus. Er ist der Name des Knotens im Netzwerk und hat nichts mit dem ausgestrahlten Netzwerknamen (SSID) zu tun. Letzterer ist immer hamburg.freifunk.net. ]], msg_nopubkey = [[ Bitte trage nun den Namen deines Knotens From bc1f1104505bf570016c3fbb87576dc55260f645 Mon Sep 17 00:00:00 2001 From: 4ndr3 <4ndr3@users.noreply.github.com> Date: Sun, 14 Dec 2014 17:12:18 +0100 Subject: [PATCH 11/11] hostname_prefix, IPv4 aus GW entfernt --- site.conf | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/site.conf b/site.conf index f4f1561..dd271a7 100644 --- a/site.conf +++ b/site.conf @@ -1,5 +1,5 @@ { - hostname_prefix = 'z', + hostname_prefix = 'freifunk', site_name = 'Freifunk Hamburg', site_code = 'ffhh', @@ -44,55 +44,55 @@ peers = { gateway01 = { key = 'cb09c68e2d2f7d374d47035cd532e0a60b8b3a7447aa5a7f76f4f15c8ffa9e58', - remotes = {'ipv4 "gw01.hamburg.freifunk.net" port 10000'}, + remotes = {'"gw01.hamburg.freifunk.net" port 10000'}, }, gateway02 = { key = '462b4e21ab5eb0f9de687efd97252880c895ba55cc9cc0755a75347b0965b6e0', - remotes = {'ipv4 "gw02.hamburg.freifunk.net" port 10000'}, + remotes = {'"gw02.hamburg.freifunk.net" port 10000'}, }, gateway03 = { key = 'e15295b86138ac490d611e4100f847ccfb7052d5091ded4659f25940be2c0546', - remotes = {'ipv4 "gw03.hamburg.freifunk.net" port 10000'}, + remotes = {'"gw03.hamburg.freifunk.net" port 10000'}, }, gateway04 = { key = 'fca88dd58316f4ab50d2a697123dddf4d0ba3aad52ddeb0ba7835cdbbeb60dbf', - remotes = {'ipv4 "gw04.hamburg.freifunk.net" port 10000'}, + remotes = {'"gw04.hamburg.freifunk.net" port 10000'}, }, gateway05 = { key = '84986658775167dff6918dc8e0529c4a4524cb1782849a80933ddb6d8c6bd3f5', - remotes = {'ipv4 "gw05.hamburg.freifunk.net" port 10001'}, + remotes = {'"gw05.hamburg.freifunk.net" port 10001'}, }, gateway06 = { key = 'fb608aa75180ba88b4a3399a6498e68796d200afc1bfd275a0dcb903a31f39b6', - remotes = {'ipv4 "gw06.hamburg.freifunk.net" port 10000'}, + remotes = {'"gw06.hamburg.freifunk.net" port 10000'}, }, gateway07 = { key = '62ea83b5fbb0fd8cf205f1398698cb29180039b8246b1f69778e8f52cd423612', - remotes = {'ipv4 "gw07.hamburg.freifunk.net" port 10001'}, + remotes = {'"gw07.hamburg.freifunk.net" port 10001'}, }, gateway08 = { key = '67e9b215248ada3f4ffcc9db0bdf897128f6236a0d4e8d660762b77bebc914d4', - remotes = {'ipv4 "gw08.hamburg.freifunk.net" port 10001'}, + remotes = {'"gw08.hamburg.freifunk.net" port 10001'}, }, gateway09 = { key = '5f483f6d26ac9106d86c0edcd08cf92c18caf67933719a394915ab809d1fb2bc', - remotes = {'ipv4 "gw09.hamburg.freifunk.net" port 10001'}, + remotes = {'"gw09.hamburg.freifunk.net" port 10001'}, }, gateway10 = { key = '69c0bafd5c08d4277b339483cf137fe7e732b5bc87c8fbdb636ff7767426b94b', - remotes = {'ipv4 "gw10.hamburg.freifunk.net" port 10000'}, + remotes = {'"gw10.hamburg.freifunk.net" port 10000'}, }, gateway11 = { key = 'ee7719551bdba725c27a60a031f2faeb44588162c8065a1c651d35b3c9ebc347', - remotes = {'ipv4 "gw11.hamburg.freifunk.net" port 10000'}, + remotes = {'"gw11.hamburg.freifunk.net" port 10000'}, }, gateway12 = { key = 'facbbfb07525782fcde22b929f36ea508a295619eca35782003d9ca2dd3cc524', - remotes = {'ipv4 "gw12.hamburg.freifunk.net" port 10001'}, + remotes = {'"gw12.hamburg.freifunk.net" port 10001'}, }, gateway13 = { key = 'd5556881159c7bc649caabf0a72ba7c33ca8bb5fd0c7f21d52f8cbd071185e28', - remotes = {'ipv4 "gw13.hamburg.freifunk.net" port 10001'}, + remotes = {'"gw13.hamburg.freifunk.net" port 10001'}, }, }, },