From e4a0e9c5eef418af520128829102c66869becd6e Mon Sep 17 00:00:00 2001 From: lephisto Date: Wed, 18 Mar 2015 15:15:32 +0100 Subject: [PATCH 1/4] Update site.mk --- 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 402f823c83ce8993074642fa99bac96fd80e4ac2 Mon Sep 17 00:00:00 2001 From: lephisto Date: Wed, 18 Mar 2015 15:20:24 +0100 Subject: [PATCH 2/4] Update site.conf RGB Net --- site.conf | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/site.conf b/site.conf index fcb2b38..1a98ce9 100644 --- a/site.conf +++ b/site.conf @@ -19,7 +19,7 @@ hostname_prefix = 'freifunk', site_name = 'Freifunk Regensburg', - site_code = 'ffrgb-bat14', + site_code = 'ffrgb-bat15', opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages', @@ -28,8 +28,8 @@ prefix6: IPv6 range of your community is also required for radvd ]] - prefix4 = '10.80.0.0/16', - prefix6 = 'fdef:ffc0:4fff::/64', + prefix4 = '10.90.0.0/16', + prefix6 = 'fdef:f00f:1337:cafe/64', --[[ NTP settings @@ -40,7 +40,7 @@ http://www.pool.ntp.org/zone/de ]] timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', - ntp_servers = {'1.ntp.services.ffm','3.ntp.services.ffm'}, + ntp_servers = {'1.ntp.services.ffrgb','3.ntp.services.ffrgb'}, --[[ Wireless settings regdom: IEEE 802.11 Regulatory Domain @@ -66,7 +66,7 @@ ssid = 'regensburg.freifunk.net', channel = 1, htmode = 'HT40+', - mesh_ssid = 'mesh.ffmuc', + mesh_ssid = 'mesh.ffrgb', mesh_bssid = '02:0E:8E:1E:61:17', --[[ from https://muenchen.freifunk.net/wiki/Knoten#B.A.T.M.A.N._Advanced ]] mesh_mcast_rate = 12000, }, @@ -75,7 +75,7 @@ ssid = 'regensburg.freifunk.net', channel = 44, htmode = 'HT40+', - mesh_ssid = 'mesh.ffmuc', + mesh_ssid = 'mesh.ffrgb', mesh_bssid = '02:0E:8E:1E:61:17', mesh_mcast_rate = 12000, }, @@ -91,9 +91,9 @@ (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', + ip4 = '10.90.0.1', + ip6 = 'fdef:f00f:1337:cafe::1', + mac = '16:41:95:40:f7:dd', }, @@ -122,13 +122,13 @@ backbone = { limit = 2, peers = { - vpn_gw01 = { --[[ VPN Server von Ole (netcap) ]] - key = '0ac59c349980993c99e74e1c5242c39cdd7282fbab0b9575b35762993df510f3', - remotes = {'ipv4 "37.120.168.150" port 10000'}, + vpn_gw01 = { --[[ VPN Server von Sven (hetzner) ]] + key = '58c2ac30c4693e8fde59c3794ac4c09748ec6a969e9688c42e144f5382e16e66', + remotes = {'ipv4 "78.47.168.108" port 10000'}, }, vpn_gw04 = { --[[ VPN Server von mephisto ]] key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5', - remotes = {'ipv4 "213.166.225.3" port 10000'}, + remotes = {'ipv4 "213.166.225.5" port 10000'}, }, }, }, @@ -150,7 +150,7 @@ autoupdater = { stable = { name = 'stable', mirrors = { - 'http://[fdef:ffc0:4fff::14]/firmware/stable/sysupgrade/', + 'http://[fdef:f00f:1337:cafe::11]/firmware/stable/sysupgrade/', }, probability = 0.08, good_signatures = 1, @@ -161,7 +161,7 @@ autoupdater = { experimental = { name = 'experimental', mirrors = { - 'http://[fdef:ffc0:4fff::14]/firmware/experimental/sysupgrade/', + 'http://[fdef:f00f:1337:cafe::11]/firmware/experimental/sysupgrade/', }, probability = 0.1, good_signatures = 1, @@ -218,7 +218,7 @@ 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, +er auf den Servern des Regensburger Freifunk-Projektes eingetragen wurde, kann sich dein Knoten mit dem Münchner Mesh-VPN verbinden. (Regensburg läuft derzeit im Münchener Mesh mit.)

From 4cde5c5bffdb5ae07340793735bb53cbbdb307fc Mon Sep 17 00:00:00 2001 From: lephisto Date: Wed, 18 Mar 2015 15:21:54 +0100 Subject: [PATCH 3/4] Update site.conf Keyformular entfernt --- site.conf | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/site.conf b/site.conf index 1a98ce9..556572d 100644 --- a/site.conf +++ b/site.conf @@ -216,29 +216,6 @@ 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 Regensburger Freifunk-Projektes eingetragen wurde, -kann sich dein Knoten mit dem Münchner Mesh-VPN verbinden. -(Regensburg läuft derzeit im Münchener Mesh mit.) -

- -

-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_reboot = [[

From 885ec54896bd83e7087e419e0f888902a3a80c27 Mon Sep 17 00:00:00 2001 From: Bastian Maeuser Date: Wed, 1 Apr 2015 17:09:20 +0200 Subject: [PATCH 4/4] stable transition --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 556572d..c51a5fc 100644 --- a/site.conf +++ b/site.conf @@ -40,7 +40,7 @@ http://www.pool.ntp.org/zone/de ]] timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', - ntp_servers = {'1.ntp.services.ffrgb','3.ntp.services.ffrgb'}, + ntp_servers = {'1.ntp.services.ffrgb','2.ntp.services.ffrgb'}, --[[ Wireless settings regdom: IEEE 802.11 Regulatory Domain