From c1c2d7ae1cdb228e6016148e4e935a95eab63646 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 7 Oct 2014 19:36:51 +0200 Subject: [PATCH 01/35] Set opkg repo to Barrier Breaker final --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 3633f1a..ce59e7c 100644 --- a/site.conf +++ b/site.conf @@ -2,7 +2,7 @@ hostname_prefix = 'freifunk', site_name = 'Freifunk Lübeck', site_code = 'ffhl', - opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07-rc3/%S/packages', + opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages', prefix4 = '10.130.0.0/20', prefix6 = 'fdef:ffc0:3dd7::/64', From 6175fde0372ac26c73bbf9c22f0def789d0e5a50 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 17 Nov 2014 03:30:11 +0100 Subject: [PATCH 02/35] fastd: support salsa2012+umac in addition to salsa2012+gmac, prefer umac --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index ce59e7c..c501b8a 100644 --- a/site.conf +++ b/site.conf @@ -36,7 +36,7 @@ }, fastd_mesh_vpn = { - methods = {'salsa2012+gmac'}, + methods = {'salsa2012+umac', 'salsa2012+gmac'}, mtu = 1426, backbone = { limit = 2, From f81208d5ed84e209c62650e9de789c37c226826b Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 31 Dec 2014 16:30:14 +0100 Subject: [PATCH 03/35] Release v0.6 --- README | 1 + site.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README b/README index a292fa8..66bf4c0 100644 --- a/README +++ b/README @@ -1,5 +1,6 @@ Gluon versions used for specific Lübeck Freifunk Firmware builds: +* 0.6: v2014.4 * 0.5: v2014.3 * 0.4.1: v2014.2 * 0.4: v2014.1 diff --git a/site.mk b/site.mk index 253b3c3..7348e33 100644 --- a/site.mk +++ b/site.mk @@ -23,7 +23,7 @@ GLUON_SITE_PACKAGES := \ haveged -DEFAULT_GLUON_RELEASE := 0.6~exp$(shell date '+%Y%m%d') +DEFAULT_GLUON_RELEASE := 0.6 # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) From fb0dfd9c8953ce1b75c8e409132819f4601991b9 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 31 Dec 2014 16:31:26 +0100 Subject: [PATCH 04/35] New experimental releases --- site.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.mk b/site.mk index 7348e33..a674d3a 100644 --- a/site.mk +++ b/site.mk @@ -23,7 +23,7 @@ GLUON_SITE_PACKAGES := \ haveged -DEFAULT_GLUON_RELEASE := 0.6 +DEFAULT_GLUON_RELEASE := 0.6+exp$(shell date '+%Y%m%d') # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) From 86e5d486373119db187ce90766c110bc8350497a Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 8 Jan 2015 20:24:08 +0100 Subject: [PATCH 05/35] Remove salsa2012+gmac method All our gateways support UMAC now, so we can drop GMAC support. --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index c501b8a..4479cb4 100644 --- a/site.conf +++ b/site.conf @@ -36,7 +36,7 @@ }, fastd_mesh_vpn = { - methods = {'salsa2012+umac', 'salsa2012+gmac'}, + methods = {'salsa2012+umac'}, mtu = 1426, backbone = { limit = 2, From af1b05d81903166075089e9ea32ba32a23672527 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 18 Mar 2015 18:22:06 +0100 Subject: [PATCH 06/35] Set the enabled languages to English and German --- site.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site.mk b/site.mk index a674d3a..a1a6aec 100644 --- a/site.mk +++ b/site.mk @@ -29,3 +29,5 @@ DEFAULT_GLUON_RELEASE := 0.6+exp$(shell date '+%Y%m%d') GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) GLUON_PRIORITY ?= 0 + +GLUON_LANGS ?= en de From 2fab6206de1cdfb96ed534eb9d4d98f3f3c34547 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 19 Mar 2015 21:28:47 +0100 Subject: [PATCH 07/35] Add new config-mode translation files --- i18n/de.po | 35 +++++++++++++++++++++++++++++++++++ i18n/en.po | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 i18n/de.po create mode 100644 i18n/en.po diff --git a/i18n/de.po b/i18n/de.po new file mode 100644 index 0000000..9b20d9d --- /dev/null +++ b/i18n/de.po @@ -0,0 +1,35 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: PACKAGE VERSION\n" +"PO-Revision-Date: 2015-03-19 20:28+0100\n" +"Last-Translator: Matthias Schiffer \n" +"Language-Team: German\n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "gluon-config-mode:welcome" +msgstr "" +"Willkommen zum Einrichtungsassistenten für deinen neuen Lübecker " +"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen " +"entsprechend aus und sende es ab." + +msgid "gluon-config-mode:pubkey" +msgstr "" +"Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem " +"er auf den Servern des Lübecker Freifunk-Projektes eingetragen wurde, " +"kann sich dein Knoten mit dem Lübecker Mesh-VPN zu verbinden. Bitte " +"schicke dazu diesen Schlüssel und den Namen deines Knotens " +"(<%=hostname%>) an " +"keys@luebeck.freifunk.net." + +msgid "gluon-config-mode:reboot" +msgstr "" +"

Dein Knoten startet gerade neu und wird anschließend versuchen, " +"sich mit anderen Freifunkknoten in seiner Nähe zu " +"verbinden. Weitere Informationen zur " +"Lübecker Freifunk-Community findest du auf " +"unserer Webseite.

" +"

Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!

" diff --git a/i18n/en.po b/i18n/en.po new file mode 100644 index 0000000..42b8a7e --- /dev/null +++ b/i18n/en.po @@ -0,0 +1,33 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: PACKAGE VERSION\n" +"PO-Revision-Date: 2015-03-19 20:28+0100\n" +"Last-Translator: Matthias Schiffer \n" +"Language-Team: English\n" +"Language: en\n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgid "gluon-config-mode:welcome" +msgstr "" +"Welcome the the setup wizard of your new Freifunk Lübeck node. " +"Please fill out the following form and transmit it." + +msgid "gluon-config-mode:pubkey" +msgstr "" +"This is your Freifunk node's public key. The node won't be able to " +"connect to the mesh VPN until the key has been registered on the Freifunk " +"Lübeck servers. " +"To register the key send it together with your node's name (<%=hostname%>) to " +"keys@luebeck.freifunk.net." + + +msgid "gluon-config-mode:reboot" +msgstr "" +"

The node is currently rebooting and will try to connect to other " +"nearby Freifunk nodes after that. " +"Your can find lots of information on the Freifunk Lübeck community on " +"our homepage.

" +"

Have fun with your node and exploring the Freifunk network!

" From 990fb8d01731987eb24c69b35219ba17f9b6a2a9 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 19 Mar 2015 22:09:44 +0100 Subject: [PATCH 08/35] Remove old config mode texts --- site.conf | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/site.conf b/site.conf index 4479cb4..a0a2032 100644 --- a/site.conf +++ b/site.conf @@ -104,34 +104,6 @@ }, }, - config_mode = { - msg_welcome = [[ -Willkommen zum Einrichtungsassistenten für deinen neuen Lübecker -Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen -entsprechend aus und sende es ab. -]], - msg_pubkey = [[ -Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem -er auf den Servern des Lübecker Freifunk-Projektes eingetragen wurde, -kann sich dein Knoten mit dem Lübecker Mesh-VPN zu verbinden. Bitte -schicke dazu diesen Schlüssel und den Namen deines Knotens -(<%=hostname%>) an -keys@luebeck.freifunk.net. -]], - msg_reboot = [[ -

-Dein Knoten startet gerade neu und wird anschließend versuchen, -sich mit anderen Freifunkknoten in seiner Nähe zu -verbinden. Weitere Informationen zur -Lübecker Freifunk-Community findest du auf -unserer Webseite. -

-

-Viel Spaß mit deinem Knoten und der Erkundung von Freifunk! -

-]], - }, - legacy = { version_files = {'/etc/.freifunk_version_keep', '/etc/.lff_version_keep'}, old_files = {'/etc/config/config_mode', '/etc/config/ffhl', '/etc/config/freifunk'}, From 42f7e3654351682d890722880cd3a52c9ce83912 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 26 Apr 2015 13:49:55 +0200 Subject: [PATCH 09/35] Add gluon-setup-mode and gluon-config-mode-core packages Also fix alphabetic ordering. --- site.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/site.mk b/site.mk index a1a6aec..4ed67aa 100644 --- a/site.mk +++ b/site.mk @@ -4,10 +4,11 @@ GLUON_SITE_PACKAGES := \ gluon-announced \ gluon-autoupdater \ gluon-config-mode-autoupdater \ + gluon-config-mode-contact-info \ + gluon-config-mode-core \ + gluon-config-mode-geo-location \ gluon-config-mode-hostname \ gluon-config-mode-mesh-vpn \ - gluon-config-mode-geo-location \ - gluon-config-mode-contact-info \ gluon-ebtables-filter-multicast \ gluon-ebtables-filter-ra-dhcp \ gluon-legacy \ @@ -17,6 +18,7 @@ GLUON_SITE_PACKAGES := \ gluon-next-node \ gluon-mesh-vpn-fastd \ gluon-radvd \ + gluon-setup-mode \ gluon-status-page \ iwinfo \ iptables \ From 9574b7a0f8955275859ea933acec92919c220389 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 28 Apr 2015 01:13:34 +0200 Subject: [PATCH 10/35] Adjust fastd-mesh-vpn config to nested peer groups --- site.conf | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/site.conf b/site.conf index a0a2032..d643775 100644 --- a/site.conf +++ b/site.conf @@ -38,24 +38,26 @@ fastd_mesh_vpn = { methods = {'salsa2012+umac'}, mtu = 1426, - backbone = { - limit = 2, - peers = { - burgtor = { - key = '657af03e36ff1b8bbe5a5134982a4f110c8523a9a63293870caf548916a95a03', - remotes = {'ipv4 "burgtor.mesh.ffhl.chaotikum.org" port 10000'}, - }, - holstentor = { - key = '8c660f7511bf101ea1b599fe53af20e1146cd923c9e9d2a3a0d534ee75af9067', - remotes = {'ipv4 "holstentor.mesh.ffhl.chaotikum.org" port 10000'}, - }, - huextertor = { - key = 'a1b124f43eae4f5929850c09cda825ef35d659e3db4d7746e3d97627e9fa7238', - remotes = {'ipv4 "huextertor.mesh.ffhl.chaotikum.org" port 10000'}, - }, - muehlentor = { - key = 'bd4ec3cf87bb0042eed2fa121fbc402154d28fb1ae9dff9cdb71bb21892f401a', - remotes = {'ipv4 "muehlentor.mesh.ffhl.chaotikum.org" port 10000'}, + groups = { + backbone = { + limit = 2, + peers = { + huextertor = { + key = 'a1b124f43eae4f5929850c09cda825ef35d659e3db4d7746e3d97627e9fa7238', + remotes = {'ipv4 "huextertor.mesh.ffhl.chaotikum.org" port 10000'}, + }, + muehlentor = { + key = 'bd4ec3cf87bb0042eed2fa121fbc402154d28fb1ae9dff9cdb71bb21892f401a', + remotes = {'ipv4 "muehlentor.mesh.ffhl.chaotikum.org" port 10000'}, + }, + burgtor = { + key = '657af03e36ff1b8bbe5a5134982a4f110c8523a9a63293870caf548916a95a03', + remotes = {'ipv4 "burgtor.mesh.ffhl.chaotikum.org" port 10000'}, + }, + holstentor = { + key = '8c660f7511bf101ea1b599fe53af20e1146cd923c9e9d2a3a0d534ee75af9067', + remotes = {'ipv4 "holstentor.mesh.ffhl.chaotikum.org" port 10000'}, + }, }, }, }, From 31efba4cc6cdb592cd344fc0b2b6bcff514d1473 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 20 May 2015 23:37:44 +0200 Subject: [PATCH 11/35] Add gluon-luci-wifi-config package --- site.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/site.mk b/site.mk index 4ed67aa..58faff5 100644 --- a/site.mk +++ b/site.mk @@ -15,6 +15,7 @@ GLUON_SITE_PACKAGES := \ gluon-luci-admin \ gluon-luci-autoupdater \ gluon-luci-portconfig \ + gluon-luci-wifi-config \ gluon-next-node \ gluon-mesh-vpn-fastd \ gluon-radvd \ From d0240833f7fcea97862c9c4ea848960043da1b7a Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 4 Jun 2015 21:31:25 +0200 Subject: [PATCH 12/35] i18n: typo fixes and stylistic improvements --- i18n/de.po | 2 +- i18n/en.po | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/i18n/de.po b/i18n/de.po index 9b20d9d..c997a18 100644 --- a/i18n/de.po +++ b/i18n/de.po @@ -32,4 +32,4 @@ msgstr "" "verbinden. Weitere Informationen zur " "Lübecker Freifunk-Community findest du auf " "unserer Webseite.

" -"

Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!

" +"

Viel Spaß mit deinem Knoten und bei der Erkundung von Freifunk!

" diff --git a/i18n/en.po b/i18n/en.po index 42b8a7e..fbda79d 100644 --- a/i18n/en.po +++ b/i18n/en.po @@ -13,7 +13,7 @@ msgstr "" msgid "gluon-config-mode:welcome" msgstr "" "Welcome the the setup wizard of your new Freifunk Lübeck node. " -"Please fill out the following form and transmit it." +"To join the network, please complete the following form and transmit it." msgid "gluon-config-mode:pubkey" msgstr "" @@ -26,8 +26,8 @@ msgstr "" msgid "gluon-config-mode:reboot" msgstr "" -"

The node is currently rebooting and will try to connect to other " +"

The node is currently rebooting and will then attempt to connect to other " "nearby Freifunk nodes after that. " -"Your can find lots of information on the Freifunk Lübeck community on " +"You can find lots of information on the Freifunk Lübeck community on " "our homepage.

" -"

Have fun with your node and exploring the Freifunk network!

" +"

Have fun with your node while exploring the Freifunk network!

" From 7fbee6dc148e9d5418ee761983ede3325f680feb Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Wed, 10 Jun 2015 22:04:14 +0200 Subject: [PATCH 13/35] site.conf: reduce peer limit to 1 --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index d643775..400ac99 100644 --- a/site.conf +++ b/site.conf @@ -40,7 +40,7 @@ mtu = 1426, groups = { backbone = { - limit = 2, + limit = 1, peers = { huextertor = { key = 'a1b124f43eae4f5929850c09cda825ef35d659e3db4d7746e3d97627e9fa7238', From 777bf8d7d6a677f6cdde343813f945ba64d8c5e9 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 19 Jun 2015 21:24:29 +0200 Subject: [PATCH 14/35] i18n/en: fix typo --- i18n/en.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/en.po b/i18n/en.po index fbda79d..f298631 100644 --- a/i18n/en.po +++ b/i18n/en.po @@ -12,7 +12,7 @@ msgstr "" msgid "gluon-config-mode:welcome" msgstr "" -"Welcome the the setup wizard of your new Freifunk Lübeck node. " +"Welcome to the setup wizard of your new Freifunk Lübeck node. " "To join the network, please complete the following form and transmit it." msgid "gluon-config-mode:pubkey" From a314ae4ede483b60454d08929c6fea1798feea74 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 20 Jun 2015 18:08:50 +0200 Subject: [PATCH 15/35] Release v0.7 --- README | 1 + site.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README b/README index 66bf4c0..ca75b4a 100644 --- a/README +++ b/README @@ -1,5 +1,6 @@ Gluon versions used for specific Lübeck Freifunk Firmware builds: +* 0.7: v2015.1.1 * 0.6: v2014.4 * 0.5: v2014.3 * 0.4.1: v2014.2 diff --git a/site.mk b/site.mk index 58faff5..187d225 100644 --- a/site.mk +++ b/site.mk @@ -26,7 +26,7 @@ GLUON_SITE_PACKAGES := \ haveged -DEFAULT_GLUON_RELEASE := 0.6+exp$(shell date '+%Y%m%d') +DEFAULT_GLUON_RELEASE := 0.7 # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) From a87c741409bfb5a725be631422c0f9898060f2e2 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 20 Jun 2015 18:10:03 +0200 Subject: [PATCH 16/35] New experimental releases --- site.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.mk b/site.mk index 187d225..eadec36 100644 --- a/site.mk +++ b/site.mk @@ -26,7 +26,7 @@ GLUON_SITE_PACKAGES := \ haveged -DEFAULT_GLUON_RELEASE := 0.7 +DEFAULT_GLUON_RELEASE := 0.8~exp$(shell date '+%Y%m%d') # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) From 5e503f948b82676753ed16758a3917fc66d538f3 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 20 Jun 2015 22:17:37 +0200 Subject: [PATCH 17/35] Update opkg_repo to 15.05-rc2 --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 400ac99..9da3504 100644 --- a/site.conf +++ b/site.conf @@ -2,7 +2,7 @@ hostname_prefix = 'freifunk', site_name = 'Freifunk Lübeck', site_code = 'ffhl', - opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages', + opkg_repo = 'http://openwrt.draic.info/chaos_calmer/15.05-rc2/%S/packages', prefix4 = '10.130.0.0/20', prefix6 = 'fdef:ffc0:3dd7::/64', From 253d6df2857d0a22062ee84940649c36d9d1e12c Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Wed, 1 Jul 2015 23:32:23 +0200 Subject: [PATCH 18/35] use MTU 1280 fastd instance on port 10002 --- site.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/site.conf b/site.conf index 9da3504..2b75a94 100644 --- a/site.conf +++ b/site.conf @@ -37,26 +37,26 @@ fastd_mesh_vpn = { methods = {'salsa2012+umac'}, - mtu = 1426, + mtu = 1280, groups = { backbone = { limit = 1, peers = { huextertor = { key = 'a1b124f43eae4f5929850c09cda825ef35d659e3db4d7746e3d97627e9fa7238', - remotes = {'ipv4 "huextertor.mesh.ffhl.chaotikum.org" port 10000'}, + remotes = {'"huextertor.mesh.ffhl.chaotikum.org" port 10002'}, }, muehlentor = { key = 'bd4ec3cf87bb0042eed2fa121fbc402154d28fb1ae9dff9cdb71bb21892f401a', - remotes = {'ipv4 "muehlentor.mesh.ffhl.chaotikum.org" port 10000'}, + remotes = {'"muehlentor.mesh.ffhl.chaotikum.org" port 10002'}, }, burgtor = { key = '657af03e36ff1b8bbe5a5134982a4f110c8523a9a63293870caf548916a95a03', - remotes = {'ipv4 "burgtor.mesh.ffhl.chaotikum.org" port 10000'}, + remotes = {'"burgtor.mesh.ffhl.chaotikum.org" port 10002'}, }, holstentor = { key = '8c660f7511bf101ea1b599fe53af20e1146cd923c9e9d2a3a0d534ee75af9067', - remotes = {'ipv4 "holstentor.mesh.ffhl.chaotikum.org" port 10000'}, + remotes = {'"holstentor.mesh.ffhl.chaotikum.org" port 10002'}, }, }, }, From d85db9b4d55ade20eedf6228d23aef22caa64187 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 18 Jul 2015 21:22:45 +0200 Subject: [PATCH 19/35] Update opkg_repo to 15.05-rc3 --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 2b75a94..698dbe9 100644 --- a/site.conf +++ b/site.conf @@ -2,7 +2,7 @@ hostname_prefix = 'freifunk', site_name = 'Freifunk Lübeck', site_code = 'ffhl', - opkg_repo = 'http://openwrt.draic.info/chaos_calmer/15.05-rc2/%S/packages', + opkg_repo = 'http://openwrt.draic.info/chaos_calmer/15.05-rc3/%S/packages', prefix4 = '10.130.0.0/20', prefix6 = 'fdef:ffc0:3dd7::/64', From 3a7bc5f4e7140e87c1ce9d92013a809ac16159cb Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Tue, 4 Aug 2015 21:45:25 +0200 Subject: [PATCH 20/35] add 11s mesh --- site.conf | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/site.conf b/site.conf index 698dbe9..753b885 100644 --- a/site.conf +++ b/site.conf @@ -12,20 +12,36 @@ regdom = 'DE', wifi24 = { - ssid = 'luebeck.freifunk.net', channel = 1, htmode = 'HT40+', - mesh_ssid = '02:d1:11:37:fc:38', - mesh_bssid = '02:d1:11:37:fc:38', - mesh_mcast_rate = 12000, + ap = { + ssid = 'luebeck.freifunk.net', + }, + ibss = { + ssid = '02:d1:11:37:fc:38', + bssid = '02:d1:11:37:fc:38', + mcast_rate = 12000, + }, + mesh = { + id = 'eseB6Qlu', + mcast_rate = 12000, + }, }, wifi5 = { - ssid = 'luebeck.freifunk.net', channel = 44, htmode = 'HT40+', - mesh_ssid = '02:d1:11:37:fc:38', - mesh_bssid = '02:d1:11:37:fc:38', - mesh_mcast_rate = 12000, + master = { + ssid = 'luebeck.freifunk.net', + }, + ibss = { + ssid = '02:d1:11:37:fc:38', + bssid = '02:d1:11:37:fc:38', + mcast_rate = 12000, + }, + mesh = { + id = 'eseB6Qlu', + mcast_rate = 12000, + }, }, next_node = { From 57df1f9fd4fdbdd931d7169de746b7cb4eaabbf1 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 31 Aug 2015 00:51:15 +0200 Subject: [PATCH 21/35] i18n: adjust pubkey message --- i18n/de.po | 11 ++++++++--- i18n/en.po | 10 +++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/i18n/de.po b/i18n/de.po index c997a18..2272add 100644 --- a/i18n/de.po +++ b/i18n/de.po @@ -18,12 +18,17 @@ msgstr "" msgid "gluon-config-mode:pubkey" msgstr "" -"Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem " +"

Dies ist der öffentliche Schlüssel deines Freifunkknotens. Erst nachdem " "er auf den Servern des Lübecker Freifunk-Projektes eingetragen wurde, " -"kann sich dein Knoten mit dem Lübecker Mesh-VPN zu verbinden. Bitte " +"kann sich dein Knoten mit dem Lübecker Mesh-VPN verbinden. Bitte " "schicke dazu diesen Schlüssel und den Namen deines Knotens " "(<%=hostname%>) an " -"keys@luebeck.freifunk.net." +"keys@luebeck.freifunk.net.

" +"
" +" # <%= hostname %>" +"
" +"<%= pubkey %>" +"
" msgid "gluon-config-mode:reboot" msgstr "" diff --git a/i18n/en.po b/i18n/en.po index f298631..693e632 100644 --- a/i18n/en.po +++ b/i18n/en.po @@ -17,12 +17,16 @@ msgstr "" msgid "gluon-config-mode:pubkey" msgstr "" -"This is your Freifunk node's public key. The node won't be able to " +"

This is your Freifunk node's public key. The node won't be able to " "connect to the mesh VPN until the key has been registered on the Freifunk " "Lübeck servers. " "To register the key send it together with your node's name (<%=hostname%>) to " -"keys@luebeck.freifunk.net." - +"keys@luebeck.freifunk.net.

" +"
" +" # <%= hostname %>" +"
" +"<%= pubkey %>" +"
" msgid "gluon-config-mode:reboot" msgstr "" From cb1bdebd9d5451795d8c3a548487968737d2a092 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 13 Oct 2015 21:53:33 +0200 Subject: [PATCH 22/35] Update opkg_repo to 15.05 final --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 753b885..5e7b55f 100644 --- a/site.conf +++ b/site.conf @@ -2,7 +2,7 @@ hostname_prefix = 'freifunk', site_name = 'Freifunk Lübeck', site_code = 'ffhl', - opkg_repo = 'http://openwrt.draic.info/chaos_calmer/15.05-rc3/%S/packages', + opkg_repo = 'http://openwrt.draic.info/chaos_calmer/15.05/%S/packages', prefix4 = '10.130.0.0/20', prefix6 = 'fdef:ffc0:3dd7::/64', From cfd7f95158c01887e6573ed3eb12d4ad2d7b6ce9 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 14 Oct 2015 00:58:03 +0200 Subject: [PATCH 23/35] Generalize opkg_repo to not contain a specific OpenWrt release --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 5e7b55f..b0bd1f0 100644 --- a/site.conf +++ b/site.conf @@ -2,7 +2,7 @@ hostname_prefix = 'freifunk', site_name = 'Freifunk Lübeck', site_code = 'ffhl', - opkg_repo = 'http://openwrt.draic.info/chaos_calmer/15.05/%S/packages', + opkg_repo = 'http://openwrt.draic.info/%n/%v/%S/packages', prefix4 = '10.130.0.0/20', prefix6 = 'fdef:ffc0:3dd7::/64', From 3f3fff7964c847af64ce59d6686e02061284e5b1 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 15 Oct 2015 02:22:56 +0200 Subject: [PATCH 24/35] Update for new bandwidth limitation --- site.conf | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/site.conf b/site.conf index b0bd1f0..8e0e1bd 100644 --- a/site.conf +++ b/site.conf @@ -77,6 +77,11 @@ }, }, }, + bandwidth_limit = { + enabled = false, + ingress = 5000, + egress = 200, + }, }, autoupdater = { @@ -113,15 +118,6 @@ }, }, - simple_tc = { - mesh_vpn = { - ifname = 'mesh-vpn', - enabled = false, - limit_egress = 200, - limit_ingress = 3000, - }, - }, - legacy = { version_files = {'/etc/.freifunk_version_keep', '/etc/.lff_version_keep'}, old_files = {'/etc/config/config_mode', '/etc/config/ffhl', '/etc/config/freifunk'}, From a25600e39ed19e002ff351eddd5408ca6c472e7a Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 14 Oct 2015 00:59:09 +0200 Subject: [PATCH 25/35] Adjust to new opkg configuration --- site.conf | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 8e0e1bd..63873c1 100644 --- a/site.conf +++ b/site.conf @@ -2,7 +2,13 @@ hostname_prefix = 'freifunk', site_name = 'Freifunk Lübeck', site_code = 'ffhl', - opkg_repo = 'http://openwrt.draic.info/%n/%v/%S/packages', + + opkg = { + openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages', + extra = { + modules = 'http://opkg.services.ffhl/modules/gluon-%GS-%GR/%S', + }, + }, prefix4 = '10.130.0.0/20', prefix6 = 'fdef:ffc0:3dd7::/64', From 75f263ec3cbeb83afef1ae72968d420657584b72 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 15 Oct 2015 22:49:16 +0200 Subject: [PATCH 26/35] Revert accidental change of VPN bandwidth limit defaults --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 63873c1..d073a36 100644 --- a/site.conf +++ b/site.conf @@ -85,7 +85,7 @@ }, bandwidth_limit = { enabled = false, - ingress = 5000, + ingress = 3000, egress = 200, }, }, From 073bd4fa3ec2f2143a4192fc5a0f09feae56ce4a Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 16 Oct 2015 00:08:44 +0200 Subject: [PATCH 27/35] Disable 11s mesh for now --- site.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site.conf b/site.conf index d073a36..0046626 100644 --- a/site.conf +++ b/site.conf @@ -23,11 +23,11 @@ ap = { ssid = 'luebeck.freifunk.net', }, - ibss = { + --[[ibss = { ssid = '02:d1:11:37:fc:38', bssid = '02:d1:11:37:fc:38', mcast_rate = 12000, - }, + },--]] mesh = { id = 'eseB6Qlu', mcast_rate = 12000, From 9667e6e1fec60436b872fef56de4692c6e430a26 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 16 Oct 2015 17:48:01 +0200 Subject: [PATCH 28/35] Correctly disable 11s mesh for now... --- site.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/site.conf b/site.conf index 0046626..921be01 100644 --- a/site.conf +++ b/site.conf @@ -23,15 +23,15 @@ ap = { ssid = 'luebeck.freifunk.net', }, - --[[ibss = { + ibss = { ssid = '02:d1:11:37:fc:38', bssid = '02:d1:11:37:fc:38', mcast_rate = 12000, - },--]] - mesh = { + }, + --[[mesh = { id = 'eseB6Qlu', mcast_rate = 12000, - }, + },--]] }, wifi5 = { channel = 44, @@ -44,10 +44,10 @@ bssid = '02:d1:11:37:fc:38', mcast_rate = 12000, }, - mesh = { + --[[mesh = { id = 'eseB6Qlu', mcast_rate = 12000, - }, + },--]] }, next_node = { From 6008113c95bea5984c352ded566f0e78cdde347f Mon Sep 17 00:00:00 2001 From: Nils Schneider Date: Fri, 23 Oct 2015 15:54:08 +0200 Subject: [PATCH 29/35] migrate from ffhl. to luebeck.freifunk.net. --- site.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/site.conf b/site.conf index 921be01..4a28e88 100644 --- a/site.conf +++ b/site.conf @@ -6,7 +6,7 @@ opkg = { openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages', extra = { - modules = 'http://opkg.services.ffhl/modules/gluon-%GS-%GR/%S', + modules = 'http://opkg.services.luebeck.freifunk.net/modules/gluon-%GS-%GR/%S', }, }, @@ -14,7 +14,7 @@ prefix6 = 'fdef:ffc0:3dd7::/64', timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin - ntp_servers = {'1.ntp.services.ffhl'}, + ntp_servers = {'1.ntp.services.luebeck.freifunk.net'}, regdom = 'DE', wifi24 = { @@ -95,7 +95,7 @@ branches = { stable = { name = 'stable', - mirrors = {'http://1.updates.services.ffhl/stable/sysupgrade'}, + mirrors = {'http://1.updates.services.luebeck.freifunk.net/stable/sysupgrade'}, good_signatures = 2, pubkeys = { 'daa19b44bbd7033965e02088127bad9516ba0fea8f34267a777144a23ec8900c', -- Linus @@ -105,7 +105,7 @@ }, beta = { name = 'beta', - mirrors = {'http://1.updates.services.ffhl/beta/sysupgrade'}, + mirrors = {'http://1.updates.services.luebeck.freifunk.net/beta/sysupgrade'}, good_signatures = 2, pubkeys = { 'daa19b44bbd7033965e02088127bad9516ba0fea8f34267a777144a23ec8900c', -- Linus @@ -115,7 +115,7 @@ }, experimental = { name = 'experimental', - mirrors = {'http://1.updates.services.ffhl/experimental/sysupgrade'}, + mirrors = {'http://1.updates.services.luebeck.freifunk.net/experimental/sysupgrade'}, good_signatures = 1, pubkeys = { '496136b37e5f561dfdf523611f14e4b6bc2a745cbc1ab7daffa59fded5f202d1', -- philae From 73a8fe4b9c05e649c69366768f652651b7c1c01f Mon Sep 17 00:00:00 2001 From: "@RubenKelevra" Date: Tue, 17 Nov 2015 17:27:09 +0100 Subject: [PATCH 30/35] Fix 5GHz AP network definition The section name was wrong, so there was no AP network on 5GHz. Fixes: 3a7bc5f4e7140e87c1ce9d92013a809ac16159cb --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 4a28e88..c336886 100644 --- a/site.conf +++ b/site.conf @@ -36,7 +36,7 @@ wifi5 = { channel = 44, htmode = 'HT40+', - master = { + ap = { ssid = 'luebeck.freifunk.net', }, ibss = { From 3eb2c7f3d3aadcf913d7d798d63f152e40ef2a76 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 2 Feb 2016 11:18:34 +0100 Subject: [PATCH 31/35] Adjust to gluon-announced -> gluon-respondd rename --- site.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.mk b/site.mk index eadec36..68ac825 100644 --- a/site.mk +++ b/site.mk @@ -1,7 +1,6 @@ GLUON_SITE_PACKAGES := \ gluon-mesh-batman-adv-14 \ gluon-alfred \ - gluon-announced \ gluon-autoupdater \ gluon-config-mode-autoupdater \ gluon-config-mode-contact-info \ @@ -19,6 +18,7 @@ GLUON_SITE_PACKAGES := \ gluon-next-node \ gluon-mesh-vpn-fastd \ gluon-radvd \ + gluon-respondd \ gluon-setup-mode \ gluon-status-page \ iwinfo \ From 4c519d5fef4c22e05915c9ce9ee9c30892c2e1ea Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 2 May 2015 22:21:09 +0200 Subject: [PATCH 32/35] Make mesh-vpn methods configurable --- site.conf | 1 + site.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/site.conf b/site.conf index c336886..352ce62 100644 --- a/site.conf +++ b/site.conf @@ -58,6 +58,7 @@ }, fastd_mesh_vpn = { + configurable = true, methods = {'salsa2012+umac'}, mtu = 1280, groups = { diff --git a/site.mk b/site.mk index 68ac825..c8ed86d 100644 --- a/site.mk +++ b/site.mk @@ -13,6 +13,7 @@ GLUON_SITE_PACKAGES := \ gluon-legacy \ gluon-luci-admin \ gluon-luci-autoupdater \ + gluon-luci-mesh-vpn-fastd \ gluon-luci-portconfig \ gluon-luci-wifi-config \ gluon-next-node \ From 6a82a1d84e900e3b0aa14080aaec48be6679662e Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 9 Mar 2016 20:05:53 +0100 Subject: [PATCH 33/35] README: add 0.7.1 to version list --- README | 1 + 1 file changed, 1 insertion(+) diff --git a/README b/README index ca75b4a..55fba38 100644 --- a/README +++ b/README @@ -1,5 +1,6 @@ Gluon versions used for specific Lübeck Freifunk Firmware builds: +* 0.7.1: v2015.1.2 * 0.7: v2015.1.1 * 0.6: v2014.4 * 0.5: v2014.3 From ee61fcc3bb917537387692013dfd526f8a42ffc9 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 9 Mar 2016 21:33:29 +0100 Subject: [PATCH 34/35] Release v0.8 --- README | 1 + site.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README b/README index 55fba38..be684b4 100644 --- a/README +++ b/README @@ -1,5 +1,6 @@ Gluon versions used for specific Lübeck Freifunk Firmware builds: +* 0.8: v2016.1.2 * 0.7.1: v2015.1.2 * 0.7: v2015.1.1 * 0.6: v2014.4 diff --git a/site.mk b/site.mk index c8ed86d..913076d 100644 --- a/site.mk +++ b/site.mk @@ -27,7 +27,7 @@ GLUON_SITE_PACKAGES := \ haveged -DEFAULT_GLUON_RELEASE := 0.8~exp$(shell date '+%Y%m%d') +DEFAULT_GLUON_RELEASE := 0.8 # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) From 464e11d4c3fca7ae31af7155be81d40448085da8 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 31 Mar 2016 21:17:01 +0200 Subject: [PATCH 35/35] Release v0.8.1 --- README | 1 + site.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README b/README index be684b4..010b2da 100644 --- a/README +++ b/README @@ -1,5 +1,6 @@ Gluon versions used for specific Lübeck Freifunk Firmware builds: +* 0.8.1: v2016.1.3 * 0.8: v2016.1.2 * 0.7.1: v2015.1.2 * 0.7: v2015.1.1 diff --git a/site.mk b/site.mk index 913076d..d504bce 100644 --- a/site.mk +++ b/site.mk @@ -27,7 +27,7 @@ GLUON_SITE_PACKAGES := \ haveged -DEFAULT_GLUON_RELEASE := 0.8 +DEFAULT_GLUON_RELEASE := 0.8.1 # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)