diff --git a/get_hood.sh b/get_hood.sh index 726dc4e..af7330d 100755 --- a/get_hood.sh +++ b/get_hood.sh @@ -1,12 +1,9 @@ -#!/bin/sh - +#!/bin/bash set -e lat=${1:-0.0} lon=${2:-0.0} -#echo $lat $lon - hood="$(./voronoi/test_voronoi.awk $lat $lon < voronoi/voronoi)" for poly in poly/*.poly; do if ./poly/test_poly.awk -- $lat $lon < "$poly"; then @@ -15,8 +12,6 @@ for poly in poly/*.poly; do fi done -#echo $hood - cat "hood/$hood.json" echo diff --git a/hood/Adelsdorf.json b/hood/Adelsdorf.json index 38607ff..06947d5 100644 --- a/hood/Adelsdorf.json +++ b/hood/Adelsdorf.json @@ -5,18 +5,20 @@ }, "vpn": [ { - "name": "fff-gw-fo2", + "name": "fff-rohan", "protocol": "fastd", - "address": "fff-gw-fo2.hyperweb.eu", - "port": "10005", - "key": "5208249ec618679ef419c91a95eb7782a587fa6f69a959e66f358b313d9f688c" + "address": "fff-rohan.hyperweb.eu", + "port": "10006", + "key": "5208249ec618679ef419c91a95eb7782a587fa6f69a959e66f358b313d9f688c", + "contact": "salzmagazin@michelaweb.eu" }, { - "name": "fff-gw-fo1", + "name": "fff-gondor", "protocol": "fastd", - "address": "fff-gw-fo1.hyperweb.eu", - "port": "10005", - "key": "e09c6ba719ee08e40d85af5858bb99e931d132f653b1f6ca5b6bef5b5eeb652d" + "address": "fff-gondor.hyperweb.eu", + "port": "10006", + "key": "e09c6ba719ee08e40d85af5858bb99e931d132f653b1f6ca5b6bef5b5eeb652d", + "contact": "salzmagazin@michelaweb.eu" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610450810" } } \ No newline at end of file diff --git a/hood/Arnstein.json b/hood/Arnstein.json index 2871ac7..5a875f5 100644 --- a/hood/Arnstein.json +++ b/hood/Arnstein.json @@ -9,7 +9,16 @@ "protocol": "fastd", "address": "159.69.117.239", "port": "10004", - "key": "002b9b94b254f769bc54000c5f27848bad04e1f5f282b77ba59f0b218bcaf5c4" + "key": "002b9b94b254f769bc54000c5f27848bad04e1f5f282b77ba59f0b218bcaf5c4", + "contact": "" + }, + { + "name": "nue2-gw6", + "protocol": "fastd", + "address": "fff-nue2-gw6.fff.community", + "port": "10021", + "key": "03c753e2c196b8a181ebb2373b73139580c7dae8f94ba811dee4001af2190734", + "contact": "freifunk@beibecks.de" } ], "hood": { @@ -27,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } } \ No newline at end of file diff --git a/hood/Aschaffenburg.json b/hood/Aschaffenburg.json index 82eda5f..1237f6f 100644 --- a/hood/Aschaffenburg.json +++ b/hood/Aschaffenburg.json @@ -7,16 +7,18 @@ { "name": "fff-wue2", "protocol": "fastd", - "address": "fff-wue2.mifritscher.de", + "address": "fff2.mifritscher.de", "port": "10007", - "key": "ab649477703e5a3a54e4bfb4a95ae7dc76cf6151c33cacee797c6e9a865ab659" + "key": "ab649477703e5a3a54e4bfb4a95ae7dc76cf6151c33cacee797c6e9a865ab659", + "contact": "fff[a.t]mifritscher[.]de" }, { "name": "fff-skp01", "protocol": "fastd", "address": "isdn.ff-ab.de", "port": "10004", - "key": "77ec8e7536c5b72137b7dd3a94c5f8f12dbc8c114f230f443a1256eb9ab56a7d" + "key": "77ec8e7536c5b72137b7dd3a94c5f8f12dbc8c114f230f443a1256eb9ab56a7d", + "contact": "" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596271957" } } \ No newline at end of file diff --git a/hood/Bad-Windsheim.json b/hood/Bad-Windsheim.json new file mode 100644 index 0000000..9d05a8a --- /dev/null +++ b/hood/Bad-Windsheim.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "network": { + "ula_prefix": "fd43:5602:29bd:d5:\/64" + }, + "vpn": [ + { + "name": "nue2-gw6", + "protocol": "fastd", + "address": "fff-nue2-gw6.fff.community", + "port": "10018", + "key": "005c33fda424832d735aa5bd094d7cae9c94b558c669d9a40ed8b3d86c500ee3", + "contact": "freifunk@beibecks.de" + }, + { + "name": "fff-nixxda", + "protocol": "fastd", + "address": "badwheim.fff.nixxda.net", + "port": "10015", + "key": "b3fcd894f142854e06abb35a136feebe2f294b6f49d33e25addb12db3d689781", + "contact": "fff@nixxda.net" + } + ], + "hood": { + "id": "74", + "name": "Bad-Windsheim", + "essid": "freifunk-badwindsheim", + "mesh_bssid": "", + "mesh_essid": "badwheim.mesh.fff", + "mesh_id": "badwheim.mesh.fff", + "protocol": "batman-adv-v15", + "channel2": "13", + "mode2": "ht20", + "mesh_type2": "802.11s", + "channel5": "40", + "mode5": "ht20", + "mesh_type5": "802.11s", + "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", + "ntp_ip": "fd43:5602:29bd:ffff::102", + "timestamp": "1610365141" + } +} \ No newline at end of file diff --git a/hood/BadHersfeld.json b/hood/BadHersfeld.json index 7f37e9f..bca9508 100644 --- a/hood/BadHersfeld.json +++ b/hood/BadHersfeld.json @@ -4,19 +4,13 @@ "ula_prefix": "fd43:5602:29bd:40:\/64" }, "vpn": [ - { - "name": "fff-gw-mc", - "protocol": "fastd", - "address": "fff-gw-mc.fff.community", - "port": "10016", - "key": "d3d27b6bdc161970a93bb900a8ba51cd0da0a5d80b301e3784f90e322d3d8423" - }, { "name": "fff-gw1-nixxda", "protocol": "fastd", "address": "hersfeld.fff.nixxda.net", "port": "10013", - "key": "aecde3f1f34f5b94c122cb28a1d289463c720151265c61b0f5bbd717ae03e596" + "key": "aecde3f1f34f5b94c122cb28a1d289463c720151265c61b0f5bbd717ae03e596", + "contact": "fff@nixxda.net" } ], "hood": { @@ -34,7 +28,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::102", + "timestamp": "1610365127" } } \ No newline at end of file diff --git a/hood/BadSteben.json b/hood/BadSteben.json index 8ab6cc9..e33f1f7 100644 --- a/hood/BadSteben.json +++ b/hood/BadSteben.json @@ -9,14 +9,16 @@ "protocol": "fastd", "address": "fff-naila-gw01.freifunk-naila.net", "port": "23427", - "key": "e19edd0e7933cd621679427687df8c775e5e25077916c14db7e74aaa398b9691" + "key": "e19edd0e7933cd621679427687df8c775e5e25077916c14db7e74aaa398b9691", + "contact": "mail@freifunk-naila.de" }, { "name": "fff-naila-gw02", "protocol": "fastd", "address": "fff-naila-gw02.freifunk-naila.net", "port": "23427", - "key": "e19edd0e7933cd621679427687df8c775e5e25077916c14db7e74aaa398b9691" + "key": "24b5f4712849d0e302e5a0da810eefd7575e0ff1a445c1b4ebef8a2a0deb6e28", + "contact": "mail@freifunk-naila.de" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } } \ No newline at end of file diff --git a/hood/Bamberg.json b/hood/Bamberg.json index a0e6db1..2c543cb 100644 --- a/hood/Bamberg.json +++ b/hood/Bamberg.json @@ -5,24 +5,26 @@ }, "vpn": [ { - "name": "fff-ba-gw1", + "name": "nue2-gw6", "protocol": "fastd", - "address": "fff-nue2-gw5.fff.community", - "port": "10004", - "key": "898cd608938eda8d5df9f0c20e89e44ad54ecdad79332c025c0d00e0b5107089" + "address": "fff-nue2-gw6.fff.community", + "port": "10019", + "key": "98000279f323a173ab45af0bcf5d6980f34d42ea15cad3310f929d6d65a02e09", + "contact": "freifunk@beibecks.de" }, { - "name": "fff-gw-mc", + "name": "fff-gw-geo", "protocol": "fastd", - "address": "fff-gw-mc.fff.community", - "port": "10008", - "key": "37f9138f847095c5e2b5c7e6eec751ae89ad40025b6a9a809425c39014c86d6d" + "address": "fff-gw-geo.freifunk-geo.de", + "port": "10007", + "key": "19b3cc5333f8c4ced332a2fc2ea828cc6807de8211d1d0cc174c2d19ccf315b0", + "contact": "freifunk-ba@funkolive.de" } ], "hood": { "id": "43", "name": "Bamberg", - "essid": "bamberg.freifunk", + "essid": "freifunk-ba.de", "mesh_bssid": "", "mesh_essid": "mesh.bbg.fff", "mesh_id": "mesh.bbg.fff", @@ -35,6 +37,6 @@ "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", "ntp_ip": "fd43:5602:29bd:ffff::42", - "timestamp": "1577226481" + "timestamp": "1636928967" } } \ No newline at end of file diff --git a/hood/Bayreuth.json b/hood/Bayreuth.json index 6cafbf9..d3da3ae 100644 --- a/hood/Bayreuth.json +++ b/hood/Bayreuth.json @@ -5,18 +5,20 @@ }, "vpn": [ { - "name": "SeBaBe", + "name": "nue2-gw6", "protocol": "fastd", - "address": "bayreuth.fff.beibecks.de", + "address": "fff-nue2-gw6.fff.community", "port": "10016", - "key": "d88ac6e4c11c4124f493d1002d8885ae1df9e758628c8501b05bcc8568aaeffb" + "key": "d88ac6e4c11c4124f493d1002d8885ae1df9e758628c8501b05bcc8568aaeffb", + "contact": "freifunk@beibecks.de" }, { - "name": "fff-adrian-gw1", + "name": "fff-adrian-gw2", "protocol": "fastd", - "address": "adrian-gw1.fff.jubt.org", - "port": "10035", - "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3" + "address": "gw2.fff.schmutzler.it", + "port": "12023", + "key": "b8cadd32b8ecce365913dc82d08113ce540bc3e9975a369d3c768fe69d353296", + "contact": "gw@freifunk.jubt.org" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227400" } } \ No newline at end of file diff --git a/hood/Breitendiel.json b/hood/Breitendiel.json index d7076ed..e318598 100644 --- a/hood/Breitendiel.json +++ b/hood/Breitendiel.json @@ -9,14 +9,16 @@ "protocol": "fastd", "address": "fff-gw-mil01.fff.community", "port": "10000", - "key": "aa6abffb0742ecb91c0272540689e8adfbe592f9e6d909d83ed304de8f257366" + "key": "aa6abffb0742ecb91c0272540689e8adfbe592f9e6d909d83ed304de8f257366", + "contact": "fff.konrad@gmx.net" }, { - "name": "fff-gw-fo2", + "name": "fff-rohan", "protocol": "fastd", - "address": "fff-gw-fo2.hyperweb.eu", - "port": "10009", - "key": "a5ce29c17a582b946c644110a0b89f1f2c4fa73c783ae6eb9c9c062ac188dcfc" + "address": "fff-rohan.hyperweb.eu", + "port": "10010", + "key": "a5ce29c17a582b946c644110a0b89f1f2c4fa73c783ae6eb9c9c062ac188dcfc", + "contact": "salzmagazin@michelaweb.eu" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577964061" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596281870" } } \ No newline at end of file diff --git a/hood/Chiemgau.json b/hood/Chiemgau.json index e7c9cc5..b594bbc 100644 --- a/hood/Chiemgau.json +++ b/hood/Chiemgau.json @@ -9,14 +9,16 @@ "protocol": "fastd", "address": "fff-nue2-gw4.fff.community", "port": "10001", - "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8" + "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8", + "contact": "as@lists.f3netze.de" }, { "name": "fff-hades", "protocol": "fastd", "address": "ds.hades.sgstbr.de", "port": "20012", - "key": "74129c6d7cb5ee7470097679cfeb7b46a66b9983b938cc782c6d70248148878c" + "key": "7b4ff2b1785dbe2ecd5d2723a34bc30ac376f5739f6b993f4bcfad1153b40fac", + "contact": "fabian+fff@blaese.de" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227483" } } \ No newline at end of file diff --git a/hood/Coburg.json b/hood/Coburg.json index 619ba2a..2f3518a 100644 --- a/hood/Coburg.json +++ b/hood/Coburg.json @@ -9,14 +9,13 @@ "protocol": "fastd", "address": "rl-fff1.fff.community", "port": "10004", - "key": "6eb03a04ad6e8e197fa39982b93e4112ac4cbfe52b0f13d3b70e402ace308ec8" + "key": "6eb03a04ad6e8e197fa39982b93e4112ac4cbfe52b0f13d3b70e402ace308ec8", + "contact": "rlanghammer@web.de" }, { - "name": "fff-gw-mc", - "protocol": "fastd", - "address": "fff-gw-mc.fff.community", - "port": "10005", - "key": "e926fffcd8710b3a1e2625c6e3bb7429d8a44ef1834c6416faeaae2356481556" + "name": "rl-fff1", + "protocol": "vxlan", + "address": "rl-fff1.fff.community" } ], "hood": { @@ -34,7 +33,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } -} \ No newline at end of file +} diff --git a/hood/Crailsheim.json b/hood/Crailsheim.json index 86260e3..8652c09 100644 --- a/hood/Crailsheim.json +++ b/hood/Crailsheim.json @@ -7,16 +7,18 @@ { "name": "fff-wue2", "protocol": "fastd", - "address": "fff-wue2.mifritscher.de", + "address": "fff2.mifritscher.de", "port": "10008", - "key": "ad755737db0269982e463914c641a68b585a30dd138a0c77484255cf25ae8b78" + "key": "ad755737db0269982e463914c641a68b585a30dd138a0c77484255cf25ae8b78", + "contact": "fff[a.t]mifritscher[.]de" }, { "name": "fff-cr-gw1", "protocol": "fastd", "address": "fff-gw-cr1.crailsheim.de", "port": "10051", - "key": "b9897484a02005c0e47a9bc07a473ffd414f83d620ee78be9faf6270018d10b2" + "key": "b9897484a02005c0e47a9bc07a473ffd414f83d620ee78be9faf6270018d10b2", + "contact": "" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } } \ No newline at end of file diff --git a/hood/Dinkelsbuehl.json b/hood/Dinkelsbuehl.json index 205bd13..8d6405b 100644 --- a/hood/Dinkelsbuehl.json +++ b/hood/Dinkelsbuehl.json @@ -5,18 +5,20 @@ }, "vpn": [ { - "name": "erl-1", + "name": "nue2-gw6", "protocol": "fastd", - "address": "dkb.fff.beibecks.de", + "address": "fff-nue2-gw6.fff.community", "port": "10005", - "key": "752e83acbd750213a3eecc9c787454be506a6539aa338e26d3e35deb46f72ca2" + "key": "752e83acbd750213a3eecc9c787454be506a6539aa338e26d3e35deb46f72ca2", + "contact": "freifunk@beibecks.de" }, { "name": "fff-gw1-nixxda", "protocol": "fastd", "address": "dkb.fff.nixxda.net", "port": "10005", - "key": "a865389d20767cded358082cb26e52d86e378400d2ad37aa815b5d2b3c08a851" + "key": "a865389d20767cded358082cb26e52d86e378400d2ad37aa815b5d2b3c08a851", + "contact": "fff@nixxda.net" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::102", + "timestamp": "1610364988" } } \ No newline at end of file diff --git a/hood/Ebermannstadt.json b/hood/Ebermannstadt.json index a9725bf..0ea790e 100644 --- a/hood/Ebermannstadt.json +++ b/hood/Ebermannstadt.json @@ -7,16 +7,18 @@ { "name": "fff-adrian-gw1", "protocol": "fastd", - "address": "adrian-gw1.fff.jubt.org", + "address": "gw1.fff.schmutzler.it", "port": "10028", - "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3" + "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3", + "contact": "gw@freifunk.jubt.org" }, { - "name": "fff-gw-fo1", + "name": "fff-gondor", "protocol": "fastd", - "address": "fff-gw-fo1.hyperweb.eu", - "port": "10008", - "key": "508ec52e3e5354d87119809555e4c7c1a70ab51531cf7898905ab21dd84dfaa9" + "address": "fff-gondor.hyperweb.eu", + "port": "10009", + "key": "508ec52e3e5354d87119809555e4c7c1a70ab51531cf7898905ab21dd84dfaa9", + "contact": "salzmagazin@michelaweb.eu" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227580" } } \ No newline at end of file diff --git a/hood/Ebern.json b/hood/Ebern.json index b13f9c6..1610a92 100644 --- a/hood/Ebern.json +++ b/hood/Ebern.json @@ -9,14 +9,13 @@ "protocol": "fastd", "address": "rl-fff1.fff.community", "port": "10003", - "key": "a58ff2aae73eaff03c74d7360630aff60d1ae997941e0fc7545d15127134f925" + "key": "a58ff2aae73eaff03c74d7360630aff60d1ae997941e0fc7545d15127134f925", + "contact": "rlanghammer@web.de" }, { - "name": "fff-gw-mc", - "protocol": "fastd", - "address": "fff-gw-mc.fff.community", - "port": "10019", - "key": "9130834a5399c9c981e5d82664f292c9d198004842423cc4c8af757d794aaaa2" + "name": "rl-fff1", + "protocol": "vxlan", + "address": "rl-fff1.fff.community" } ], "hood": { @@ -34,7 +33,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } -} \ No newline at end of file +} diff --git a/hood/Eckental.json b/hood/Eckental.json index fce2818..87b210b 100644 --- a/hood/Eckental.json +++ b/hood/Eckental.json @@ -5,18 +5,20 @@ }, "vpn": [ { - "name": "erl-1", + "name": "nue2-gw6", "protocol": "fastd", - "address": "eckent.fff.beibecks.de", + "address": "fff-nue2-gw6.fff.community", "port": "10010", - "key": "db61eebcbd3057669c6abb650187f97d137ba287ab1f48e4d2c8365cee09c13e" + "key": "db61eebcbd3057669c6abb650187f97d137ba287ab1f48e4d2c8365cee09c13e", + "contact": "freifunk@beibecks.de" }, { "name": "fff-nixxda", "protocol": "fastd", "address": "eckental.fff.nixxda.net", "port": "10011", - "key": "a8a8ecad372cf309a870a7396744c1d7c8c2f851352bbcd5a5406a59e484546a" + "key": "a8a8ecad372cf309a870a7396744c1d7c8c2f851352bbcd5a5406a59e484546a", + "contact": "fff@nixxda.net" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::102", + "timestamp": "1610365098" } } \ No newline at end of file diff --git a/hood/Erlangen-Innenstadt.json b/hood/Erlangen-Innenstadt.json index e11de2c..773770d 100644 --- a/hood/Erlangen-Innenstadt.json +++ b/hood/Erlangen-Innenstadt.json @@ -5,18 +5,20 @@ }, "vpn": [ { - "name": "erl-1", + "name": "nue2-gw6", "protocol": "fastd", - "address": "erl-poly.fff.beibecks.de", + "address": "fff-nue2-gw6.fff.community", "port": "10006", - "key": "8f1d8a21e765cc33fa063264d15daab7c0192612617607f76ac667a60db2fd21" + "key": "8f1d8a21e765cc33fa063264d15daab7c0192612617607f76ac667a60db2fd21", + "contact": "freifunk@beibecks.de" }, { "name": "fff-nixxda", "protocol": "fastd", "address": "er.fff.nixxda.net", "port": "10006", - "key": "3ee5fef3079f2fec080e265b998385ac277923137d1b44ab2e5d10b7fb653825" + "key": "3ee5fef3079f2fec080e265b998385ac277923137d1b44ab2e5d10b7fb653825", + "contact": "fff@nixxda.net" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::102", + "timestamp": "1610365004" } } \ No newline at end of file diff --git a/hood/Erlangen-Nord.json b/hood/Erlangen-Nord.json index 217e946..da390a4 100644 --- a/hood/Erlangen-Nord.json +++ b/hood/Erlangen-Nord.json @@ -5,18 +5,20 @@ }, "vpn": [ { - "name": "erl-1", + "name": "nue2-gw6", "protocol": "fastd", - "address": "erl-nord.fff.beibecks.de", + "address": "fff-nue2-gw6.fff.community", "port": "10008", - "key": "856397f1023fa37aec3cd2603f1b5e301ebd35880cf0efcd8051fb5842379f11" + "key": "856397f1023fa37aec3cd2603f1b5e301ebd35880cf0efcd8051fb5842379f11", + "contact": "freifunk@beibecks.de" }, { "name": "fff-nixxda", "protocol": "fastd", "address": "er-nord.fff.nixxda.net", "port": "10008", - "key": "3f748e812ce3c110b3643d2b377c077d31db704ceeda9499ad39edb5cd43e4ae" + "key": "3f748e812ce3c110b3643d2b377c077d31db704ceeda9499ad39edb5cd43e4ae", + "contact": "fff@nixxda.net" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::102", + "timestamp": "1610365036" } } \ No newline at end of file diff --git a/hood/Erlangen-Ost.json b/hood/Erlangen-Ost.json index 8d2875e..10838ec 100644 --- a/hood/Erlangen-Ost.json +++ b/hood/Erlangen-Ost.json @@ -5,18 +5,20 @@ }, "vpn": [ { - "name": "erl-1", + "name": "nue2-gw6", "protocol": "fastd", - "address": "erl-ost.fff.beibecks.de", + "address": "fff-nue2-gw6.fff.community", "port": "10009", - "key": "6551c840ee47751a9528b2ca0481620698faeef4bc2b5b45c7bf150a4320239f" + "key": "6551c840ee47751a9528b2ca0481620698faeef4bc2b5b45c7bf150a4320239f", + "contact": "freifunk@beibecks.de" }, { "name": "fff-nixxda", "protocol": "fastd", "address": "er-ost.fff.nixxda.net", "port": "10009", - "key": "867ec13a2c7ac1b51f5f15bab9958a29171d54d20fad76492f79e814817bf130" + "key": "867ec13a2c7ac1b51f5f15bab9958a29171d54d20fad76492f79e814817bf130", + "contact": "fff@nixxda.net" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::102", + "timestamp": "1610365086" } } \ No newline at end of file diff --git a/hood/Erlangen-West.json b/hood/Erlangen-West.json index 8ac3551..2440c3c 100644 --- a/hood/Erlangen-West.json +++ b/hood/Erlangen-West.json @@ -5,18 +5,20 @@ }, "vpn": [ { - "name": "erl-1", + "name": "nue2-gw6", "protocol": "fastd", - "address": "erl-west.fff.beibecks.de", + "address": "fff-nue2-gw6.fff.community", "port": "10007", - "key": "9cf8b996eb9b10d2503d5e830846767c2b005c823bf12c5bf860fde840e15d3b" + "key": "9cf8b996eb9b10d2503d5e830846767c2b005c823bf12c5bf860fde840e15d3b", + "contact": "freifunk@beibecks.de" }, { "name": "fff-nixxda", "protocol": "fastd", "address": "er-west.fff.nixxda.net", "port": "10007", - "key": "b5564d0090f51ee76288b05d9802f585025b918283948c4be5db75537e0452e3" + "key": "b5564d0090f51ee76288b05d9802f585025b918283948c4be5db75537e0452e3", + "contact": "fff@nixxda.net" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::102", + "timestamp": "1610365024" } } \ No newline at end of file diff --git a/hood/Fichtelberg.json b/hood/Fichtelberg.json index d66fdb0..a2d1be7 100644 --- a/hood/Fichtelberg.json +++ b/hood/Fichtelberg.json @@ -9,14 +9,16 @@ "protocol": "fastd", "address": "fff-nue2-gw4.fff.community", "port": "10002", - "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8" + "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8", + "contact": "as@lists.f3netze.de" }, { "name": "fff-adrian-gw1", "protocol": "fastd", - "address": "adrian-gw1.fff.jubt.org", + "address": "gw1.fff.schmutzler.it", "port": "10024", - "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3" + "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3", + "contact": "gw@freifunk.jubt.org" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227400" } } \ No newline at end of file diff --git a/hood/FichtelgebirgeFleckl.json b/hood/FichtelgebirgeFleckl.json index 8ed3676..2c1de64 100644 --- a/hood/FichtelgebirgeFleckl.json +++ b/hood/FichtelgebirgeFleckl.json @@ -9,14 +9,16 @@ "protocol": "fastd", "address": "fff-nue2-gw4.fff.community", "port": "10003", - "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8" + "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8", + "contact": "as@lists.f3netze.de" }, { "name": "fff-adrian-gw1", "protocol": "fastd", - "address": "adrian-gw1.fff.jubt.org", + "address": "gw1.fff.schmutzler.it", "port": "10022", - "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3" + "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3", + "contact": "gw@freifunk.jubt.org" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227400" } } \ No newline at end of file diff --git a/hood/FichtelgebirgeNeubau.json b/hood/FichtelgebirgeNeubau.json index daf97db..0cf2294 100644 --- a/hood/FichtelgebirgeNeubau.json +++ b/hood/FichtelgebirgeNeubau.json @@ -9,14 +9,16 @@ "protocol": "fastd", "address": "fff-nue2-gw4.fff.community", "port": "10004", - "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8" + "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8", + "contact": "as@lists.f3netze.de" }, { "name": "fff-adrian-gw1", "protocol": "fastd", - "address": "adrian-gw1.fff.jubt.org", + "address": "gw1.fff.schmutzler.it", "port": "10023", - "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3" + "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3", + "contact": "gw@freifunk.jubt.org" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227400" } } \ No newline at end of file diff --git a/hood/FichtelgebirgeNord.json b/hood/FichtelgebirgeNord.json index 78f3731..981bcef 100644 --- a/hood/FichtelgebirgeNord.json +++ b/hood/FichtelgebirgeNord.json @@ -9,14 +9,16 @@ "protocol": "fastd", "address": "fff-nue2-gw4.fff.community", "port": "10007", - "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8" + "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8", + "contact": "as@lists.f3netze.de" }, { "name": "fff-hof-gw3", "protocol": "fastd", "address": "5.9.67.125", "port": "10007", - "key": "5f1a58a667b1d52f8afbbc61ee8915cd36c342a9cf5b22ee98b9a5723e9a9f63" + "key": "5f1a58a667b1d52f8afbbc61ee8915cd36c342a9cf5b22ee98b9a5723e9a9f63", + "contact": "freifunk@bnhof.de" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227400" } } \ No newline at end of file diff --git a/hood/FichtelgebirgeOst.json b/hood/FichtelgebirgeOst.json index 8734bca..1c6b890 100644 --- a/hood/FichtelgebirgeOst.json +++ b/hood/FichtelgebirgeOst.json @@ -9,14 +9,16 @@ "protocol": "fastd", "address": "fff-nue2-gw4.fff.community", "port": "10005", - "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8" + "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8", + "contact": "as@lists.f3netze.de" }, { "name": "fff-hof-gw3", "protocol": "fastd", "address": "5.9.67.125", "port": "10005", - "key": "9dc33ac57ca8e643c7f9be722c4eb73dad4cf9042905497c8bb2d67955362ed8" + "key": "9dc33ac57ca8e643c7f9be722c4eb73dad4cf9042905497c8bb2d67955362ed8", + "contact": "freifunk@bnhof.de" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227400" } } \ No newline at end of file diff --git a/hood/FichtelgebirgeSued.json b/hood/FichtelgebirgeSued.json index cabbe70..cea3d99 100644 --- a/hood/FichtelgebirgeSued.json +++ b/hood/FichtelgebirgeSued.json @@ -9,14 +9,16 @@ "protocol": "fastd", "address": "fff-nue2-gw4.fff.community", "port": "10008", - "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8" + "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8", + "contact": "as@lists.f3netze.de" }, { "name": "fff-hof-gw3", "protocol": "fastd", "address": "5.9.67.125", "port": "10008", - "key": "12618361ed5c7b193f28f5b463444506533c2c48552aa7c4c4542365de6f41b0" + "key": "12618361ed5c7b193f28f5b463444506533c2c48552aa7c4c4542365de6f41b0", + "contact": "freifunk@bnhof.de" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227400" } } \ No newline at end of file diff --git a/hood/FichtelgebirgeWest.json b/hood/FichtelgebirgeWest.json index bffb820..e6d5cce 100644 --- a/hood/FichtelgebirgeWest.json +++ b/hood/FichtelgebirgeWest.json @@ -9,14 +9,16 @@ "protocol": "fastd", "address": "fff-nue2-gw4.fff.community", "port": "10006", - "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8" + "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8", + "contact": "as@lists.f3netze.de" }, { "name": "fff-hof-gw3", "protocol": "fastd", "address": "5.9.67.125", "port": "10006", - "key": "815ab8cccc98ae6671dfe4af0bc108062c8f6d8cbe03a8c1e9058737c0d35eeb" + "key": "815ab8cccc98ae6671dfe4af0bc108062c8f6d8cbe03a8c1e9058737c0d35eeb", + "contact": "freifunk@bnhof.de" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227400" } } \ No newline at end of file diff --git a/hood/Forchheim.json b/hood/Forchheim.json index af131db..445d590 100644 --- a/hood/Forchheim.json +++ b/hood/Forchheim.json @@ -5,18 +5,20 @@ }, "vpn": [ { - "name": "fff-gw-fo1", + "name": "fff-gondor", "protocol": "fastd", - "address": "fff-gw-fo1.hyperweb.eu", + "address": "fff-gondor.hyperweb.eu", "port": "10004", - "key": "970412b8d9be375efb9f7a5672e8bbf5c250ce28d7ce2d4dc64fb50de78c6f65" + "key": "970412b8d9be375efb9f7a5672e8bbf5c250ce28d7ce2d4dc64fb50de78c6f65", + "contact": "salzmagazin@michelaweb.eu" }, { - "name": "fff-gw-fo2", + "name": "fff-rohan", "protocol": "fastd", - "address": "fff-gw-fo2.hyperweb.eu", - "port": "10006", - "key": "dc96ea8c312bea93d9ea39154edb62c8d6c87849a8d5893803b7258bc463ff9e" + "address": "fff-rohan.hyperweb.eu", + "port": "10004", + "key": "dc96ea8c312bea93d9ea39154edb62c8d6c87849a8d5893803b7258bc463ff9e", + "contact": "salzmagazin@michelaweb.eu" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610450829" } } \ No newline at end of file diff --git a/hood/FraenkischeSchweizNord.json b/hood/FraenkischeSchweizNord.json index de7b121..72db2a6 100644 --- a/hood/FraenkischeSchweizNord.json +++ b/hood/FraenkischeSchweizNord.json @@ -7,16 +7,18 @@ { "name": "fff-adrian-gw1", "protocol": "fastd", - "address": "adrian-gw1.fff.jubt.org", + "address": "gw1.fff.schmutzler.it", "port": "10030", - "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3" + "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3", + "contact": "gw@freifunk.jubt.org" }, { - "name": "SeBaBe", + "name": "nue2-gw6", "protocol": "fastd", - "address": "frschwnord.fff.beibecks.de", + "address": "fff-nue2-gw6.fff.community", "port": "10013", - "key": "c49512b33986260b6ebdd413541c67b7db238222a7c57960bb57819b04000d67" + "key": "c49512b33986260b6ebdd413541c67b7db238222a7c57960bb57819b04000d67", + "contact": "freifunk@beibecks.de" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227580" } } \ No newline at end of file diff --git a/hood/FraenkischeSchweizOst.json b/hood/FraenkischeSchweizOst.json index a7f6b4b..8946773 100644 --- a/hood/FraenkischeSchweizOst.json +++ b/hood/FraenkischeSchweizOst.json @@ -5,18 +5,20 @@ }, "vpn": [ { - "name": "SeBaBe", + "name": "nue2-gw6", "protocol": "fastd", - "address": "frschwost.fff.beibecks.de", + "address": "fff-nue2-gw6.fff.community", "port": "10014", - "key": "7fcfd3f87b276288a0f0993aa5db107f54d60cc7af7fe2304ea17b587c245ae5" + "key": "7fcfd3f87b276288a0f0993aa5db107f54d60cc7af7fe2304ea17b587c245ae5", + "contact": "freifunk@beibecks.de" }, { "name": "fff-adrian-gw1", "protocol": "fastd", - "address": "adrian-gw1.fff.jubt.org", + "address": "gw1.fff.schmutzler.it", "port": "10021", - "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3" + "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3", + "contact": "gw@freifunk.jubt.org" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227400" } } \ No newline at end of file diff --git a/hood/FraenkischeSchweizSued.json b/hood/FraenkischeSchweizSued.json index 12ad69b..c373036 100644 --- a/hood/FraenkischeSchweizSued.json +++ b/hood/FraenkischeSchweizSued.json @@ -7,16 +7,18 @@ { "name": "fff-adrian-gw1", "protocol": "fastd", - "address": "adrian-gw1.fff.jubt.org", + "address": "gw1.fff.schmutzler.it", "port": "10029", - "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3" + "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3", + "contact": "gw@freifunk.jubt.org" }, { - "name": "fff-gw-fo2", + "name": "fff-rohan", "protocol": "fastd", - "address": "fff-gw-fo2.hyperweb.eu", - "port": "10008", - "key": "9fe553ceadab95c40232fa28274533021d18eaf84bd4e9051aac5e2df55fe4c1" + "address": "fff-rohan.hyperweb.eu", + "port": "10009", + "key": "9fe553ceadab95c40232fa28274533021d18eaf84bd4e9051aac5e2df55fe4c1", + "contact": "salzmagazin@michelaweb.eu" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227580" } } \ No newline at end of file diff --git a/hood/Frankenwald.json b/hood/Frankenwald.json index 11b9500..89b267d 100644 --- a/hood/Frankenwald.json +++ b/hood/Frankenwald.json @@ -7,16 +7,18 @@ { "name": "fff-adrian-gw1", "protocol": "fastd", - "address": "adrian-gw1.fff.jubt.org", + "address": "gw1.fff.schmutzler.it", "port": "10027", - "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3" + "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3", + "contact": "gw@freifunk.jubt.org" }, { "name": "fff-hof-gw3", "protocol": "fastd", "address": "5.9.67.125", "port": "10010", - "key": "2b2b2bbb8899c09c7665df34de2146a4d5545c2c20cc9ca5587ffa12a9783770" + "key": "2b2b2bbb8899c09c7665df34de2146a4d5545c2c20cc9ca5587ffa12a9783770", + "contact": "freifunk@bnhof.de" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227580" } } \ No newline at end of file diff --git a/hood/Fuerth.json b/hood/Fuerth.json index cb60445..ff327d2 100644 --- a/hood/Fuerth.json +++ b/hood/Fuerth.json @@ -5,18 +5,20 @@ }, "vpn": [ { - "name": "fff-uranus", + "name": "nue2-gw6", "protocol": "fastd", - "address": "fff-uranus.cdresel.de", - "port": "10000", - "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8" + "address": "fff-nue2-gw6.fff.community", + "port": "10017", + "key": "06d224721686cc5eb4af616feb7512d204d45311fbcb7e0c3ac7799fa99eedd6", + "contact": "freifunk@beibecks.de" }, { - "name": "fff-gw-mc", + "name": "fff-nixxda", "protocol": "fastd", - "address": "fff-gw-mc.fff.community", - "port": "10017", - "key": "27f6691353fd2262767067661e70ca85914de02f50cf42661ff10b25b85c5f28" + "address": "fuerth.fff.nixxda.net", + "port": "10014", + "key": "c881e87913ee11453678e08a08e58febafd0c7459fe57754f48ff2c965e78781", + "contact": "fff@nixxda.net" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::102", + "timestamp": "1610364709" } } \ No newline at end of file diff --git a/hood/Gerolzhofen.json b/hood/Gerolzhofen.json index bd2a296..d0304a4 100644 --- a/hood/Gerolzhofen.json +++ b/hood/Gerolzhofen.json @@ -9,14 +9,21 @@ "protocol": "fastd", "address": "fff-gw-geo.freifunk-geo.de", "port": "10001", - "key": "80e43fc91a53d41f1cb304bca9d6b28bd6f8eea2779d576c379053499b075ac5" + "key": "80e43fc91a53d41f1cb304bca9d6b28bd6f8eea2779d576c379053499b075ac5", + "contact": "freifunk-geo@funkolive.de" }, { "name": "rl-fff1", "protocol": "fastd", "address": "rl-fff1.fff.community", "port": "10005", - "key": "9aa3592b23b3056d41dcca2d14c0b9781344cd3eed4a7e7a01e192eddb46933a" + "key": "9aa3592b23b3056d41dcca2d14c0b9781344cd3eed4a7e7a01e192eddb46933a", + "contact": "rlanghammer@web.de" + }, + { + "name": "rl-fff1", + "protocol": "vxlan", + "address": "rl-fff1.fff.community" } ], "hood": { @@ -34,7 +41,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } -} \ No newline at end of file +} diff --git a/hood/Hassfurt.json b/hood/Hassfurt.json index 31917f6..d29c5cd 100644 --- a/hood/Hassfurt.json +++ b/hood/Hassfurt.json @@ -9,14 +9,21 @@ "protocol": "fastd", "address": "fff-gw-moexe.freifunk-hassberge.de", "port": "10004", - "key": "a6ad97c7ea6c05c34835c94d58f079c8a5636678eb42e76907bdeba4b0046e6e" + "key": "a6ad97c7ea6c05c34835c94d58f079c8a5636678eb42e76907bdeba4b0046e6e", + "contact": "" }, { "name": "rl-fff1", "protocol": "fastd", "address": "rl-fff1.fff.community", "port": "10002", - "key": "a58ff2aae73eaff03c74d7360630aff60d1ae997941e0fc7545d15127134f925" + "key": "a58ff2aae73eaff03c74d7360630aff60d1ae997941e0fc7545d15127134f925", + "contact": "rlanghammer@web.de" + }, + { + "name": "rl-fff1", + "protocol": "vxlan", + "address": "rl-fff1.fff.community" } ], "hood": { @@ -34,7 +41,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } -} \ No newline at end of file +} diff --git a/hood/HassfurtStadt.json b/hood/HassfurtStadt.json index 5049b86..7f2b9a2 100644 --- a/hood/HassfurtStadt.json +++ b/hood/HassfurtStadt.json @@ -9,7 +9,8 @@ "protocol": "fastd", "address": "fff-gw-moexe.freifunk-hassberge.de", "port": "10003", - "key": "a6ad97c7ea6c05c34835c94d58f079c8a5636678eb42e76907bdeba4b0046e6e" + "key": "a6ad97c7ea6c05c34835c94d58f079c8a5636678eb42e76907bdeba4b0046e6e", + "contact": "" } ], "hood": { @@ -27,7 +28,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } } \ No newline at end of file diff --git a/hood/Helmbrechts.json b/hood/Helmbrechts.json index d26b84e..b00861b 100644 --- a/hood/Helmbrechts.json +++ b/hood/Helmbrechts.json @@ -9,7 +9,8 @@ "protocol": "fastd", "address": "5.9.67.125", "port": "10016", - "key": "eb7a57380c1e1f0ef86096d85e0d2955c76171e9b885963a0e8c77f5b1bbe747" + "key": "eb7a57380c1e1f0ef86096d85e0d2955c76171e9b885963a0e8c77f5b1bbe747", + "contact": "freifunk@bnhof.de" } ], "hood": { @@ -27,7 +28,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } } \ No newline at end of file diff --git a/hood/Hoechstadt.json b/hood/Hoechstadt.json index 3ba4238..0993407 100644 --- a/hood/Hoechstadt.json +++ b/hood/Hoechstadt.json @@ -5,18 +5,20 @@ }, "vpn": [ { - "name": "fff-gw-fo1", + "name": "fff-gondor", "protocol": "fastd", - "address": "fff-gw-fo1.hyperweb.eu", - "port": "10007", - "key": "76f16c8e359b11d6d3b7595334de0abe4c43d858a0c4dce8a92f8a44f71fcffb" + "address": "fff-gondor.hyperweb.eu", + "port": "10008", + "key": "76f16c8e359b11d6d3b7595334de0abe4c43d858a0c4dce8a92f8a44f71fcffb", + "contact": "salzmagazin@michelaweb.eu" }, { - "name": "fff-gw-fo2", + "name": "fff-rohan", "protocol": "fastd", - "address": "fff-gw-fo2.hyperweb.eu", - "port": "10004", - "key": "ebf479bd36090a9f822edb94ca78b74ee6068b754a72f23839038439bb4628d3" + "address": "fff-rohan.hyperweb.eu", + "port": "10008", + "key": "ebf479bd36090a9f822edb94ca78b74ee6068b754a72f23839038439bb4628d3", + "contact": "salzmagazin@michelaweb.eu" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610450851" } } \ No newline at end of file diff --git a/hood/Hof.json b/hood/Hof.json index 57a5046..e423f5b 100644 --- a/hood/Hof.json +++ b/hood/Hof.json @@ -9,14 +9,16 @@ "protocol": "fastd", "address": "5.9.67.125", "port": "10004", - "key": "9c81cd47adfa8dd5910a9804ce259cabe098e6e52d053d4dd4e7d1cf3b8e768a" + "key": "9c81cd47adfa8dd5910a9804ce259cabe098e6e52d053d4dd4e7d1cf3b8e768a", + "contact": "freifunk@bnhof.de" }, { "name": "fff-adrian-gw1", "protocol": "fastd", - "address": "adrian-gw1.fff.jubt.org", + "address": "gw1.fff.schmutzler.it", "port": "10025", - "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3" + "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3", + "contact": "gw@freifunk.jubt.org" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::10", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227400" } } \ No newline at end of file diff --git a/hood/Hofheim.json b/hood/Hofheim.json index 24ea536..f85ee3f 100644 --- a/hood/Hofheim.json +++ b/hood/Hofheim.json @@ -5,18 +5,12 @@ }, "vpn": [ { - "name": "has2-v2", + "name": "fff-nixxda", "protocol": "fastd", - "address": "gutzeit.xyz", - "port": "10001", - "key": "099e7b2cbc07fe9844a78e25c86525340707937b799a6a70b0195ea2698a37c9" - }, - { - "name": "fff-gw-mc", - "protocol": "fastd", - "address": "fff-gw-mc.fff.community", - "port": "10004", - "key": "4e9bec8994a038c74d1294463c87e152161963302aedc066e1093fb537a3556a" + "address": "hofheim.fff.nixxda.net", + "port": "10000", + "key": "e97de5acd15691a3f18c433b7e89543dedf06fa8e36d43ef01388e1c4ebbe13e", + "contact": "fff@nixxda.net" } ], "hood": { @@ -34,7 +28,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::102", + "timestamp": "1610364851" } } \ No newline at end of file diff --git a/hood/HofheimStadt.json b/hood/HofheimStadt.json index f60eb9e..6b526e0 100644 --- a/hood/HofheimStadt.json +++ b/hood/HofheimStadt.json @@ -5,18 +5,12 @@ }, "vpn": [ { - "name": "fff-gw-mc", + "name": "fff-nixxda", "protocol": "fastd", - "address": "fff-gw-mc.fff.community", - "port": "10006", - "key": "356e9559b29982499fb9a7404732247c084d326731e67dc3fbf5c38fba988a75" - }, - { - "name": "fff-has2-v2", - "protocol": "fastd", - "address": "fff-has2-v2.freifunk-hassberge.de", - "port": "10004", - "key": "05147c32842d6377f85e467d613a42d859bb6a90c10948f71318c04c4d3cd1ec" + "address": "hofheim-stadt.fff.nixxda.net", + "port": "10001", + "key": "3b27dcc5bdfc73daa26fecea9fc947225ee342527ec9f43f7fbd3bb50e60aa75", + "contact": "fff@nixxda.net" } ], "hood": { @@ -34,7 +28,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::102", + "timestamp": "1610364971" } } \ No newline at end of file diff --git a/hood/Konradsreuth.json b/hood/Konradsreuth.json index 7541057..dd628a0 100644 --- a/hood/Konradsreuth.json +++ b/hood/Konradsreuth.json @@ -9,7 +9,8 @@ "protocol": "fastd", "address": "5.9.67.125", "port": "10017", - "key": "a893a6f88fce5acd2602b6705978fa32dbe0d8892ff91acbae47188fdf67386c" + "key": "a893a6f88fce5acd2602b6705978fa32dbe0d8892ff91acbae47188fdf67386c", + "contact": "freifunk@bnhof.de" } ], "hood": { @@ -27,7 +28,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } } \ No newline at end of file diff --git a/hood/Lauf.json b/hood/Lauf.json index 3c87639..0490f1f 100644 --- a/hood/Lauf.json +++ b/hood/Lauf.json @@ -5,18 +5,20 @@ }, "vpn": [ { - "name": "erl-1", + "name": "nue2-gw6", "protocol": "fastd", - "address": "lauf.fff.beibecks.de", + "address": "fff-nue2-gw6.fff.community", "port": "10012", - "key": "bb190322881bbec4a90acb7172efd0781c71cc7adb51a04f5d06efa0255d71e0" + "key": "bb190322881bbec4a90acb7172efd0781c71cc7adb51a04f5d06efa0255d71e0", + "contact": "freifunk@beibecks.de" }, { "name": "fff-nixxda", "protocol": "fastd", "address": "lauf.fff.nixxda.net", "port": "10010", - "key": "76ec26f16b25d04060787b50d57fa4d5fc5128dddae01c70a7d86a0eb3b21119" + "key": "76ec26f16b25d04060787b50d57fa4d5fc5128dddae01c70a7d86a0eb3b21119", + "contact": "fff@nixxda.net" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::102", + "timestamp": "1610364951" } } \ No newline at end of file diff --git a/hood/Leupoldsgruen.json b/hood/Leupoldsgruen.json index 567879d..655f565 100644 --- a/hood/Leupoldsgruen.json +++ b/hood/Leupoldsgruen.json @@ -9,7 +9,8 @@ "protocol": "fastd", "address": "5.9.67.125", "port": "10014", - "key": "112f15829f26a8af5956847253ec05f1e461d1eaeb37bf6a666aaaaf742d8865" + "key": "112f15829f26a8af5956847253ec05f1e461d1eaeb37bf6a666aaaaf742d8865", + "contact": "freifunk@bnhof.de" } ], "hood": { @@ -27,7 +28,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } } \ No newline at end of file diff --git a/hood/Lichtenberg.json b/hood/Lichtenberg.json index e798553..5c0f182 100644 --- a/hood/Lichtenberg.json +++ b/hood/Lichtenberg.json @@ -9,14 +9,16 @@ "protocol": "fastd", "address": "fff-naila-gw01.freifunk-naila.net", "port": "23426", - "key": "7defb5b15a853ccc856b66e1c1751bc670591e1af0174f04d5c2d3604c0395e7" + "key": "7defb5b15a853ccc856b66e1c1751bc670591e1af0174f04d5c2d3604c0395e7", + "contact": "mail@freifunk-naila.de" }, { "name": "fff-naila-gw02", "protocol": "fastd", "address": "fff-naila-gw02.freifunk-naila.net", "port": "23426", - "key": "7defb5b15a853ccc856b66e1c1751bc670591e1af0174f04d5c2d3604c0395e7" + "key": "9148c8cf19bb90ef1272eaab7e4ae4e8c417e77d6f5b06e595f279a1dded6679", + "contact": "mail@freifunk-naila.de" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } } \ No newline at end of file diff --git a/hood/Lichtenfels.json b/hood/Lichtenfels.json index 5b69500..9001842 100644 --- a/hood/Lichtenfels.json +++ b/hood/Lichtenfels.json @@ -9,14 +9,16 @@ "protocol": "fastd", "address": "fff-gw-geo.freifunk-geo.de", "port": "10002", - "key": "3645d8e0560bb28267fe900501f4b0b46825c856383d963eb7e588df6da780ef" + "key": "3645d8e0560bb28267fe900501f4b0b46825c856383d963eb7e588df6da780ef", + "contact": "freifunk-lif@funkolive.de" }, { - "name": "fff-gw-mc", + "name": "nue2-gw6", "protocol": "fastd", - "address": "fff-gw-mc.fff.community", - "port": "10007", - "key": "3a55b65d0d708b5d183ec9463a037adfb308a45549b70f863086cc91a10bebcd" + "address": "fff-nue2-gw6.fff.community", + "port": "10020", + "key": "79e45bf816050b9c047c83e3376b8bfc8942431b1d15206b5d833c8734023296", + "contact": "freifunk@beibecks.de" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } } \ No newline at end of file diff --git a/hood/Marktredwitz.json b/hood/Marktredwitz.json index 5f077e5..86dbd5a 100644 --- a/hood/Marktredwitz.json +++ b/hood/Marktredwitz.json @@ -7,9 +7,10 @@ { "name": "fff-adrian-gw1", "protocol": "fastd", - "address": "adrian-gw1.fff.jubt.org", + "address": "gw1.fff.schmutzler.it", "port": "10031", - "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3" + "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3", + "contact": "gw@freifunk.jubt.org" } ], "hood": { @@ -27,7 +28,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227580" } } \ No newline at end of file diff --git a/hood/Miltenberg.json b/hood/Miltenberg.json index 810271a..183fb7b 100644 --- a/hood/Miltenberg.json +++ b/hood/Miltenberg.json @@ -4,19 +4,13 @@ "ula_prefix": "fd43:5602:29bd:61:\/64" }, "vpn": [ - { - "name": "fff-gw-mc", - "protocol": "fastd", - "address": "fff-gw-mc.fff.community", - "port": "10014", - "key": "813e718efeffacf1dcb7f73991066d102731f8d9315336dc7526646a47e18d45" - }, { "name": "fff-skp01", "protocol": "fastd", "address": "fff-skp01.fff.community", "port": "10005", - "key": "e3e1743f87b01572d4e8ed10b48a053f2798f520183fce5d9d65a8ffcfd91f34" + "key": "e3e1743f87b01572d4e8ed10b48a053f2798f520183fce5d9d65a8ffcfd91f34", + "contact": "" } ], "hood": { @@ -34,7 +28,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596271976" } } \ No newline at end of file diff --git a/hood/Mosbach.json b/hood/Mosbach.json index fc76d22..c5476c0 100644 --- a/hood/Mosbach.json +++ b/hood/Mosbach.json @@ -4,19 +4,13 @@ "ula_prefix": "fd43:5602:29bd:b6:\/64" }, "vpn": [ - { - "name": "fff-gw-mc", - "protocol": "fastd", - "address": "fff-gw-mc.fff.community", - "port": "10011", - "key": "2494fa7f53e9d92181d7769aedc77836d5630db2f4a9cc6617a4fc631feff34c" - }, { "name": "fff-gw-geo", "protocol": "fastd", "address": "fff-gw-geo.freifunk-geo.de", "port": "10004", - "key": "c8655cc913fb001793350fe19f9cb52ad63f952fb573cbcafcceb029bfc0ecf1" + "key": "c8655cc913fb001793350fe19f9cb52ad63f952fb573cbcafcceb029bfc0ecf1", + "contact": "freifunk-mos@funkolive.de" } ], "hood": { @@ -34,7 +28,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1624994350" } } \ No newline at end of file diff --git a/hood/Muenchberg.json b/hood/Muenchberg.json index 37496f2..463c58a 100644 --- a/hood/Muenchberg.json +++ b/hood/Muenchberg.json @@ -5,18 +5,20 @@ }, "vpn": [ { - "name": "fff-adrian-gw1", + "name": "fff-adrian-gw2", "protocol": "fastd", - "address": "adrian-gw1.fff.jubt.org", - "port": "10034", - "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3" + "address": "gw2.fff.schmutzler.it", + "port": "12022", + "key": "1098bb09f7ad2ee1f84c9b0eac756a0b22e74186592ba48cee5cd3998e721f86", + "contact": "gw@freifunk.jubt.org" }, { "name": "fff-hof-gw3", "protocol": "fastd", "address": "5.9.67.125", "port": "10011", - "key": "ca04f6313da5cf2cdf79c24ea01b50a0b61eca3cfa56b38cc0d41e1748ea6bac" + "key": "ca04f6313da5cf2cdf79c24ea01b50a0b61eca3cfa56b38cc0d41e1748ea6bac", + "contact": "freifunk@bnhof.de" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227580" } } \ No newline at end of file diff --git a/hood/Naila.json b/hood/Naila.json index 9daa485..752fdb9 100644 --- a/hood/Naila.json +++ b/hood/Naila.json @@ -9,14 +9,24 @@ "protocol": "fastd", "address": "5.9.67.125", "port": "10009", - "key": "ab8e7f4993af98a826bdd99b22440ae554f0e880191631b54e73037022bd2f95" + "key": "ab8e7f4993af98a826bdd99b22440ae554f0e880191631b54e73037022bd2f95", + "contact": "freifunk@bnhof.de" }, { "name": "fff-naila-gw01", "protocol": "fastd", "address": "fff-naila-gw01.freifunk-naila.net", "port": "23425", - "key": "5a7ee600e1e370e6131423b2f7cdfddf53ae377bd25927781dbc077230e9d758" + "key": "5a7ee600e1e370e6131423b2f7cdfddf53ae377bd25927781dbc077230e9d758", + "contact": "mail@freifunk-naila.de" + }, + { + "name": "fff-naila-gw02", + "protocol": "fastd", + "address": "fff-naila-gw02.freifunk-naila.net", + "port": "23425", + "key": "99eb7ce8d0b69f85a68677d8d55310d46c7d1617afaa458d7a50e540499d1415", + "contact": "mail@freifunk-naila.de" } ], "hood": { @@ -34,7 +44,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } } \ No newline at end of file diff --git a/hood/Nürnberg-Innenstadt.json b/hood/Nürnberg-Innenstadt.json new file mode 100644 index 0000000..94c480f --- /dev/null +++ b/hood/Nürnberg-Innenstadt.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "network": { + "ula_prefix": "fd43:5602:29bd:e6:\/64" + }, + "vpn": [ + { + "name": "fff-hades", + "protocol": "fastd", + "address": "ds.hades.sgstbr.de", + "port": "20015", + "key": "7b4ff2b1785dbe2ecd5d2723a34bc30ac376f5739f6b993f4bcfad1153b40fac", + "contact": "fabian+fff@blaese.de" + }, + { + "name": "fff-gw-dc-01", + "protocol": "fastd", + "address": "nbg.ff.meskalero.de", + "port": "10001", + "key": "ed059275d6386c05713474cef46acd0de94cc5af8c4e69027d651bffe05bcb2d", + "contact": "tk@meskal.net" + } + ], + "hood": { + "id": "70", + "name": "N\u00fcrnberg-Innenstadt", + "essid": "freifunk-nuernberg.de#innenstadt", + "mesh_bssid": "", + "mesh_essid": "mesh.nue-innenstadt.fff", + "mesh_id": "mesh.nue-innenstadt.fff", + "protocol": "batman-adv-v15", + "channel2": "13", + "mode2": "ht20", + "mesh_type2": "802.11s", + "channel5": "40", + "mode5": "ht20", + "mesh_type5": "802.11s", + "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" + } +} \ No newline at end of file diff --git a/hood/Nürnberg-Umland.json b/hood/Nürnberg-Umland.json new file mode 100644 index 0000000..663dfe2 --- /dev/null +++ b/hood/Nürnberg-Umland.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "network": { + "ula_prefix": "fd43:5602:29bd:3:\/64" + }, + "vpn": [ + { + "name": "fff-gw-dc-01", + "protocol": "fastd", + "address": "nbg.ff.meskalero.de", + "port": "10000", + "key": "ed059275d6386c05713474cef46acd0de94cc5af8c4e69027d651bffe05bcb2d", + "contact": "tk@meskal.net" + }, + { + "name": "fff-hades", + "protocol": "fastd", + "address": "ds.hades.sgstbr.de", + "port": "20010", + "key": "7b4ff2b1785dbe2ecd5d2723a34bc30ac376f5739f6b993f4bcfad1153b40fac", + "contact": "fabian+fff@blaese.de" + } + ], + "hood": { + "id": "1", + "name": "N\u00fcrnberg-Umland", + "essid": "freifunk-nuernberg.de#umland", + "mesh_bssid": "", + "mesh_essid": "mesh.nue-umland.fff", + "mesh_id": "mesh.nue-umland.fff", + "protocol": "batman-adv-v15", + "channel2": "13", + "mode2": "ht20", + "mesh_type2": "802.11s", + "channel5": "40", + "mode5": "ht20", + "mesh_type5": "802.11s", + "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1584403464" + } +} \ No newline at end of file diff --git a/hood/Nürnberg.json b/hood/Nürnberg.json new file mode 100644 index 0000000..493d23d --- /dev/null +++ b/hood/Nürnberg.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "network": { + "ula_prefix": "fd43:5602:29bd:e5:\/64" + }, + "vpn": [ + { + "name": "fff-hades", + "protocol": "fastd", + "address": "ds.hades.sgstbr.de", + "port": "20014", + "key": "7b4ff2b1785dbe2ecd5d2723a34bc30ac376f5739f6b993f4bcfad1153b40fac", + "contact": "fabian+fff@blaese.de" + }, + { + "name": "fff-gw-dc-01", + "protocol": "fastd", + "address": "nbg.ff.meskalero.de", + "port": "10002", + "key": "ed059275d6386c05713474cef46acd0de94cc5af8c4e69027d651bffe05bcb2d", + "contact": "tk@meskal.net" + } + ], + "hood": { + "id": "71", + "name": "N\u00fcrnberg", + "essid": "freifunk-nuernberg.de#stadt", + "mesh_bssid": "", + "mesh_essid": "mesh.nue.fff", + "mesh_id": "mesh.nue.fff", + "protocol": "batman-adv-v15", + "channel2": "13", + "mode2": "ht20", + "mesh_type2": "802.11s", + "channel5": "40", + "mode5": "ht20", + "mesh_type5": "802.11s", + "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" + } +} \ No newline at end of file diff --git a/hood/Pegnitz.json b/hood/Pegnitz.json index c32bb2d..e50774b 100644 --- a/hood/Pegnitz.json +++ b/hood/Pegnitz.json @@ -7,16 +7,18 @@ { "name": "fff-adrian-gw1", "protocol": "fastd", - "address": "adrian-gw1.fff.jubt.org", + "address": "gw1.fff.schmutzler.it", "port": "10026", - "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3" + "key": "c64ba4c0534983a0e0ef5aea6b005c80f34f1219013168e06d3e2b70397113d3", + "contact": "gw@freifunk.jubt.org" }, { - "name": "SeBaBe", + "name": "nue2-gw6", "protocol": "fastd", - "address": "pegnitz.fff.beibecks.de", + "address": "fff-nue2-gw6.fff.community", "port": "10015", - "key": "b9f685fed12c5a8c5a947e4d46b06103ab01e2657467f455ff3b8401d0a09848" + "key": "b9f685fed12c5a8c5a947e4d46b06103ab01e2657467f455ff3b8401d0a09848", + "contact": "freifunk@beibecks.de" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227400" } } \ No newline at end of file diff --git a/hood/Rehau.json b/hood/Rehau.json index 3aabd10..3bd69c8 100644 --- a/hood/Rehau.json +++ b/hood/Rehau.json @@ -9,7 +9,8 @@ "protocol": "fastd", "address": "5.9.67.125", "port": "10013", - "key": "6358443c63ba0c40aaaef8648da49e6afb2ae739377624a7b9f751c22abf137d" + "key": "6358443c63ba0c40aaaef8648da49e6afb2ae739377624a7b9f751c22abf137d", + "contact": "freifunk@bnhof.de" } ], "hood": { @@ -27,7 +28,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } } \ No newline at end of file diff --git a/hood/Remscheid.json b/hood/Remscheid.json index 4353e6e..4b1dc0c 100644 --- a/hood/Remscheid.json +++ b/hood/Remscheid.json @@ -9,14 +9,8 @@ "protocol": "fastd", "address": "fff-gw-geo.freifunk-geo.de", "port": "10003", - "key": "d60218d3ccf733f5616b905df3f7a79789aa6c4a3fea9d8631b3d7b8c5500be6" - }, - { - "name": "fff-gw-mc", - "protocol": "fastd", - "address": "fff-gw-mc.fff.community", - "port": "10010", - "key": "7a5a779724ffe834a9a6bb9830345fa2a24534148b884a37369062a98f78d801" + "key": "d60218d3ccf733f5616b905df3f7a79789aa6c4a3fea9d8631b3d7b8c5500be6", + "contact": "freifunk-rs@funkolive.de" } ], "hood": { @@ -34,7 +28,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } } \ No newline at end of file diff --git a/hood/Roettenbach.json b/hood/Roettenbach.json index ebea6ce..90ffb83 100644 --- a/hood/Roettenbach.json +++ b/hood/Roettenbach.json @@ -5,18 +5,20 @@ }, "vpn": [ { - "name": "fff-gw-fo2", + "name": "fff-rohan", "protocol": "fastd", - "address": "fff-gw-fo2.hyperweb.eu", + "address": "fff-rohan.hyperweb.eu", "port": "10007", - "key": "2b511018d73092276e15ab302a6b88c1d343cd986e41122edaff4baa7b35f594" + "key": "2b511018d73092276e15ab302a6b88c1d343cd986e41122edaff4baa7b35f594", + "contact": "salzmagazin@michelaweb.eu" }, { - "name": "fff-gw-fo1", + "name": "fff-gondor", "protocol": "fastd", - "address": "fff-gw-fo1.hyperweb.eu", - "port": "10006", - "key": "1727872d2db3dc3cd0417722987ac9715d569e4cd30841e8e8c97bfeeb6d7f57" + "address": "fff-gondor.hyperweb.eu", + "port": "10007", + "key": "1727872d2db3dc3cd0417722987ac9715d569e4cd30841e8e8c97bfeeb6d7f57", + "contact": "salzmagazin@michelaweb.eu" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610450860" } } \ No newline at end of file diff --git a/hood/Roth.json b/hood/Roth.json index 17fd2b3..6f02365 100644 --- a/hood/Roth.json +++ b/hood/Roth.json @@ -9,7 +9,8 @@ "protocol": "fastd", "address": "fff-gw-roth01.freifunk-roth.de", "port": "10004", - "key": "b3b6149a2b3bfc135b12f5435831eb49d0bbd9d926fd88853531320b870e2ed8" + "key": "b3b6149a2b3bfc135b12f5435831eb49d0bbd9d926fd88853531320b870e2ed8", + "contact": "" } ], "hood": { @@ -27,7 +28,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } } \ No newline at end of file diff --git a/hood/Salzach.json b/hood/Salzach.json index 5aec203..71dd41b 100644 --- a/hood/Salzach.json +++ b/hood/Salzach.json @@ -9,14 +9,16 @@ "protocol": "fastd", "address": "fff-nue2-gw4.fff.community", "port": "10000", - "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8" + "key": "3834e45fa33c048f975e81042c1e93bb11dac82d9f03a0b24071bb72205247a8", + "contact": "as@lists.f3netze.de" }, { "name": "fff-hades", "protocol": "fastd", "address": "ds.hades.sgstbr.de", "port": "20013", - "key": "74129c6d7cb5ee7470097679cfeb7b46a66b9983b938cc782c6d70248148878c" + "key": "7b4ff2b1785dbe2ecd5d2723a34bc30ac376f5739f6b993f4bcfad1153b40fac", + "contact": "fabian+fff@blaese.de" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227436" } } \ No newline at end of file diff --git a/hood/Schauenstein.json b/hood/Schauenstein.json index cdd0d86..089eb96 100644 --- a/hood/Schauenstein.json +++ b/hood/Schauenstein.json @@ -9,14 +9,16 @@ "protocol": "fastd", "address": "fff-naila-gw01.freifunk-naila.net", "port": "23429", - "key": "7defb5b15a853ccc856b66e1c1751bc670591e1af0174f04d5c2d3604c0395e7" + "key": "7defb5b15a853ccc856b66e1c1751bc670591e1af0174f04d5c2d3604c0395e7", + "contact": "mail@freifunk-naila.de" }, { "name": "fff-naila-gw02", "protocol": "fastd", "address": "fff-naila-gw02.freifunk-naila.net", "port": "23429", - "key": "7defb5b15a853ccc856b66e1c1751bc670591e1af0174f04d5c2d3604c0395e7" + "key": "25347192f5b8a1a22fff18dfa161337b66f93a3d08f022ab0217a279e3a207f6", + "contact": "mail@freifunk-naila.de" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } } \ No newline at end of file diff --git a/hood/Schnaittach.json b/hood/Schnaittach.json index 080c627..b14a1d0 100644 --- a/hood/Schnaittach.json +++ b/hood/Schnaittach.json @@ -5,18 +5,20 @@ }, "vpn": [ { - "name": "erl-1", + "name": "nue2-gw6", "protocol": "fastd", - "address": "schnaitt.fff.beibecks.de", + "address": "fff-nue2-gw6.fff.community", "port": "10011", - "key": "2dcb5c480cff6ae7571eb57b3aa15bf1b1dbfb233599e306ebf4b1a17f0c2768" + "key": "2dcb5c480cff6ae7571eb57b3aa15bf1b1dbfb233599e306ebf4b1a17f0c2768", + "contact": "freifunk@beibecks.de" }, { "name": "fff-nixxda", "protocol": "fastd", "address": "schnaittach.fff.nixxda.net", "port": "10012", - "key": "27dff011d360c2af4fd396e0a78fdd69d819cd72b62e28b03728da7558520ffe" + "key": "27dff011d360c2af4fd396e0a78fdd69d819cd72b62e28b03728da7558520ffe", + "contact": "fff@nixxda.net" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::102", + "timestamp": "1610365107" } } \ No newline at end of file diff --git a/hood/SchwarzenbachSaale.json b/hood/SchwarzenbachSaale.json index 4498969..6b64c8b 100644 --- a/hood/SchwarzenbachSaale.json +++ b/hood/SchwarzenbachSaale.json @@ -9,7 +9,8 @@ "protocol": "fastd", "address": "5.9.67.125", "port": "10015", - "key": "f22c82c0bea1c191bcb27644f4353ebfe9fb85507d4b0a21f8384259ea970293" + "key": "f22c82c0bea1c191bcb27644f4353ebfe9fb85507d4b0a21f8384259ea970293", + "contact": "freifunk@bnhof.de" } ], "hood": { @@ -27,7 +28,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } } \ No newline at end of file diff --git a/hood/Schweinfurt.json b/hood/Schweinfurt.json index d635abd..d11e870 100644 --- a/hood/Schweinfurt.json +++ b/hood/Schweinfurt.json @@ -9,14 +9,12 @@ "protocol": "fastd", "address": "rl-fff1.fff.community", "port": "10001", - "key": "a58ff2aae73eaff03c74d7360630aff60d1ae997941e0fc7545d15127134f925" + "key": "a58ff2aae73eaff03c74d7360630aff60d1ae997941e0fc7545d15127134f925", + "contact": "rlanghammer@web.de" }, { - "name": "fff-gw-mc", - "protocol": "fastd", - "address": "fff-gw-mc.fff.community", - "port": "10018", - "key": "d6727882f6a6d85357c352f57cc3df704ce6b31702b5fd6d990453ba1e3f0219" + "protocol": "vxlan", + "address": "rl-fff1.fff.community" } ], "hood": { @@ -34,7 +32,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } -} \ No newline at end of file +} diff --git a/hood/Selb.json b/hood/Selb.json index 3f033b8..909abdb 100644 --- a/hood/Selb.json +++ b/hood/Selb.json @@ -9,7 +9,8 @@ "protocol": "fastd", "address": "5.9.67.125", "port": "10012", - "key": "d5cd9e492845fcef7dd99e1c4d7a0fac7fe31deb0527abd18f763a9a7d649466" + "key": "d5cd9e492845fcef7dd99e1c4d7a0fac7fe31deb0527abd18f763a9a7d649466", + "contact": "freifunk@bnhof.de" } ], "hood": { @@ -27,7 +28,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } } \ No newline at end of file diff --git a/hood/Selbitz.json b/hood/Selbitz.json index 7eee09b..f739d88 100644 --- a/hood/Selbitz.json +++ b/hood/Selbitz.json @@ -9,14 +9,16 @@ "protocol": "fastd", "address": "fff-naila-gw02.freifunk-naila.net", "port": "23428", - "key": "7defb5b15a853ccc856b66e1c1751bc670591e1af0174f04d5c2d3604c0395e7" + "key": "8101e6b5578d5dec2587653eaa466253a5a5ea32ca0240a685104738c79a8f84", + "contact": "mail@freifunk-naila.de" }, { "name": "fff-naila-gw01", "protocol": "fastd", "address": "fff-naila-gw01.freifunk-naila.net", "port": "23428", - "key": "7defb5b15a853ccc856b66e1c1751bc670591e1af0174f04d5c2d3604c0395e7" + "key": "7defb5b15a853ccc856b66e1c1751bc670591e1af0174f04d5c2d3604c0395e7", + "contact": "mail@freifunk-naila.de" } ], "hood": { @@ -34,7 +36,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } } \ No newline at end of file diff --git a/hood/Trainstation.json b/hood/Trainstation.json index 0560ae1..3f8f561 100644 --- a/hood/Trainstation.json +++ b/hood/Trainstation.json @@ -9,7 +9,8 @@ "protocol": "fastd", "address": "fff-nue2-gw2.fff.community", "port": "10000", - "key": "07be3d18b703e6e040a6920afb3e226ded6aa474961d8eecbb77b623bdd21059" + "key": "07be3d18b703e6e040a6920afb3e226ded6aa474961d8eecbb77b623bdd21059", + "contact": "as@lists.f3netze.de" } ], "hood": { @@ -27,7 +28,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227702" } } \ No newline at end of file diff --git a/hood/Weissdorf.json b/hood/Weissdorf.json new file mode 100644 index 0000000..b80bb99 --- /dev/null +++ b/hood/Weissdorf.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "network": { + "ula_prefix": "fd43:5602:29bd:5a:\/64" + }, + "vpn": [ + { + "name": "fff-adrian-gw2", + "protocol": "fastd", + "address": "gw2.fff.schmutzler.it", + "port": "12020", + "key": "602a85c8fe6fcd266ab1723b35355870a6cd122226d276418e7ca64509b3c133", + "contact": "gw@freifunk.jubt.org" + } + ], + "hood": { + "id": "72", + "name": "Weissdorf", + "essid": "freifunk.lkrhof.wd", + "mesh_bssid": "", + "mesh_essid": "mesh.wd.fff", + "mesh_id": "mesh.wd.fff", + "protocol": "batman-adv-v15", + "channel2": "13", + "mode2": "ht20", + "mesh_type2": "802.11s", + "channel5": "40", + "mode5": "ht20", + "mesh_type5": "802.11s", + "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227580" + } +} \ No newline at end of file diff --git a/hood/Wuerzburg.json b/hood/Wuerzburg.json index e294ece..247e3b1 100644 --- a/hood/Wuerzburg.json +++ b/hood/Wuerzburg.json @@ -7,16 +7,10 @@ { "name": "fff-wue2", "protocol": "fastd", - "address": "fff-wue2.mifritscher.de", + "address": "fff2.mifritscher.de", "port": "10004", - "key": "575b12a935ec825584c6fc8901fd9ac725ee74234c9a049f84a5411aabffeed5" - }, - { - "name": "fff-gw-mc", - "protocol": "fastd", - "address": "fff-gw-mc.fff.community", - "port": "10009", - "key": "ff7c1c242855f16f2b3e13dc3a74ee20f66d5290199be8fa671d3336e461e781" + "key": "575b12a935ec825584c6fc8901fd9ac725ee74234c9a049f84a5411aabffeed5", + "contact": "fff[a.t]mifritscher[.]de" } ], "hood": { @@ -34,7 +28,7 @@ "mode5": "ht20", "mesh_type5": "802.11s", "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", - "ntp_ip": "fd43:5602:29bd:ffff::1", - "timestamp": "1577226481" + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1610453556" } } \ No newline at end of file diff --git a/hood/Zell.json b/hood/Zell.json new file mode 100644 index 0000000..3ccccf2 --- /dev/null +++ b/hood/Zell.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "network": { + "ula_prefix": "fd43:5602:29bd:5b:\/64" + }, + "vpn": [ + { + "name": "fff-adrian-gw2", + "protocol": "fastd", + "address": "gw2.fff.schmutzler.it", + "port": "12021", + "key": "4c26af78cf430143fb401a0be8c370ad57bb2f0ef0025a94e45b8c7c17992cef", + "contact": "gw@freifunk.jubt.org" + } + ], + "hood": { + "id": "73", + "name": "Zell", + "essid": "freifunk.lkrhof.zell", + "mesh_bssid": "", + "mesh_essid": "mesh.zell.fff", + "mesh_id": "mesh.zell.fff", + "protocol": "batman-adv-v15", + "channel2": "13", + "mode2": "ht20", + "mesh_type2": "802.11s", + "channel5": "40", + "mode5": "ht20", + "mesh_type5": "802.11s", + "upgrade_path": "http:\/\/[fd43:5602:29bd:ffff::feee]:83", + "ntp_ip": "fd43:5602:29bd:ffff::42", + "timestamp": "1596227580" + } +} \ No newline at end of file diff --git a/hood/mkjson b/hood/mkjson new file mode 100755 index 0000000..ad85e1b --- /dev/null +++ b/hood/mkjson @@ -0,0 +1,15 @@ +#!/bin/bash + +for id in $(curl http://keyserver.freifunk-franken.de/v2/hoods.php | jq '.[].id') +do + +curl -o tmp.json http://keyserver.freifunk-franken.de/v2/?hoodid=$id + +echo "ID $id" +file=$(jq -r '.hood.name' tmp.json | tr -d " ") +[[ "null" = $file ]] && rm tmp.json && exit +mv tmp.json "$file.json" + +done + + diff --git a/index.php b/index.php new file mode 100644 index 0000000..b0342a8 --- /dev/null +++ b/index.php @@ -0,0 +1,7 @@ + diff --git a/poly/Breitendiel.poly b/poly/Breitendiel.poly index 2b4f092..22e759c 100644 --- a/poly/Breitendiel.poly +++ b/poly/Breitendiel.poly @@ -8,4 +8,3 @@ 49.69750528937159 9.223923683166504 49.69670028240164 9.213409423828125 49.68773326885868 9.200448989868164 - diff --git a/poly/Nürnberg-Innenstadt.poly b/poly/Nürnberg-Innenstadt.poly new file mode 100644 index 0000000..f090edb --- /dev/null +++ b/poly/Nürnberg-Innenstadt.poly @@ -0,0 +1,7 @@ +49.44896027702345 11.065592765808105 +49.45875232014657 11.073832511901855 +49.45942179010528 11.086664199829102 +49.45766441195774 11.088123321533203 +49.45543272983746 11.088252067565918 +49.44667239531518 11.080656051635742 +49.44748153641486 11.067438125610352 diff --git a/poly/Nürnberg.poly b/poly/Nürnberg.poly new file mode 100644 index 0000000..1b62ff7 --- /dev/null +++ b/poly/Nürnberg.poly @@ -0,0 +1,12 @@ +49.430291392482545 11.040229797363281 +49.440896414087646 11.035938262939453 +49.45183392837305 11.037483215332031 +49.467120037299296 11.056537628173828 +49.47035517151213 11.094131469726562 +49.46014703890668 11.106576919555664 +49.45936600129137 11.115074157714842 +49.4560743488551 11.118335723876953 +49.44988097977617 11.12288475036621 +49.43609653047201 11.116962432861328 +49.42884000063522 11.085548400878906 +49.428170112992 11.065464019775389 diff --git a/poly/Schauenstein.poly b/poly/Schauenstein.poly index 2290927..c54bd80 100644 --- a/poly/Schauenstein.poly +++ b/poly/Schauenstein.poly @@ -2,4 +2,3 @@ 50.259117 11.740018 50.28852 11.680795 50.293729 11.73813 - diff --git a/poly/Weissdorf.poly b/poly/Weissdorf.poly new file mode 100644 index 0000000..b59c43a --- /dev/null +++ b/poly/Weissdorf.poly @@ -0,0 +1,6 @@ +50.208164 11.836996 +50.185527 11.837425 +50.176348 11.832361 +50.175799 11.855621 +50.184098 11.859226 +50.208164 11.856909 diff --git a/poly/Zell.poly b/poly/Zell.poly new file mode 100644 index 0000000..7d1ab35 --- /dev/null +++ b/poly/Zell.poly @@ -0,0 +1,4 @@ +50.145061 11.801462 +50.122284 11.801462 +50.122284 11.832361 +50.145061 11.832361 diff --git a/voronoi/voronoi b/voronoi/voronoi index 6ee8679..f26f47e 100644 --- a/voronoi/voronoi +++ b/voronoi/voronoi @@ -1,69 +1,70 @@ -Trainstation 0.0 0.0 -Nuernberg 49.444 11.05 -Fuerth 49.4814 10.966 -Hassfurt 50.031638 10.506658 -Hofheim 50.136694 10.523199 -Bayreuth 49.94814 11.580566 -Hof 50.31478 11.912398 -Schweinfurt 50.04499 10.23419 -FichtelgebirgeOst 50.0163 11.94961 -FichtelgebirgeWest 49.993077 11.775884 -FichtelgebirgeNord 50.0522 11.7946 -FichtelgebirgeSued 49.9743 11.8652 -Ebern 50.09652289 10.80041885 -Arnstein 49.981666 9.969662 -Wuerzburg 49.79688 9.93489 -Aschaffenburg 49.975661 9.146826 -FraenkischeSchweizOst 49.7762 11.4049 -Forchheim 49.72 11.06 -Adelsdorf 49.71 10.89 -Fichtelberg 50 11.8524 -FichtelgebirgeNeubau 50.0132 11.84792 -FichtelgebirgeFleckl 50.010718 11.8079 -Pegnitz 49.7581 11.5401 -Chiemgau 47.873644 12.638943 -Salzach 47.873644 12.743185 -Frankenwald 50.252 11.415 -FraenkischeSchweizNord 49.94 11.29 -Ebermannstadt 49.78 11.18 -FraenkischeSchweizSued 49.65 11.26 -Marktredwitz 50.0023 12.0786 -Naila 50.328488 11.705781 -Muenchberg 50.182 11.788 -Helmbrechts 50.235 11.716 -Leupoldsgruen 50.294 11.797 -Konradsreuth 50.271 11.847 -SchwarzenbachSaale 50.221 11.932 -Rehau 50.248 12.037 -Selb 50.171 12.131 -Lichtenberg 50.395 11.687 -BadSteben 50.37 11.62 -Lauf 49.518 11.281 -Roettenbach 49.68 10.96 -Bamberg 49.89 10.898 -Hoechstadt 49.709 10.845 -Schauenstein NULL NULL -Selbitz NULL NULL -HassfurtStadt NULL NULL -FuerthStadt NULL NULL -Coburg 50.268233 10.9608003 -HofheimStadt NULL NULL -Crailsheim 49.058 10.065 -Dinkelsbuehl 49.068678 10.325771 -Erlangen-Innenstadt NULL NULL -Erlangen-West 49.58934858 10.9388 -Erlangen-Nord 49.63645351 10.97757339 -Erlangen-Ost 49.58957114 11.02100372 -Gerolzhofen 49.900258 10.347808 -Lichtenfels 50.144 11.055 -Remscheid 51.176178 7.189986 -Mosbach 49.348265 9.113524 -Eckental 49.581851 11.200677 -Schnaittach 49.575217 11.337566 -Roth 49.252047 11.091189 -Hanau 50.1354196 8.9110648 -Kassel 51.3149345 9.4255956 -Miltenberg 49.84 9.3 -Berlin 52.5219184 13.411026 -BadHersfeld NULL NULL -Breitendiel NULL NULL +Trainstation null null +Nürnberg-Umland 49.444 11.05 +Fuerth 49.4814 10.966 +Hassfurt 50.031638 10.506658 +Hofheim 50.136694 10.523199 +Bayreuth 49.94814 11.580566 +Hof 50.31478 11.912398 +Schweinfurt 50.04499 10.23419 +FichtelgebirgeOst 50.0163 11.94961 +FichtelgebirgeWest 49.993077 11.775884 +FichtelgebirgeNord 50.0522 11.7946 +FichtelgebirgeSued 49.9743 11.8652 +Ebern 50.09652289 10.80041885 +Arnstein 49.981666 9.969662 +Wuerzburg 49.79688 9.93489 +Aschaffenburg 49.975661 9.146826 +FraenkischeSchweizOst 49.7762 11.4049 +Forchheim 49.72 11.06 +Adelsdorf 49.71 10.89 +Fichtelberg 50 11.8524 +FichtelgebirgeNeubau 50.0132 11.84792 +FichtelgebirgeFleckl 50.010718 11.8079 +Pegnitz 49.7581 11.5401 +Chiemgau 47.873644 12.638943 +Salzach 47.873644 12.743185 +Frankenwald 50.252 11.415 +FraenkischeSchweizNord 49.94 11.29 +Ebermannstadt 49.78 11.18 +FraenkischeSchweizSued 49.65 11.26 +Marktredwitz 50.0023 12.0786 +Naila 50.328488 11.705781 +Muenchberg 50.182 11.788 +Helmbrechts 50.235 11.716 +Leupoldsgruen 50.294 11.797 +Konradsreuth 50.271 11.847 +SchwarzenbachSaale 50.221 11.932 +Rehau 50.248 12.037 +Selb 50.171 12.131 +Lichtenberg 50.395 11.687 +BadSteben 50.37 11.62 +Lauf 49.518 11.281 +Roettenbach 49.68 10.96 +Bamberg 49.89 10.898 +Hoechstadt 49.709 10.845 +Schauenstein null null +Selbitz null null +HassfurtStadt null null +Coburg 50.268233 10.9608003 +HofheimStadt null null +Crailsheim 49.058 10.065 +Dinkelsbuehl 49.068678 10.325771 +Erlangen-Innenstadt null null +Erlangen-West 49.58934858 10.9388 +Erlangen-Nord 49.63645351 10.97757339 +Erlangen-Ost 49.58957114 11.02100372 +Gerolzhofen 49.900258 10.347808 +Lichtenfels 50.144 11.055 +Remscheid 51.176178 7.189986 +Mosbach 49.348265 9.113524 +Eckental 49.581851 11.200677 +Schnaittach 49.575217 11.337566 +Roth 49.252047 11.091189 +Miltenberg 49.84 9.3 +BadHersfeld null null +Breitendiel null null +Nürnberg-Innenstadt null null +Nürnberg null null +Weissdorf null null +Zell null null +Bad-Windsheim 49.50198129 10.40405273