From 031a2892b286c6efbb16c981a9a5db0ffebc2af5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 14 Nov 2014 20:29:50 +0100 Subject: [PATCH 01/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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/21] 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', + }, + } + }, }, },