From 031a2892b286c6efbb16c981a9a5db0ffebc2af5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 14 Nov 2014 20:29:50 +0100 Subject: [PATCH 01/57] site.conf: Remove useless comments (see documentation) --- site.conf | 154 +----------------------------------------------------- 1 file changed, 1 insertion(+), 153 deletions(-) diff --git a/site.conf b/site.conf index 5475b2b..f7124aa 100644 --- a/site.conf +++ b/site.conf @@ -1,102 +1,16 @@ ---[[ - - ****** Gluon site.conf ****** - Current version: 0.6~stable20141018 - Branch: stable - Author: Ole - Datum: 18.10.2014 - - recent bugfixes/changes for next generation firmware (to-be-enrolled shortly) - - fixed ipv4-prefix to /16 netmask (04.11.2014) - - changed gateways ips to domain-names - - changed msg_pub_key to automate entering the node-data to our key-form (01.11.2014) - - changed mesh-SSID from 02:0E:8E:1E:61:17 to mesh.ffm - - Changelog: - 0.6~stable20141018 18.10.2014 Ole - - changed ip address for gw02 - - 0.6~stable20141011 11.10.2014 Ole - - gw04 hinzugefügt - - Text "Knoten hinzufügen" geändert - - Autoupdater auf "stable" als Standart-Wert gesetzt - - 0.6~exp20141004 04.10.2014 Ole - - Autoupdater hinzugefügt - - 0.6~exp20140926 26.09.2014 Ole - - Bugfixes - - gw02 hinzugefügt - - 0.6~exp20140907 07.09.2014 Ole - - initiale Version - - - ****************************** - - - - - gluon site.conf example - - This file contains the Munich freifunk site.conf which was adopted from the original freifunk suite used in Luebeck. - There are comments added to most switches to explain the usage of gluon. - - This is lua code now, not perl anymore. - - Happy compiling! -]] - { - --[[ Community settings - hostname_prefix: Nodename prefix - freifunk-abcdef123456 (hex-part is generated from node's MAC address) - site_name: Name of your community - site_code: Shortcode of your community - ]] - hostname_prefix = 'freifunk', site_name = 'Freifunk München', site_code = 'ffm', - --[[ General network settings - prefix4: IPv4 range of your community - prefix6: IPv6 range of your community - is also required for radvd ]] - prefix4 = '10.80.0.0/16', prefix6 = 'fdef:ffc0:4fff::/64', - --[[ NTP settings - Synchronize the time of the nodes - timezone: Timezone of your community - http://wiki.openwrt.org/doc/uci/system#time.zones - ntp_servers: List of NTP-Servers to query. You can use any public and/or your private NTP-Servers of your community. - http://www.pool.ntp.org/zone/de ]] - timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', ntp_servers = {'1.ntp.services.ffm'}, - --[[ Wireless settings - regdom: IEEE 802.11 Regulatory Domain - http://en.wikipedia.org/wiki/IEEE_802.11#Regulatory_domains_and_legal_compliance - wifi24: Wifi settings for 2.4 GHz frequency devices - wifi5: Wifi settings for 5 GHz frequency devices - sub - ssid: Wifi name shown to the user (We recommend %site_code%.freifunk.net) - channel: Wifi channel to use - htmode: Specifies the channel width in 802.11n and 802.11ac mode, possible values are: - HT20 (single 20MHz channel), - HT40- (2x 20MHz channels, primary/control channel is upper, secondary channel is below) - HT40+ (2x 20MHz channels, primary/control channel is lower, secondary channel is above). - VHT20 / VHT40 / VHT80 / VHT160 (channel width in 802.11ac, extra channels are picked according to the specification) - http://wiki.openwrt.org/doc/uci/wireless#common.options (-> htmode) - mesh_ssid: SSID of the mesh-interface, an ugly SSID prevent clients from connecting (We recommend not to change this) - mesh_bssid: BSSID of the mesh-interface - mesh_mcast_rate: multicast rate of the mesh-interface ]] - regdom = 'DE', wifi24 = { @@ -104,7 +18,7 @@ channel = 1, htmode = 'HT40+', mesh_ssid = 'mesh.ffm', - mesh_bssid = '02:0E:8E:1E:61:17', --[[ from https://muenchen.freifunk.net/wiki/Knoten#B.A.T.M.A.N._Advanced ]] + mesh_bssid = '02:0E:8E:1E:61:17', mesh_mcast_rate = 12000, }, @@ -118,41 +32,12 @@ }, - --[[ Next-Node - next_node: Howto reach the node you are currently connected to - The node will always be reachable at that address, and it's the same on all nodes. Because next_node packets are redirected within the node itself, there will be no conflicts. - sub - ip4: IPv4 Address to use - ip6: IPv6 Address to use - mac: MAC Address to use - (TODO: What is the purpose of this MAC-Address here?) ]] - next_node = { ip4 = '10.80.0.1', ip6 = 'fdef:ffc0:4fff::1', mac = '16:41:95:40:f7:dc', }, - - --[[ Gateway settings - fastd_mesh_vpn: fastd vpn settings - https://projects.universe-factory.net/projects/fastd/wiki/User_manual - sub - methods: encryption algorithms to use - https://projects.universe-factory.net/projects/fastd/wiki/Methods - When multiple method statements are given, the first one has the highest preference. - mtu: package size - backbone: fastd vpn gateways of your community - sub - limit: Number of gateways each node connects to - On startup, each node tries to connect to every gateway, and then chooses the number of 'limit' fastest gateways it could reach - peers: Gateways - sub sub - key: public fastd key of your gateway - https://github.com/tcatm/ecdsautils - remotes: List of fastd configuration strings to connect to your gateway server ]] - - fastd_mesh_vpn = { methods = {'salsa2012+gmac'}, mtu = 1426, @@ -175,15 +60,6 @@ }, }, - --[[ gluon autoupdater section - a how-to can be found here: http://gluon.readthedocs.org/en/latest/features/autoupdater.html - enable: 0, 1 - branch: stable, beta, experimental - name: name of the branch - mirrors: comma separated ipv6 based mirror-servers to access the firmware image - good_signatures: number of at leased good signatures signed by the authors of the firmware - pubkeys: public keys of the authors of the firmware image ]] - autoupdater = { enabled = 1, branch = 'stable', @@ -219,16 +95,6 @@ autoupdater = { }, }, - - - --[[ Simple TC settings to limit the bandwidth of the vpn-uplink - mesh_vpn: - sub - ifname: name of the interface/bridge - enabled: default-value - limit_egress: default-value - limit_ingress: default-value ]] - simple_tc = { mesh_vpn = { ifname = 'mesh-vpn', @@ -238,24 +104,6 @@ autoupdater = { }, }, - - --[[ Config Mode settings - Text shown on local website on node while in config mode (after initial flashing or after a long press and hold on the primary button and reboot). You can use html here. - msg_welcome: Welcome message shown at startup - msg_pubkey: Instructions for the user how your community handles the key exchange - only shown if VPN setting is selected - msg_reboot: Message shown when configuration is finished while the node is rebooting. - - Variables - Within the text given here you can use variables which are - replaced when the respective website is delivered to the user. - Variables must be used in the format <%=NAME%>. See msg_pubkey for an example. - hostname: hostname of the node - pubkey: fastd public key of the node - sysconfig.primary_mac the primary mac of the node, also found printed beneath the device - ... other sysconfig.* variables: config_ifname, lan_ifname, wan_ifname ]] - - config_mode = { msg_welcome = [[ Willkommen zum Einrichtungsassistenten für deinen neuen Münchner From d8ce66863de3dfc6f6a5e0158a4050ae7e421acf Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 14 Nov 2014 20:36:17 +0100 Subject: [PATCH 02/57] site.conf: Fix indentation --- site.conf | 256 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 131 insertions(+), 125 deletions(-) diff --git a/site.conf b/site.conf index f7124aa..5589abe 100644 --- a/site.conf +++ b/site.conf @@ -1,151 +1,157 @@ { - hostname_prefix = 'freifunk', - site_name = 'Freifunk München', - site_code = 'ffm', + hostname_prefix = 'freifunk', + site_name = 'Freifunk München', + site_code = 'ffm', + prefix4 = '10.80.0.0/16', + prefix6 = 'fdef:ffc0:4fff::/64', - prefix4 = '10.80.0.0/16', - prefix6 = 'fdef:ffc0:4fff::/64', + timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', + ntp_servers = {'1.ntp.services.ffm'}, + regdom = 'DE', - timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', - ntp_servers = {'1.ntp.services.ffm'}, + wifi24 = { + ssid = 'muenchen.freifunk.net', + channel = 1, + htmode = 'HT40+', + mesh_ssid = 'mesh.ffm', + mesh_bssid = '02:0E:8E:1E:61:17', + mesh_mcast_rate = 12000, + }, - regdom = 'DE', + wifi5 = { + ssid = 'muenchen.freifunk.net', + channel = 44, + htmode = 'HT40+', + mesh_ssid = 'mesh.ffm', + mesh_bssid = '02:0E:8E:1E:61:17', + mesh_mcast_rate = 12000, + }, - wifi24 = { - ssid = 'muenchen.freifunk.net', - channel = 1, - htmode = 'HT40+', - mesh_ssid = 'mesh.ffm', - mesh_bssid = '02:0E:8E:1E:61:17', - mesh_mcast_rate = 12000, - }, + next_node = { + ip4 = '10.80.0.1', + ip6 = 'fdef:ffc0:4fff::1', + mac = '16:41:95:40:f7:dc', + }, - wifi5 = { - ssid = 'muenchen.freifunk.net', - channel = 44, - htmode = 'HT40+', - mesh_ssid = 'mesh.ffm', - mesh_bssid = '02:0E:8E:1E:61:17', - mesh_mcast_rate = 12000, - }, + fastd_mesh_vpn = { + methods = {'salsa2012+gmac'}, + mtu = 1426, + backbone = { + limit = 2, + peers = { + vpn_gw01 = { --[[ VPN Server von Ole (netcap) ]] + key = '0ac59c349980993c99e74e1c5242c39cdd7282fbab0b9575b35762993df510f3', + remotes = {'ipv4 "37.120.168.150" port 10000'}, + }, + vpn_gw02 = { --[[ VPN Server von frnk (Island greencloud) ]] + key = 'fd0b9a4a2f5117b2cc187e80e3656b1da854dd1bcbc17680833cc6824b3c4101', + remotes = {'ipv4 "46.149.23.224" port 10000'}, + }, + vpn_gw04 = { --[[ VPN Server von mephisto ]] + key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5', + remotes = {'ipv4 "213.166.225.3" port 10000'}, + }, + }, + }, + }, - - next_node = { - ip4 = '10.80.0.1', - ip6 = 'fdef:ffc0:4fff::1', - mac = '16:41:95:40:f7:dc', - }, - - fastd_mesh_vpn = { - methods = {'salsa2012+gmac'}, - mtu = 1426, - backbone = { - limit = 2, - peers = { - vpn_gw01 = { --[[ VPN Server von Ole (netcap) ]] - key = '0ac59c349980993c99e74e1c5242c39cdd7282fbab0b9575b35762993df510f3', - remotes = {'ipv4 "37.120.168.150" port 10000'}, - }, - vpn_gw02 = { --[[ VPN Server von frnk (Island greencloud) ]] - key = 'fd0b9a4a2f5117b2cc187e80e3656b1da854dd1bcbc17680833cc6824b3c4101', - remotes = {'ipv4 "46.149.23.224" port 10000'}, - }, - vpn_gw04 = { --[[ VPN Server von mephisto ]] - key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5', - remotes = {'ipv4 "213.166.225.3" port 10000'}, - }, - }, - }, - }, - -autoupdater = { - enabled = 1, - branch = 'stable', - branches = { - stable = { - name = 'stable', - mirrors = { + autoupdater = { + enabled = 1, + branch = 'stable', + branches = { + stable = { + name = 'stable', + mirrors = { 'http://[fdef:ffc0:4fff::11]/firmware/stable/sysupgrade/', 'http://[fdef:ffc0:4fff::12]/firmware/stable/sysupgrade/', 'http://[fdef:ffc0:4fff::13]/firmware/stable/sysupgrade/', }, - probability = 0.08, - good_signatures = 1, - pubkeys = { - '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- Ole - '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz - }, - }, - experimental = { + probability = 0.08, + good_signatures = 1, + pubkeys = { + '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- public key von Ole + --[[ '8d16e1b88bcac28b493d6eadbce97bd223a65b3282a533c1f15f4b616b0d732a', -- BenBE ]] + --[[ 'ee6ffe0fd4cada0358204c4f62a80d859478e7f12982068d65e48ed0a37a4fea', -- e-chb ]] + }, + }, + experimental = { name = 'experimental', - mirrors = { + mirrors = { 'http://[fdef:ffc0:4fff::11]/firmware/experimental/sysupgrade/', 'http://[fdef:ffc0:4fff::12]/firmware/experimental/sysupgrade/', 'http://[fdef:ffc0:4fff::13]/firmware/experimental/sysupgrade/', }, - probability = 0.1, - good_signatures = 1, - pubkeys = { - '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- Ole - '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz - }, - }, - }, - }, + probability = 0.1, + good_signatures = 1, + pubkeys = { + '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- public key von Ole + --[[ '8d16e1b88bcac28b493d6eadbce97bd223a65b3282a533c1f15f4b616b0d732a', -- BenBE ]] + --[[ 'ee6ffe0fd4cada0358204c4f62a80d859478e7f12982068d65e48ed0a37a4fea', -- e-chb ]] + }, + }, + }, + }, - simple_tc = { - mesh_vpn = { - ifname = 'mesh-vpn', - enabled = false, - limit_egress = 200, - limit_ingress = 3000, - }, - }, + simple_tc = { + mesh_vpn = { + ifname = 'mesh-vpn', + enabled = false, + limit_egress = 200, + limit_ingress = 3000, + }, + }, - config_mode = { - msg_welcome = [[ -Willkommen zum Einrichtungsassistenten für deinen neuen Münchner -Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen -entsprechend aus und sende es ab. -]], - msg_pubkey = [[ -

-Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem -er auf den Servern des Münchener Freifunk-Projektes eingetragen wurde, -kann sich dein Knoten mit dem Münchner Mesh-VPN verbinden. -

+ config_mode = { -

-Um deinen Knoten einzutragen, öffne in einem Browser deiner Wahl bitte Keyformular, fülle das Formular aus und schicke es ab. + msg_welcome = [[ + Willkommen zum Einrichtungsassistenten für deinen neuen Münchner + Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen + entsprechend aus und sende es ab. + ]], -

+ msg_pubkey = [[ +

+ Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem + er auf den Servern des Münchener Freifunk-Projektes eingetragen wurde, + kann sich dein Knoten mit dem Münchner Mesh-VPN verbinden. +

-

Informationen für das Formular: -

-

+

+ Um deinen Knoten einzutragen, öffne in einem Browser deiner Wahl bitte + Keyformular, + fülle das Formular aus und schicke es ab. +

+ +

Informationen für das Formular: +

+

+ +

+ Sollte das Formular nicht verfügbar sein, sende bitte eine Mail an + Ole oder + frnk. +

+ ]], + + msg_reboot = [[ +

+ 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. +

+

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

+ ]], + + }, -

-Sollte das Formular nicht verfügbar sein, sende bitte eine Mail an Ole oder frnk. -

-]], - msg_reboot = [[ -

-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. -

-

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

-]], - }, } -- vim: set ft=lua:ts=2:sw=2:et From d17565402822cab38bfe21612fe99ea85f692286 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 15 Nov 2014 04:32:00 +0100 Subject: [PATCH 03/57] site.mk: Bump batman-adv compat level to 15 --- site.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.mk b/site.mk index 717a1b2..7dc3c96 100644 --- a/site.mk +++ b/site.mk @@ -1,5 +1,5 @@ GLUON_SITE_PACKAGES := \ - gluon-mesh-batman-adv-14 \ + gluon-mesh-batman-adv-15 \ gluon-alfred \ gluon-announced \ gluon-autoupdater \ From 88d3cde9f0a980ef20c345768d7ed5eeddcb5ba9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 15 Nov 2014 21:47:24 +0100 Subject: [PATCH 04/57] Use UMAC in fastd crypto --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 5589abe..51ed358 100644 --- a/site.conf +++ b/site.conf @@ -36,7 +36,7 @@ }, fastd_mesh_vpn = { - methods = {'salsa2012+gmac'}, + methods = {'salsa2012+umac'}, mtu = 1426, backbone = { limit = 2, From 39cf8d20562f552c65a12d8f9db141a06cf09d3d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 1 Dec 2014 22:33:47 +0100 Subject: [PATCH 05/57] Fix autoupdate signing keys merge fnord --- site.conf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/site.conf b/site.conf index be48413..7782e10 100644 --- a/site.conf +++ b/site.conf @@ -73,8 +73,7 @@ good_signatures = 1, pubkeys = { '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- public key von Ole - --[[ '8d16e1b88bcac28b493d6eadbce97bd223a65b3282a533c1f15f4b616b0d732a', -- BenBE ]] - --[[ 'ee6ffe0fd4cada0358204c4f62a80d859478e7f12982068d65e48ed0a37a4fea', -- e-chb ]] + '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz }, }, experimental = { @@ -88,8 +87,7 @@ good_signatures = 1, pubkeys = { '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- public key von Ole - --[[ '8d16e1b88bcac28b493d6eadbce97bd223a65b3282a533c1f15f4b616b0d732a', -- BenBE ]] - --[[ 'ee6ffe0fd4cada0358204c4f62a80d859478e7f12982068d65e48ed0a37a4fea', -- e-chb ]] + '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz }, }, }, From c1d5f6e4c9692dd10bf5383c277ef32a773d56c3 Mon Sep 17 00:00:00 2001 From: amperpirat Date: Tue, 9 Dec 2014 21:55:58 +0100 Subject: [PATCH 06/57] changed site.conf --- site.conf | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/site.conf b/site.conf index 7782e10..85d224e 100644 --- a/site.conf +++ b/site.conf @@ -42,17 +42,13 @@ backbone = { limit = 2, peers = { - vpn_gw01 = { --[[ VPN Server von Ole (netcap) ]] - key = '0ac59c349980993c99e74e1c5242c39cdd7282fbab0b9575b35762993df510f3', - remotes = {'ipv4 "37.120.168.150" port 10000'}, + test_gw01 = { --[[ VPN Server von Ole (netcap) ]] + key = '6597ad3726901e9d2890dc69780a1b7a89a1b7fdec8b73ffdea7760a063bbc6d', + remotes = {'ipv4 "46.38.240.165" port 10000'}, }, - vpn_gw02 = { --[[ VPN Server von frnk (Island greencloud) ]] - key = 'fd0b9a4a2f5117b2cc187e80e3656b1da854dd1bcbc17680833cc6824b3c4101', - remotes = {'ipv4 "46.149.23.224" port 10000'}, - }, - vpn_gw04 = { --[[ VPN Server von mephisto ]] - key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5', - remotes = {'ipv4 "213.166.225.3" port 10000'}, + test_gw02 = { --[[ VPN Server von Ole (netcup) ]] + key = 'd5fc5b4bae145f153ea8c5d094244f371508552a1f2724f707ef1afbaa502cfa', + remotes = {'ipv4 "46.38.234.101" port 10000'}, }, }, }, From c3a7431eec34a9840071454edbfa91c15c7d2ea2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 9 Dec 2014 22:20:44 +0100 Subject: [PATCH 07/57] Changes for new experimental test network --- site.conf | 48 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/site.conf b/site.conf index 85d224e..264c3e2 100644 --- a/site.conf +++ b/site.conf @@ -8,25 +8,25 @@ prefix6 = 'fdef:ffc0:4fff::/64', timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', - ntp_servers = {'1.ntp.services.ffm','2.ntp.services.ffm','3.ntp.services.ffm','4.ntp.services.ffm'}, + ntp_servers = {'de.pool.ntp.org','1.ntp.services.ffm','2.ntp.services.ffm','3.ntp.services.ffm','4.ntp.services.ffm'}, regdom = 'DE', wifi24 = { - ssid = 'muenchen.freifunk.net', + ssid = 'test.muenchen.freifunk.net', channel = 1, htmode = 'HT40+', - mesh_ssid = 'mesh.ffmuc', - mesh_bssid = '02:0E:8E:1E:61:17', + mesh_ssid = 'test.mesh.ffmuc', + mesh_bssid = '02:0E:8E:1E:61:16', mesh_mcast_rate = 12000, }, wifi5 = { - ssid = 'muenchen.freifunk.net', + ssid = 'test.muenchen.freifunk.net', channel = 44, htmode = 'HT40+', - mesh_ssid = 'mesh.ffmuc', - mesh_bssid = '02:0E:8E:1E:61:17', + mesh_ssid = 'test.mesh.ffmuc', + mesh_bssid = '02:0E:8E:1E:61:16', mesh_mcast_rate = 12000, }, @@ -42,13 +42,35 @@ backbone = { limit = 2, peers = { - test_gw01 = { --[[ VPN Server von Ole (netcap) ]] - key = '6597ad3726901e9d2890dc69780a1b7a89a1b7fdec8b73ffdea7760a063bbc6d', - remotes = {'ipv4 "46.38.240.165" port 10000'}, + test_gw05 = { --[[ VPN Server von christian ]] + key = '9cef3f9a70cab24f9c64007e07318b350795a98c65efb9b650ffc919ee463930', + remotes = { + '"gw05.ffmuc.net" port 10015', + '"gw05.freifunk-muenchen.de" port 10015', + }, }, - test_gw02 = { --[[ VPN Server von Ole (netcup) ]] + test_gw06 = { --[[ VPN Server von lhampe ]] + key = 'a020ee412581656af896597c1f0402b478696923f7868450d22d5e8a59084efd', + remotes = { + '"gw06.ffmuc.net" port 10000', + '"gw06.freifunk-muenchen.de" port 10000', + }, + }, + test_gw07 = { --[[ VPN Server von Ole (netcup) ]] + key = '6597ad3726901e9d2890dc69780a1b7a89a1b7fdec8b73ffdea7760a063bbc6d', + remotes = { + '"gw07.ffmuc.net" port 10000', + '"gw07.freifunk-muenchen.de" port 10000', + '46.38.234.101 port 10000', + }, + }, + test_gw08 = { --[[ VPN Server von Ole (netcup) ]] key = 'd5fc5b4bae145f153ea8c5d094244f371508552a1f2724f707ef1afbaa502cfa', - remotes = {'ipv4 "46.38.234.101" port 10000'}, + remotes = { + '"gw08.ffmuc.net" port 10000', + '"gw08.freifunk-muenchen.de" port 10000', + '46.38.240.165 port 10000', + }, }, }, }, @@ -56,7 +78,7 @@ autoupdater = { enabled = 1, - branch = 'stable', + branch = 'experimental', branches = { stable = { name = 'stable', From 6e8396909c54d5ab4572301d6de65ff2372fe56b Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 12 Dec 2014 23:34:08 +0100 Subject: [PATCH 08/57] Update gluon --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dfd2a72..9aa0ef1 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := git://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := 08ecab23dec1e43b02fdca4caa86d2b7940b2f12 +GLUON_GIT_REF := 3360dcb3090e7da824f787115b8fc0b4335583b9 _GIT_DESCRIBE = $(shell git describe --tags 2>/dev/null) ifneq (,${_GIT_DESCRIBE}) From 61f2ed79dc8823fb92c42f56347c4fd2c8eba1d5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 12 Dec 2014 23:38:18 +0100 Subject: [PATCH 09/57] Add a git fetch to update gluon checkout --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9aa0ef1..dab558b 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ ${GLUON_BUILD_DIR}: git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR} gluon-prepare: ${GLUON_BUILD_DIR} - (cd ${GLUON_BUILD_DIR} && git checkout -q ${GLUON_GIT_REF}) + (cd ${GLUON_BUILD_DIR} && git fetch && git checkout -q ${GLUON_GIT_REF}) ln -sfT .. ${GLUON_BUILD_DIR}/site clean: From ec58894f0b00c06fc2096e73f2606ba2f02a9f7e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 5 Jan 2015 01:52:02 +0100 Subject: [PATCH 10/57] Update to gluon v2014.4 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dab558b..d395fbd 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := git://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := 3360dcb3090e7da824f787115b8fc0b4335583b9 +GLUON_GIT_REF := v2014.4 _GIT_DESCRIBE = $(shell git describe --tags 2>/dev/null) ifneq (,${_GIT_DESCRIBE}) From a6c5354b7a533f0c8291efe612e6bcf00f3f6ec4 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 Feb 2015 15:08:01 +0100 Subject: [PATCH 11/57] site.conf: Update bat15 gateways --- site.conf | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/site.conf b/site.conf index 264c3e2..d96e15e 100644 --- a/site.conf +++ b/site.conf @@ -42,21 +42,14 @@ backbone = { limit = 2, peers = { - test_gw05 = { --[[ VPN Server von christian ]] - key = '9cef3f9a70cab24f9c64007e07318b350795a98c65efb9b650ffc919ee463930', + gw02 = { --[[ mephisto ]] + key = '7f7970e0fe5622aa4e308e003812bf2f60f5f1956c58ea20969a1106e6c793c0', remotes = { - '"gw05.ffmuc.net" port 10015', - '"gw05.freifunk-muenchen.de" port 10015', + '2a02:958:0:1::1:5 port 10000', + '213.166.225.5 port 10000', }, }, - test_gw06 = { --[[ VPN Server von lhampe ]] - key = 'a020ee412581656af896597c1f0402b478696923f7868450d22d5e8a59084efd', - remotes = { - '"gw06.ffmuc.net" port 10000', - '"gw06.freifunk-muenchen.de" port 10000', - }, - }, - test_gw07 = { --[[ VPN Server von Ole (netcup) ]] + gw07 = { --[[ ole ]] key = '6597ad3726901e9d2890dc69780a1b7a89a1b7fdec8b73ffdea7760a063bbc6d', remotes = { '"gw07.ffmuc.net" port 10000', @@ -64,7 +57,7 @@ '46.38.234.101 port 10000', }, }, - test_gw08 = { --[[ VPN Server von Ole (netcup) ]] + gw08 = { --[[ ole ]] key = 'd5fc5b4bae145f153ea8c5d094244f371508552a1f2724f707ef1afbaa502cfa', remotes = { '"gw08.ffmuc.net" port 10000', @@ -72,7 +65,14 @@ '46.38.240.165 port 10000', }, }, - }, + gw09 = { --[[ ole ]] + key = '839e2e2c8c79b6dd14fb06b65d55d6b57ad506fb88abcc6491647bd666efc629', + remotes = { + '2a03:4000:7:35::1 port 10000', + '46.38.240.90 port 10000', + }, + }, + }, }, }, From 11763e05653e824b9fb9ba1beaaa7ee656a9bc51 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 Feb 2015 15:11:26 +0100 Subject: [PATCH 12/57] site.conf: Cleanup --- site.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site.conf b/site.conf index d96e15e..4b9cc80 100644 --- a/site.conf +++ b/site.conf @@ -49,7 +49,7 @@ '213.166.225.5 port 10000', }, }, - gw07 = { --[[ ole ]] + gw07 = { --[[ ole ]] key = '6597ad3726901e9d2890dc69780a1b7a89a1b7fdec8b73ffdea7760a063bbc6d', remotes = { '"gw07.ffmuc.net" port 10000', @@ -90,7 +90,7 @@ probability = 0.08, good_signatures = 1, pubkeys = { - '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- public key von Ole + '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz }, }, @@ -104,7 +104,7 @@ probability = 0.1, good_signatures = 1, pubkeys = { - '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- public key von Ole + '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz }, }, From 3cef38fc49af154fd46fc60a0f6e5234dec465e3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 Feb 2015 15:11:46 +0100 Subject: [PATCH 13/57] site.conf: Switch to channel 6, ht20 (fixes #5) --- site.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site.conf b/site.conf index 4b9cc80..040f9fe 100644 --- a/site.conf +++ b/site.conf @@ -14,8 +14,8 @@ wifi24 = { ssid = 'test.muenchen.freifunk.net', - channel = 1, - htmode = 'HT40+', + channel = 6, + htmode = 'HT20', mesh_ssid = 'test.mesh.ffmuc', mesh_bssid = '02:0E:8E:1E:61:16', mesh_mcast_rate = 12000, From 5c52928ea306e2ef52789477798a5fba0cc247c6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 Feb 2015 15:18:19 +0100 Subject: [PATCH 14/57] CHANGELOG.md: Update with changes in experimental --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d02eab..ce22858 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Freifunk München Firmware Changelog +## experimental + - Switched to batman-adv compat version 15 + - Changed channel to 6 with HT20 on 2.4GHz + ## 2015.1 - Updated to Gluon 2014.4 release From 0de9482f89f1e9c96d5f0cfa0ddd13201f1dca63 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 13 Feb 2015 17:21:31 +0100 Subject: [PATCH 15/57] site.conf: If you're happy and you know it, syntax error! --- site.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site.conf b/site.conf index 040f9fe..3086629 100644 --- a/site.conf +++ b/site.conf @@ -45,7 +45,7 @@ gw02 = { --[[ mephisto ]] key = '7f7970e0fe5622aa4e308e003812bf2f60f5f1956c58ea20969a1106e6c793c0', remotes = { - '2a02:958:0:1::1:5 port 10000', + '[2a02:958:0:1::1:5] port 10000', '213.166.225.5 port 10000', }, }, @@ -68,7 +68,7 @@ gw09 = { --[[ ole ]] key = '839e2e2c8c79b6dd14fb06b65d55d6b57ad506fb88abcc6491647bd666efc629', remotes = { - '2a03:4000:7:35::1 port 10000', + '[2a03:4000:7:35::1] port 10000', '46.38.240.90 port 10000', }, }, From dc10bc558a2ccff49412a90ed0467b0da724aa60 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 19 Feb 2015 20:54:53 +0100 Subject: [PATCH 16/57] Updated to current gluon master --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4e23a29..cf95a3b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := git://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := v2014.4 +GLUON_GIT_REF := 754e4af1d738ebb84fd63bd98d6b606613202898 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From d7f3b9e5d90ab330ab2edfe8c4c49e80d16f8ad6 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 25 Feb 2015 19:52:08 +0100 Subject: [PATCH 17/57] site.conf: Switch back to production ssid settings --- site.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/site.conf b/site.conf index 16de88d..024b188 100644 --- a/site.conf +++ b/site.conf @@ -13,20 +13,20 @@ regdom = 'DE', wifi24 = { - ssid = 'test.muenchen.freifunk.net', + ssid = 'muenchen.freifunk.net', channel = 6, htmode = 'HT20', - mesh_ssid = 'test.mesh.ffmuc', - mesh_bssid = '02:0E:8E:1E:61:16', + mesh_ssid = 'mesh.ffmuc', + mesh_bssid = '02:0E:8E:1E:61:17', mesh_mcast_rate = 12000, }, wifi5 = { - ssid = 'test.muenchen.freifunk.net', + ssid = 'muenchen.freifunk.net', channel = 44, htmode = 'HT40+', - mesh_ssid = 'test.mesh.ffmuc', - mesh_bssid = '02:0E:8E:1E:61:16', + mesh_ssid = 'mesh.ffmuc', + mesh_bssid = '02:0E:8E:1E:61:17', mesh_mcast_rate = 12000, }, From 5f21b5c384262d618a5e1668e851f9885c1333d5 Mon Sep 17 00:00:00 2001 From: ruebezahl Date: Sun, 8 Mar 2015 19:00:36 +0100 Subject: [PATCH 18/57] de.pool.ntp.org als einziger ntp-service. mehrere interne die nicht erreichbar sind erzeugen nervige overhead-traffic. fixes #11 --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 024b188..2185940 100644 --- a/site.conf +++ b/site.conf @@ -8,7 +8,7 @@ prefix6 = 'fdef:ffc0:4fff::/64', timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', - ntp_servers = {'de.pool.ntp.org','1.ntp.services.ffm','2.ntp.services.ffm','3.ntp.services.ffm','4.ntp.services.ffm'}, + ntp_servers = {'de.pool.ntp.org'}, regdom = 'DE', From 57b187aa0f1adcb9cedca29da74d721bd988a797 Mon Sep 17 00:00:00 2001 From: ruebezahl Date: Sun, 8 Mar 2015 19:11:05 +0100 Subject: [PATCH 19/57] nur noch dns-namen fuer gateways --- site.conf | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/site.conf b/site.conf index 2185940..4cebd05 100644 --- a/site.conf +++ b/site.conf @@ -45,8 +45,8 @@ gw02 = { --[[ mephisto ]] key = '7f7970e0fe5622aa4e308e003812bf2f60f5f1956c58ea20969a1106e6c793c0', remotes = { - '[2a02:958:0:1::1:5] port 10000', - '213.166.225.5 port 10000', + 'gw02.ffmuc.net port 10000', + 'gw02.freifunk-muenchen.de port 10000', }, }, gw07 = { --[[ ole ]] @@ -54,7 +54,6 @@ remotes = { '"gw07.ffmuc.net" port 10000', '"gw07.freifunk-muenchen.de" port 10000', - '46.38.234.101 port 10000', }, }, gw08 = { --[[ ole ]] @@ -62,14 +61,13 @@ remotes = { '"gw08.ffmuc.net" port 10000', '"gw08.freifunk-muenchen.de" port 10000', - '46.38.240.165 port 10000', }, }, gw09 = { --[[ ole ]] key = '839e2e2c8c79b6dd14fb06b65d55d6b57ad506fb88abcc6491647bd666efc629', remotes = { - '[2a03:4000:7:35::1] port 10000', - '46.38.240.90 port 10000', + '"gw09.ffmuc.net" port 10000', + '"gw09.freifunk-muenchen.de" port 10000', }, }, }, From a8fc73ec6ce14730a0423a97bf286625d2e0053b Mon Sep 17 00:00:00 2001 From: ruebezahl Date: Sun, 8 Mar 2015 19:13:43 +0100 Subject: [PATCH 20/57] fixes missing " for gw02 gateway peer bauma --- site.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site.conf b/site.conf index 4cebd05..8d00c9e 100644 --- a/site.conf +++ b/site.conf @@ -45,8 +45,8 @@ gw02 = { --[[ mephisto ]] key = '7f7970e0fe5622aa4e308e003812bf2f60f5f1956c58ea20969a1106e6c793c0', remotes = { - 'gw02.ffmuc.net port 10000', - 'gw02.freifunk-muenchen.de port 10000', + '"gw02.ffmuc.net" port 10000', + '"gw02.freifunk-muenchen.de" port 10000', }, }, gw07 = { --[[ ole ]] From c0cc775311516e60e47d58bd0d2dc0b4866613cc Mon Sep 17 00:00:00 2001 From: ruebezahl Date: Sun, 8 Mar 2015 19:49:10 +0100 Subject: [PATCH 21/57] alle bat15-gws als peers: testgateways + mephisto --- site.conf | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/site.conf b/site.conf index 8d00c9e..746edc6 100644 --- a/site.conf +++ b/site.conf @@ -49,28 +49,27 @@ '"gw02.freifunk-muenchen.de" port 10000', }, }, - gw07 = { --[[ ole ]] - key = '6597ad3726901e9d2890dc69780a1b7a89a1b7fdec8b73ffdea7760a063bbc6d', - remotes = { - '"gw07.ffmuc.net" port 10000', - '"gw07.freifunk-muenchen.de" port 10000', - }, - }, - gw08 = { --[[ ole ]] - key = 'd5fc5b4bae145f153ea8c5d094244f371508552a1f2724f707ef1afbaa502cfa', - remotes = { - '"gw08.ffmuc.net" port 10000', - '"gw08.freifunk-muenchen.de" port 10000', - }, - }, - gw09 = { --[[ ole ]] - key = '839e2e2c8c79b6dd14fb06b65d55d6b57ad506fb88abcc6491647bd666efc629', - remotes = { - '"gw09.ffmuc.net" port 10000', - '"gw09.freifunk-muenchen.de" port 10000', - }, - }, - }, + gwtest1 = { + key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055', + remotes = { + '"gwtest1.ffmuc.net" port 10000', + }, + }, + + gwtest2 = { + key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0', + remotes = { + '"gwtest2.ffmuc.net" port 10000', + }, + }, + + gwtest3 = { + key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6', + remotes = { + '"gwtest3.ffmuc.net" port 10000', + }, + } + }, }, }, From 8c66fd247095f85e57fdab1dbac08a75da45c2d2 Mon Sep 17 00:00:00 2001 From: Marcel Senf Date: Fri, 13 Mar 2015 23:52:57 +0100 Subject: [PATCH 22/57] defaults uplink/downlink shaping 1200/12000 --- site.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site.conf b/site.conf index 2b2012c..7cb74aa 100644 --- a/site.conf +++ b/site.conf @@ -193,8 +193,8 @@ autoupdater = { mesh_vpn = { ifname = 'mesh-vpn', enabled = false, - limit_egress = 200, - limit_ingress = 3000, + limit_egress = 1200, + limit_ingress = 12000, }, }, From 91285c2ef95b0f3382657ebb5fdbc5cc9a4bbd6b Mon Sep 17 00:00:00 2001 From: Marcel Senf Date: Sat, 14 Mar 2015 00:07:47 +0100 Subject: [PATCH 23/57] lqfb hinweis, fixes #12 --- site.conf | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/site.conf b/site.conf index 7cb74aa..5da55ae 100644 --- a/site.conf +++ b/site.conf @@ -222,37 +222,17 @@ Willkommen zum Einrichtungsassistenten für deinen neuen Münchner Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen entsprechend aus und sende es ab. ]], - msg_pubkey = [[ -

-Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem -er auf den Servern des Münchener Freifunk-Projektes eingetragen wurde, -kann sich dein Knoten mit dem Münchner Mesh-VPN verbinden. -

- -

-Um deinen Knoten einzutragen, öffne in einem Browser deiner Wahl bitte Keyformular, fülle das Formular aus und schicke es ab. - -

- -

Informationen für das Formular: -

    -
  • Knotenname: <%=hostname%>
    • -
  • MAC-Adresse: <%=sysconfig.primary_mac%>
    • -
  • Key: <%=pubkey%>
    • -
-

- -

-Sollte das Formular nicht verfügbar sein, sende bitte eine Mail an Ole oder frnk. -

-]], + msg_pubkey = [[ ]], msg_reboot = [[

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. +unserer Webseite. Wenn alles geklappt hat, wirst du unter map.freifunk-muenchen.de deinen Knoten finden. +

+

+Wenn Du mehr über Freifunk in München erfahren möchtest, dann besuche uns doch auf unserem monatlichen Treffen (siehe Webseite). Um mehr Einfluss auf die Entwicklung zu nehmen, hast Du als Knotenbetreiber zusätzlich die Möglichkeit in unserem Abstimmungs- und Dokumentationssystem mitzumachen. Voraussetzung ist eine persönliche Anmeldung auf einem der Treffen.

Viel Spaß mit deinem Knoten und der Erkundung von Freifunk! From 5e7b5cda1cecaee98602bee9784bf47505f67b77 Mon Sep 17 00:00:00 2001 From: Marcel Senf Date: Sat, 14 Mar 2015 00:19:42 +0100 Subject: [PATCH 24/57] trinos ocd --- site.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site.conf b/site.conf index f388d30..f5ce61b 100644 --- a/site.conf +++ b/site.conf @@ -56,14 +56,14 @@ }, }, - gwtest2 = { + gwtest2 = { key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0', remotes = { '"gwtest2.ffmuc.net" port 10000', }, }, - gwtest3 = { + gwtest3 = { key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6', remotes = { '"gwtest3.ffmuc.net" port 10000', From 558c60a85da603b418aee9dbd62cd6297f04f7c9 Mon Sep 17 00:00:00 2001 From: Marcel Senf Date: Sat, 14 Mar 2015 00:26:50 +0100 Subject: [PATCH 25/57] stable branch --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index f5ce61b..eae284e 100644 --- a/site.conf +++ b/site.conf @@ -75,7 +75,7 @@ autoupdater = { enabled = 1, - branch = 'experimental', + branch = 'stable', branches = { stable = { name = 'stable', From 9bf1302d34dc5265452d7b65fdb445bb5548440f Mon Sep 17 00:00:00 2001 From: Marcel Senf Date: Sat, 14 Mar 2015 00:31:42 +0100 Subject: [PATCH 26/57] renamed gateways for stable-release --- site.conf | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/site.conf b/site.conf index eae284e..3981b5c 100644 --- a/site.conf +++ b/site.conf @@ -49,29 +49,30 @@ '"gw02.freifunk-muenchen.de" port 10000', }, }, - gwtest1 = { - key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055', - remotes = { - '"gwtest1.ffmuc.net" port 10000', - }, - }, - - gwtest2 = { - key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0', - remotes = { - '"gwtest2.ffmuc.net" port 10000', - }, - }, - - gwtest3 = { + gw07 = { key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6', remotes = { - '"gwtest3.ffmuc.net" port 10000', + '"gw07.ffmuc.net" port 10000', + '"gw07.freifunk-muenchen.de" port 10000', + }, + }, + gw08 = { + key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055', + remotes = { + '"gw08.ffmuc.net" port 10000', + '"gw08.freifunk-muenchen.de" port 10000', }, - } - }, - }, - }, + }, + gw09 = { + key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0', + remotes = { + '"gw09.ffmuc.net" port 10000', + '"gw09.freifunk-muenchen.de" port 10000', + }, + }, + } + }, + }, autoupdater = { enabled = 1, From 87f3939ce12f4b063e8bdfd2c35b967ca45223ff Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 14 Mar 2015 09:06:53 +0100 Subject: [PATCH 27/57] Only use IPv4 to connect to the gateways The MTU is set to 1426, which is too high for IPv6 connections. See http://fastd.readthedocs.org/en/v17/manual/mtu.html. --- site.conf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/site.conf b/site.conf index 3981b5c..cbe549d 100644 --- a/site.conf +++ b/site.conf @@ -45,29 +45,29 @@ gw02 = { --[[ mephisto ]] key = '7f7970e0fe5622aa4e308e003812bf2f60f5f1956c58ea20969a1106e6c793c0', remotes = { - '"gw02.ffmuc.net" port 10000', - '"gw02.freifunk-muenchen.de" port 10000', + 'ipv4 "gw02.ffmuc.net" port 10000', + 'ipv4 "gw02.freifunk-muenchen.de" port 10000', }, }, gw07 = { key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6', remotes = { - '"gw07.ffmuc.net" port 10000', - '"gw07.freifunk-muenchen.de" port 10000', + 'ipv4 "gw07.ffmuc.net" port 10000', + 'ipv4 "gw07.freifunk-muenchen.de" port 10000', }, }, gw08 = { key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055', remotes = { - '"gw08.ffmuc.net" port 10000', - '"gw08.freifunk-muenchen.de" port 10000', + 'ipv4 "gw08.ffmuc.net" port 10000', + 'ipv4 "gw08.freifunk-muenchen.de" port 10000', }, }, gw09 = { key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0', remotes = { - '"gw09.ffmuc.net" port 10000', - '"gw09.freifunk-muenchen.de" port 10000', + 'ipv4 "gw09.ffmuc.net" port 10000', + 'ipv4 "gw09.freifunk-muenchen.de" port 10000', }, }, } From a4f9f597a7bb57b6296b9d5b8de9ec8a24bc28cb Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 14 Mar 2015 09:13:42 +0100 Subject: [PATCH 28/57] Fix merge fail --- site.conf | 105 ++++++++++++++++++++++-------------------------------- 1 file changed, 43 insertions(+), 62 deletions(-) diff --git a/site.conf b/site.conf index cbe549d..4d99917 100644 --- a/site.conf +++ b/site.conf @@ -103,70 +103,51 @@ good_signatures = 1, pubkeys = { '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz) - }, - }, - }, - }, + }, + }, + }, + }, + simple_tc = { + mesh_vpn = { + ifname = 'mesh-vpn', + enabled = false, + limit_egress = 1200, + limit_ingress = 12000, + }, + }, - --[[ Simple TC settings to limit the bandwidth of the vpn-uplink - mesh_vpn: - sub - ifname: name of the interface/bridge - enabled: default-value - limit_egress: default-value - limit_ingress: default-value ]] - - simple_tc = { - mesh_vpn = { - ifname = 'mesh-vpn', - enabled = false, - limit_egress = 1200, - limit_ingress = 12000, - }, - }, - - - --[[ Config Mode settings - Text shown on local website on node while in config mode (after initial flashing or after a long press and hold on the primary button and reboot). You can use html here. - msg_welcome: Welcome message shown at startup - msg_pubkey: Instructions for the user how your community handles the key exchange - only shown if VPN setting is selected - msg_reboot: Message shown when configuration is finished while the node is rebooting. - - Variables - Within the text given here you can use variables which are - replaced when the respective website is delivered to the user. - Variables must be used in the format <%=NAME%>. See msg_pubkey for an example. - hostname: hostname of the node - pubkey: fastd public key of the node - sysconfig.primary_mac the primary mac of the node, also found printed beneath the device - ... other sysconfig.* variables: config_ifname, lan_ifname, wan_ifname ]] - - - config_mode = { - msg_welcome = [[ -Willkommen zum Einrichtungsassistenten für deinen neuen Münchner -Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen -entsprechend aus und sende es ab. -]], - msg_pubkey = [[ ]], - msg_reboot = [[ -

-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 alles geklappt hat, wirst du unter map.freifunk-muenchen.de deinen Knoten finden. -

-

-Wenn Du mehr über Freifunk in München erfahren möchtest, dann besuche uns doch auf unserem monatlichen Treffen (siehe Webseite). Um mehr Einfluss auf die Entwicklung zu nehmen, hast Du als Knotenbetreiber zusätzlich die Möglichkeit in unserem Abstimmungs- und Dokumentationssystem mitzumachen. Voraussetzung ist eine persönliche Anmeldung auf einem der Treffen. -

-

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

-]], - }, + config_mode = { + msg_welcome = [[ + Willkommen zum Einrichtungsassistenten für deinen neuen Münchner + Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen + entsprechend aus und sende es ab. + ]], + msg_pubkey = [[ ]], + msg_reboot = [[ +

+ 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 + alles geklappt hat, wirst du unter + map.freifunk-muenchen.de + deinen Knoten finden. +

+

+ Wenn Du mehr über Freifunk in München erfahren möchtest, dann besuche + uns doch auf unserem monatlichen Treffen (siehe Webseite). Um mehr + Einfluss auf die Entwicklung zu nehmen, hast Du als Knotenbetreiber + zusätzlich die Möglichkeit in unserem + Abstimmungs- und Dokumentationssystem + mitzumachen. Voraussetzung ist eine persönliche Anmeldung auf einem + der Treffen. +

+

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

+ ]], + }, } -- vim: set ft=lua:ts=2:sw=2:et From c03039216db66a58c687f77f1a784c86beb02e08 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 14 Mar 2015 09:14:40 +0100 Subject: [PATCH 29/57] Remove trailing whitespaces --- site.conf | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/site.conf b/site.conf index 4d99917..20cad8a 100644 --- a/site.conf +++ b/site.conf @@ -49,28 +49,28 @@ 'ipv4 "gw02.freifunk-muenchen.de" port 10000', }, }, - gw07 = { + gw07 = { key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6', - remotes = { + remotes = { 'ipv4 "gw07.ffmuc.net" port 10000', 'ipv4 "gw07.freifunk-muenchen.de" port 10000', }, }, - gw08 = { + gw08 = { key = 'e476fb3a72365b550a23b587c0962eed362ed0c237175552b3261d22daaa2055', - remotes = { + remotes = { 'ipv4 "gw08.ffmuc.net" port 10000', 'ipv4 "gw08.freifunk-muenchen.de" port 10000', - }, - }, - gw09 = { + }, + }, + gw09 = { key = 'b86f436c9bb13b308dc92c3889fd468c46679d9df0bf4892244372ab415694d0', - remotes = { + remotes = { 'ipv4 "gw09.ffmuc.net" port 10000', 'ipv4 "gw09.freifunk-muenchen.de" port 10000', - }, - }, - } + }, + }, + } }, }, From c5968625e8561ff1fda6e05bc4cff9952d7197e5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 21 Mar 2015 15:53:47 +0100 Subject: [PATCH 30/57] Use better version naming scheme for autoupdater compat --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index cf95a3b..a71cc62 100644 --- a/Makefile +++ b/Makefile @@ -4,12 +4,10 @@ GLUON_GIT_REF := 754e4af1d738ebb84fd63bd98d6b606613202898 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key -_GIT_DESCRIBE = $(shell git describe --tags 2>/dev/null) -ifneq (,${_GIT_DESCRIBE}) - GLUON_RELEASE := ${_GIT_DESCRIBE} +GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) +ifneq (,$(shell git describe --exact-match --tags 2>/dev/null)) GLUON_BRANCH := stable else - GLUON_RELEASE ?= snapshot~$(shell date '+%Y%m%d')~$(shell git describe --always) GLUON_BRANCH := experimental endif From 233b8bd4a0d6a4108ddbee71b39bf9a58f85290e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 21 Mar 2015 15:54:31 +0100 Subject: [PATCH 31/57] Show a message what version for what branch will be built --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a71cc62..674bb04 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,18 @@ GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \ GLUON_RELEASE=${GLUON_RELEASE} \ GLUON_BRANCH=${GLUON_BRANCH} -all: gluon-clean +all: info + ${MAKE} gluon-clean ${MAKE} manifest ${MAKE} gluon-clean +info: + @echo + @echo '#########################' + @echo '# FFMUC Firmare build' + @echo '# Building release ${GLUON_RELEASE} for branch ${GLUON_BRANCH}' + @echo + build: gluon-prepare ${GLUON_MAKE} From d4bb0d14344644123c1964fbff8047009c473087 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 22 Mar 2015 16:49:39 +0100 Subject: [PATCH 32/57] Add internel ntp servers --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 20cad8a..ac48554 100644 --- a/site.conf +++ b/site.conf @@ -8,7 +8,7 @@ prefix6 = 'fdef:ffc0:4fff::/64', timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', - ntp_servers = {'de.pool.ntp.org'}, + ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' }, regdom = 'DE', From df318edfeba72c111654cdb011921dc7f867c43e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 22 Mar 2015 16:50:01 +0100 Subject: [PATCH 33/57] Use firmware.ffmuc.net for autoupdater --- site.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/site.conf b/site.conf index ac48554..41fa690 100644 --- a/site.conf +++ b/site.conf @@ -81,9 +81,7 @@ stable = { name = 'stable', mirrors = { - 'http://[fdef:ffc0:4fff::11]/firmware/stable/sysupgrade/', - 'http://[fdef:ffc0:4fff::12]/firmware/stable/sysupgrade/', - 'http://[fdef:ffc0:4fff::13]/firmware/stable/sysupgrade/', + 'http://firmware.ffmuc.net/stable/sysupgrade/', 'http://[fdef:ffc0:4fff::130]/firmware/stable/sysupgrade/', }, probability = 0.08, @@ -97,6 +95,7 @@ experimental = { name = 'experimental', mirrors = { + 'http://firmware.ffmuc.net/experimental/sysupgrade/', 'http://[fdef:ffc0:4fff::130]/firmware/experimental/sysupgrade/', }, probability = 0.1, From b636d416b9c91c6104cc10f3d922287a51d5fc74 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 22 Mar 2015 20:30:28 +0100 Subject: [PATCH 34/57] Increase autoupdater probabilities --- site.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site.conf b/site.conf index 41fa690..8680677 100644 --- a/site.conf +++ b/site.conf @@ -84,7 +84,7 @@ 'http://firmware.ffmuc.net/stable/sysupgrade/', 'http://[fdef:ffc0:4fff::130]/firmware/stable/sysupgrade/', }, - probability = 0.08, + probability = 0.1, good_signatures = 2, pubkeys = { '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole @@ -98,7 +98,7 @@ 'http://firmware.ffmuc.net/experimental/sysupgrade/', 'http://[fdef:ffc0:4fff::130]/firmware/experimental/sysupgrade/', }, - probability = 0.1, + probability = 0.5, good_signatures = 1, pubkeys = { '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz) From 5b6307f269dc09257b3dba465313964938ae95c9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 23 Mar 2015 23:53:02 +0100 Subject: [PATCH 35/57] Add own packages feed and custom packages with ebtables filters --- modules | 4 ++++ site.mk | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 modules diff --git a/modules b/modules new file mode 100644 index 0000000..88ca725 --- /dev/null +++ b/modules @@ -0,0 +1,4 @@ +GLUON_SITE_FEEDS='ffmuc_packages' + +PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/freifunkMUC/gluon-packages.git +PACKAGES_FFMUC_PACKAGES_COMMIT=c931b5dd497d3e8495dc934faacc71a838c23550 diff --git a/site.mk b/site.mk index 7dc3c96..303d8ed 100644 --- a/site.mk +++ b/site.mk @@ -20,7 +20,9 @@ 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 3df370872e8669bcd1fd70ad3599dbf6e391fadc Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Mar 2015 20:59:59 +0100 Subject: [PATCH 36/57] Update ffmuc packages feed --- modules | 2 +- site.conf | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules b/modules index 88ca725..a505384 100644 --- a/modules +++ b/modules @@ -1,4 +1,4 @@ GLUON_SITE_FEEDS='ffmuc_packages' PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/freifunkMUC/gluon-packages.git -PACKAGES_FFMUC_PACKAGES_COMMIT=c931b5dd497d3e8495dc934faacc71a838c23550 +PACKAGES_FFMUC_PACKAGES_COMMIT=82e721ad5d7c9eca8728954cfa1ab1d5b9168487 diff --git a/site.conf b/site.conf index 8680677..e74d519 100644 --- a/site.conf +++ b/site.conf @@ -82,7 +82,7 @@ name = 'stable', mirrors = { 'http://firmware.ffmuc.net/stable/sysupgrade/', - 'http://[fdef:ffc0:4fff::130]/firmware/stable/sysupgrade/', + 'http://[fdef:ffc0:4fff::130]/stable/sysupgrade/', }, probability = 0.1, good_signatures = 2, @@ -96,7 +96,7 @@ name = 'experimental', mirrors = { 'http://firmware.ffmuc.net/experimental/sysupgrade/', - 'http://[fdef:ffc0:4fff::130]/firmware/experimental/sysupgrade/', + 'http://[fdef:ffc0:4fff::130]/experimental/sysupgrade/', }, probability = 0.5, good_signatures = 1, From 536edbd699852525ea37dbc9f68813369b66e572 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 24 Mar 2015 21:09:22 +0100 Subject: [PATCH 37/57] Update to a more recent gluon commit Not current master because of i18n and target changes. This includes some fixes we want. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 674bb04..31d4239 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GLUON_BUILD_DIR := gluon-build GLUON_GIT_URL := git://github.com/freifunk-gluon/gluon.git -GLUON_GIT_REF := 754e4af1d738ebb84fd63bd98d6b606613202898 +GLUON_GIT_REF := 52698e62bac2ec0f8764b12cf437040528e77efb SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 57343c8370fbd6904d9c1d19aa0f8a89dd72312c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 25 Mar 2015 23:24:21 +0100 Subject: [PATCH 38/57] Update changelog for v2015.2 release --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36c4856..b54d1e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,22 @@ # Freifunk München Firmware Changelog ## v2015.2 + - Updated to new upstream gluon: 52698e62bac2ec0f8764b12cf437040528e77efb - Switched to batman-adv compat version 15 - Changed channel to 6 with HT20 on 2.4GHz + - Added FFMuc custom gluon packages with ebtables rules: + - mcast-drop-non-site to prohibit arp traffic except 10.8.0.0/16 + - mcast-drop-arp to drop arp traffic from/to 0.0.0.0 + - mcast-allow-cjdns to allow cjdns multicast traffic + - Use new gateways with DNS names + - Changed default download/upload traffic shaping to 12.000/1.200 kbit/s + - Removed keyformular note on end of luci configuration, as we're now + blacklisting keys instead of whitelisting + - Added information about liquid feedback on end of luci configuration + - Use improved version naming scheme for autoupdater compatibility with + intermediate versions + - Use internal NTP server 0.ntp.ffmuc.net + - Connections from nodes to gateways only over IPv4 for now (MTU issues) ## v2015.1 - Updated to Gluon 2014.4 release From 0e3a2228bcf65415898ca4444bc44430d39b554d Mon Sep 17 00:00:00 2001 From: chris007de Date: Thu, 26 Mar 2015 21:22:33 +0100 Subject: [PATCH 39/57] Update CHANGELOG.md --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36c4856..f03a8f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,24 @@ # Freifunk München Firmware Changelog ## v2015.2 + - Updated to new upstream gluon: 52698e62bac2ec0f8764b12cf437040528e… +…77efb + - Switched to batman-adv compat version 15 - Changed channel to 6 with HT20 on 2.4GHz + - Added FFMuc custom gluon packages with ebtables rules: + - mcast-drop-non-site to prohibit arp traffic except 10.8.0.0/16 + - mcast-drop-arp to drop arp traffic from/to 0.0.0.0 + - mcast-allow-cjdns to allow cjdns multicast traffic + - Use new gateways with DNS names + - Changed default download/upload traffic shaping to 12.000/1.200 kbit/s + - Removed keyformular note on end of luci configuration, as we're now + blacklisting keys instead of whitelisting + - Added information about liquid feedback on end of luci configuration + - Use improved version naming scheme for autoupdater compatibility with + intermediate versions + - Use internal NTP server 0.ntp.ffmuc.net + - Connections from nodes to gateways only over IPv4 for now (MTU issues) ## v2015.1 - Updated to Gluon 2014.4 release From 96c81ae8d2c7f1c6bc672cc1e28c1597c3b76c61 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 27 Mar 2015 22:33:19 +0100 Subject: [PATCH 40/57] Add new gateway gw03.ffmuc.net --- site.conf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/site.conf b/site.conf index e74d519..f521e79 100644 --- a/site.conf +++ b/site.conf @@ -49,6 +49,13 @@ 'ipv4 "gw02.freifunk-muenchen.de" port 10000', }, }, + gw03 = { --[[ fpletz ]] + key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', + remotes = { + 'ipv4 "gw03.ffmuc.net" port 10000', + 'ipv4 "gw03.freifunk-muenchen.de" port 10000', + }, + }, gw07 = { key = '77b5f5189c360b245e1c934941468cc9cf57f0646465be5765593a95e54449d6', remotes = { From 8dce5edd93e421c46bba65dabe73d070d8f5aa01 Mon Sep 17 00:00:00 2001 From: chris007de Date: Mon, 30 Mar 2015 17:32:08 +0200 Subject: [PATCH 41/57] added chris' key for stable signing --- site.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/site.conf b/site.conf index f521e79..0ed67f5 100644 --- a/site.conf +++ b/site.conf @@ -96,6 +96,7 @@ pubkeys = { '2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole '7e3bd782e40189b903b3fb1e488d64b23aa04bc353b1a521b4cd50e70b299113', -- fpletz + '56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris '2f92051ac4452d6026061e6c3719ffbd4f34ba7fbc474439fc6f857b76159bae', -- build.freifunk-muenchen.de (fpletz) }, }, From 9a7d29bed715999ef2f667d656b8f3414c8557f8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 30 Mar 2015 20:23:26 +0200 Subject: [PATCH 42/57] Add 4 new gateways (not all are and will be active) --- site.conf | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/site.conf b/site.conf index 0ed67f5..707c463 100644 --- a/site.conf +++ b/site.conf @@ -56,6 +56,27 @@ '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 = { @@ -77,9 +98,16 @@ '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, From c4b760b9a8faa00f0140f8f75f296418649f1efe Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 6 Apr 2015 17:10:12 +0200 Subject: [PATCH 43/57] Fork gluon to enable no_rebroadcast on mesh-vpn --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 31d4239..57d0c52 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ GLUON_BUILD_DIR := gluon-build -GLUON_GIT_URL := git://github.com/freifunk-gluon/gluon.git +GLUON_GIT_URL := https://github.com/freifunkMUC/gluon.git GLUON_GIT_REF := 52698e62bac2ec0f8764b12cf437040528e77efb SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 1b6937416d805987b41b30f4ffc54460e6d707ba Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 7 Apr 2015 14:49:22 +0200 Subject: [PATCH 44/57] Use the right commit for no_rebroadcast fix --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 57d0c52..01ce297 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 := 52698e62bac2ec0f8764b12cf437040528e77efb +GLUON_GIT_REF := 4d7d6dd00172a91c107b086855f60bb180aca5dc SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From dc2de3562e9dd9190e7e97cb4a2ae1473ce144f2 Mon Sep 17 00:00:00 2001 From: chris007de Date: Thu, 16 Apr 2015 12:20:17 +0200 Subject: [PATCH 45/57] addec changes vor v2015.3 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b54d1e4..5c28e73 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Freifunk München Firmware Changelog +## v2015.3 + - Add 4 new gateways as placeholders (not all are and will be active immediately) + - Integrated no_rebroadcast fix on mesh-vpn from Gluon Upstream + - Added another key for stable version signing + ## v2015.2 - Updated to new upstream gluon: 52698e62bac2ec0f8764b12cf437040528e77efb - Switched to batman-adv compat version 15 From 6d9c3c2acf0b0e57526cd3471c79657627a56b70 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 28 Apr 2015 14:14:21 +0200 Subject: [PATCH 46/57] Update to current gluon master --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 01ce297..e7059ed 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 := 4d7d6dd00172a91c107b086855f60bb180aca5dc +GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git +GLUON_GIT_REF := 6bcd9b92d494f29de0d5d2bc41643d2d35ffc530 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 236f66aaddd64518b306e5003c15a94ddc9cbcb3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 28 Apr 2015 14:14:39 +0200 Subject: [PATCH 47/57] Target builds: ar71xx-generic, ar71xx-nand, mpc85xx-generic, x86-kvm_guest --- Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e7059ed..a879146 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ endif 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} + GLUON_RELEASE=${GLUON_RELEASE} \ + GLUON_BRANCH=${GLUON_BRANCH} all: info ${MAKE} gluon-clean @@ -30,7 +30,10 @@ info: @echo build: gluon-prepare - ${GLUON_MAKE} + ${GLUON_MAKE} GLUON_TARGET=ar71xx-generic + ${GLUON_MAKE} GLUON_TARGET=ar71xx-nand + ${GLUON_MAKE} GLUON_TARGET=mpc85xx-generic + ${GLUON_MAKE} GLUON_TARGET=x86-kvm_guest manifest: build ${GLUON_MAKE} manifest From cd83906d565b59e5b3d4831a02964d8652e98dc9 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 29 Apr 2015 05:43:23 +0200 Subject: [PATCH 48/57] site.mk: Add packages uon-config-mode-core & gluon-setup-mode --- site.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site.mk b/site.mk index 303d8ed..5dbd269 100644 --- a/site.mk +++ b/site.mk @@ -3,6 +3,7 @@ GLUON_SITE_PACKAGES := \ gluon-alfred \ gluon-announced \ gluon-autoupdater \ + gluon-config-mode-core \ gluon-config-mode-autoupdater \ gluon-config-mode-hostname \ gluon-config-mode-mesh-vpn \ @@ -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 996f401d8c302892b066ea46f0fd5bdedfbb2541 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 16 May 2015 19:16:58 +0200 Subject: [PATCH 49/57] Update gluon to v2015.1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a879146..73fb895 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 := 6bcd9b92d494f29de0d5d2bc41643d2d35ffc530 +GLUON_GIT_REF := v2015.1 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key From 0fbe40a6f30e8b790a597c1b5c9d31902bcbb482 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 16 May 2015 19:39:14 +0200 Subject: [PATCH 50/57] Enable mesh on WAN --- site.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 707c463..4c4fa2f 100644 --- a/site.conf +++ b/site.conf @@ -10,6 +10,8 @@ timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', ntp_servers = { '0.ntp.ffmuc.net', '1.ntp.ffmuc.net' }, + mesh_on_wan = true, + regdom = 'DE', wifi24 = { @@ -143,7 +145,6 @@ }, }, - simple_tc = { mesh_vpn = { ifname = 'mesh-vpn', From e3ac39923b10d4db9b574ac1fccde4a056765195 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 16 May 2015 19:45:05 +0200 Subject: [PATCH 51/57] Add package gluon-luci-wifi-config --- site.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/site.mk b/site.mk index 5dbd269..b7b1255 100644 --- a/site.mk +++ b/site.mk @@ -14,6 +14,7 @@ GLUON_SITE_PACKAGES := \ gluon-luci-admin \ gluon-luci-autoupdater \ gluon-luci-portconfig \ + gluon-luci-wifi-config \ gluon-luci-private-wifi \ gluon-next-node \ gluon-mesh-vpn-fastd \ From 7485aca9e11eb5cc3c7d275dfec4d9a306e70237 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 16 May 2015 19:46:42 +0200 Subject: [PATCH 52/57] Makefile: Don't autoclean gluon directory --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index 73fb895..892e3fe 100644 --- a/Makefile +++ b/Makefile @@ -18,9 +18,7 @@ GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \ GLUON_BRANCH=${GLUON_BRANCH} all: info - ${MAKE} gluon-clean ${MAKE} manifest - ${MAKE} gluon-clean info: @echo From d5045bbeab8b9e0fb28c593d5417c91f96a1a612 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 16 May 2015 21:21:28 +0200 Subject: [PATCH 53/57] site.conf: Fix fastd peer groups --- site.conf | 112 +++++++++++++++++++++++++++--------------------------- 1 file changed, 57 insertions(+), 55 deletions(-) diff --git a/site.conf b/site.conf index 4c4fa2f..190fbe0 100644 --- a/site.conf +++ b/site.conf @@ -41,70 +41,72 @@ fastd_mesh_vpn = { methods = {'salsa2012+umac'}, mtu = 1426, - backbone = { + groups = { + backbone = { limit = 2, - peers = { - gw02 = { --[[ mephisto ]] - key = '7f7970e0fe5622aa4e308e003812bf2f60f5f1956c58ea20969a1106e6c793c0', - remotes = { - 'ipv4 "gw02.ffmuc.net" port 10000', - 'ipv4 "gw02.freifunk-muenchen.de" port 10000', + peers = { + gw02 = { --[[ mephisto ]] + key = '7f7970e0fe5622aa4e308e003812bf2f60f5f1956c58ea20969a1106e6c793c0', + remotes = { + 'ipv4 "gw02.ffmuc.net" port 10000', + 'ipv4 "gw02.freifunk-muenchen.de" port 10000', + }, }, - }, - gw03 = { --[[ fpletz ]] - key = '4b856fca91077d08ea79f13e139c33b1d1a62e1566e0d447bbfd9cf640c74c41', - remotes = { - 'ipv4 "gw03.ffmuc.net" port 10000', - 'ipv4 "gw03.freifunk-muenchen.de" port 10000', + gw03 = { --[[ fpletz ]] + 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', + 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', + 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', + 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', + 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', + 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', + 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', + gw10 = { + key = 'c04358d4818ec108fa4715e4517300cb2d0fa848dfa872770c4b8487d525e8bf', + remotes = { + 'ipv4 "gw10.ffmuc.net" port 10000', + 'ipv4 "gw10.freifunk-muenchen.de" port 10000', + }, }, }, }, From 120fe842452ed1e73703d0e0c3575b4568129b6f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 16 May 2015 23:36:27 +0200 Subject: [PATCH 54/57] Makefile: Use variable for target selection --- Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 892e3fe..7bbfae5 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,12 @@ GLUON_GIT_REF := v2015.1 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key +GLUON_TARGETS ?= \ + ar71xx-generic \ + ar71xx-nand \ + mpc85xx-generic \ + x86-kvm_guest + GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) ifneq (,$(shell git describe --exact-match --tags 2>/dev/null)) GLUON_BRANCH := stable @@ -28,10 +34,10 @@ info: @echo build: gluon-prepare - ${GLUON_MAKE} GLUON_TARGET=ar71xx-generic - ${GLUON_MAKE} GLUON_TARGET=ar71xx-nand - ${GLUON_MAKE} GLUON_TARGET=mpc85xx-generic - ${GLUON_MAKE} GLUON_TARGET=x86-kvm_guest + for target in ${GLUON_TARGETS}; do \ + echo ""Building target $$target""; \ + ${GLUON_MAKE} GLUON_TARGET="$$target"; \ + done manifest: build ${GLUON_MAKE} manifest From 4e8f448b5ed78fed02ce048ce11c0c2dcfff96fa Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 16 May 2015 23:37:23 +0200 Subject: [PATCH 55/57] Makefile: Don't build for mpc85xx-generic by default The only supported router model, the TL-WDR4900, is very rare and expensive. --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 7bbfae5..f3ab844 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,6 @@ SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key GLUON_TARGETS ?= \ ar71xx-generic \ ar71xx-nand \ - mpc85xx-generic \ x86-kvm_guest GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) From 2832217b5c77ee525bfedff96aafe48c9cbf0c2a Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 17 May 2015 00:04:49 +0200 Subject: [PATCH 56/57] Add support for gluon i18n for en & de --- i18n/de.po | 41 +++++++++++++++++++++++++++++++++++++++++ i18n/en.po | 30 ++++++++++++++++++++++++++++++ site.conf | 32 -------------------------------- site.mk | 3 +++ 4 files changed, 74 insertions(+), 32 deletions(-) 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..95726e0 --- /dev/null +++ b/i18n/de.po @@ -0,0 +1,41 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: PACKAGE VERSION\n" +"PO-Revision-Date: 2015-05-16 19:31+0200\n" +"Last-Translator: Franz Pletz \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 Münchner " +"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen " +"entsprechend aus und sende es ab." + +msgid "gluon-config-mode:pubkey" +msgstr "" + +msgid "gluon-config-mode:reboot" +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 " +"alles geklappt hat, wirst du in ein paar Minuten unter " +"map.freifunk-muenchen.de " +"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 " +"Mode neustarten.

" +"

Wenn Du mehr über Freifunk in München erfahren möchtest, dann besuche " +"uns doch auf unserem monatlichen Treffen (siehe Webseite). Um mehr " +"auf die Entwicklung zu nehmen, hast Du als Knotenbetreiber " +"zusätzlich die Möglichkeit in unserem " +"Abstimmungs- und Dokumentationssystem " +"mitzumachen. Voraussetzung ist eine persönliche Anmeldung auf einem " +"der Treffen.

" +"

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..a8c1913 --- /dev/null +++ b/i18n/en.po @@ -0,0 +1,30 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: PACKAGE VERSION\n" +"PO-Revision-Date: 2015-05-16 19:31+0200\n" +"Last-Translator: Franz Pletz \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 Munich node. " +"Please fill out the following form and transmit it." + +msgid "gluon-config-mode:pubkey" +msgstr "" + +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 " +"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 " +"mode.

" +"

Have fun with your node and exploring the Freifunk network!

" diff --git a/site.conf b/site.conf index 190fbe0..6f0be69 100644 --- a/site.conf +++ b/site.conf @@ -155,37 +155,5 @@ limit_ingress = 12000, }, }, - - config_mode = { - msg_welcome = [[ - Willkommen zum Einrichtungsassistenten für deinen neuen Münchner - Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen - entsprechend aus und sende es ab. - ]], - msg_pubkey = [[ ]], - msg_reboot = [[ -

- 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 - alles geklappt hat, wirst du unter - map.freifunk-muenchen.de - deinen Knoten finden. -

-

- Wenn Du mehr über Freifunk in München erfahren möchtest, dann besuche - uns doch auf unserem monatlichen Treffen (siehe Webseite). Um mehr - Einfluss auf die Entwicklung zu nehmen, hast Du als Knotenbetreiber - zusätzlich die Möglichkeit in unserem - Abstimmungs- und Dokumentationssystem - mitzumachen. Voraussetzung ist eine persönliche Anmeldung auf einem - der Treffen. -

-

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

- ]], - }, } -- vim: set ft=lua:ts=2:sw=2:et diff --git a/site.mk b/site.mk index b7b1255..e3e819b 100644 --- a/site.mk +++ b/site.mk @@ -34,3 +34,6 @@ DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d') GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE) GLUON_PRIORITY ?= 0 + +# Languages to include +GLUON_LANGS ?= en de From 29303752782a094c7a523c6338d43504a1d87587 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 7 Jun 2015 02:52:49 +0200 Subject: [PATCH 57/57] Release v2015.4 --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c28e73..b86fccd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Freifunk München Firmware Changelog +## v2015.4 + - Updated to Gluon 2015.1 + - More supported architectures and router models are available, including x86 + - Setup Mode + - A new wifi configuration page is available to disable client and mesh + networks on 2.4 & 5GHz indiviually + - Mesh on WAN can now be configured and is enabled by default + - Internationalization for German and English is available and will + be autodetected depending on the browser setting + ## v2015.3 - Add 4 new gateways as placeholders (not all are and will be active immediately) - Integrated no_rebroadcast fix on mesh-vpn from Gluon Upstream