removed defunct peer in Nigeria (#190)

I will be decommissioning this server soon

AS/hk/hk.hub.icfreedom.net.k

@@ -1,8 +0,0 @@
-{
-    "hk.hub.icfreedom.net:39119":{
-        "contact":"mixxit@hyperboria.name",
-        "password":"60dgptu2x8400qxnss5u1h9ld6h89p4",
-        "peerName":"hk.hub.icfreedom.net",
-        "publicKey":"b5rxqzvz1m8nbmx2473dgpxqgh7q0m7hu8fr1kxv40018zq1bwm0.k"
-    }
-}

AS/sg/singapore/sg.hub.icfreedom.net.k

@@ -1,8 +0,0 @@
-{
-    "sg.hub.icfreedom.net:64221":{
-        "contact":"mixxit@hyperboria.name",
-        "password":"92tkn2fhkyx4p139v2320cs2d1407u0",
-        "peerName":"sg.hub.icfreedom.net",
-        "publicKey":"265s36tzlnj26ctxbmk4zjdt6fn5xmn0lgtyurkrwgftc3uysgb0.k"
-    }
-}

EU/de/bavaria/hype.jazzanet.com.k

@@ -1,9 +0,0 @@
-{
-    "176.9.105.201:4464":{
-        "contact":"webmaster@jazzanet.com",
-        "login":"public",
-        "password":"ir88xwtel72fen3ch7aug603s26nu3a",
-        "peerName":"jazzanet",
-        "publicKey":"yrgb0xwfr9pz8swvnv6m9by8zw7v7uxxhl07qz318cjuvfgs1fc0.k"
-    }
-}

EU/fr/nord-pas-de-calais/hub.icfreedom.net.k

@@ -1,8 +0,0 @@
-{
-    "hub.icfreedom.net:64749":{
-        "contact":"mixxit@hyperboria.name",
-        "password":")h.1-_[?bFW!0H:O{=a>H+9&17q]*j1~Bjzk{e.$",
-        "peerName":"icfreedom.net",
-        "publicKey":"ny90t66vzmfywtcs3rs8fwwhzfk7frgvdfxutqxslk18jrj82hx0.k"
-    }
-}

EU/fr/nord-pas-de-calais/play.fallofanempire.com.k

@@ -1,8 +0,0 @@
-{
-    "play.fallofanempire.com:50005":{
-        "contact":"mixxit@hyperboria.name",
-        "password":"LTRXc&UQ>YQOB=zNSWh{^HXf%|ha5r)A)R/IV!dT",
-        "peerName":"play.fallofanempire.com",
-        "publicKey":"3c4q5wfvjm525gq0d0lmp1lh87dhm7llxhcyh2srhkjyrrmnxsm0.k"
-    }
-}

EU/gr/rethymno/kaotisk.rethymno-meshnet.k

@@ -1,9 +0,0 @@
-{
-    "rethymno-meshnet.tk:38295":{
-        "contact":"kaotisk@irc.fc00.io",
-        "login":"default-login",
-        "password":"wgs9k7n7j5yh0kx7kyl5m7cpp71ls4y",
-        "peerName":"gr-rethymno-meshnet",
-        "publicKey":"wb3pt76psbt28mt9t2wzyudyh9zkqwq9z3jqb3t06y53g6f5qzh0.k"
-    }
-}

EU/md/chisinau/eu-east.hub.icfreedom.net.k

@@ -1,8 +0,0 @@
-{
-    "eu-east.hub.icfreedom.net:22992":{
-        "contact":"mixxit@hyperboria.name",
-        "password":"g7575cd9p1f6cmubhy705b50f0qp95b",
-        "peerName":"eu-east.hub.icfreedom.net",
-        "publicKey":"5xvkzx99t4x915x8xqzbsflvj3urpu48558wjc0613v97p377ks0.k"
-    }
-}

EU/nl/amsterdam/mrowr.me.k

@@ -1,8 +0,0 @@
-{
-    "188.166.3.174:4841":{
-        "contact":"oniichan@mrowr.me",
-        "password":"public-20150903-6pb6aEKDDKVr9zsBJIyDUYfrXYzQv1",
-        "publicKey":"s680fh7g69ww3y9cmrxt910u5hvrwrmcnln1sz6mq1jk5mquq8k0.k",
-        "user":"katt"
-    }
-}

EU/nl/amsterdam/weuxel.ams.k

@@ -1,8 +0,0 @@
-{
-    "188.226.183.183:43328":{
-        "contact":"hype@smash-net.org",
-        "password":"public_access",
-        "publicKey":"1y1jmqrw4r31jlp6yqmq30067rcp0tsgsdm3cs4k8l33pyfhpwn0.k",
-        "user":"weuxel"
-    }
-}

EU/se/lulea/bliss.willeponken.me.k

@@ -1,10 +0,0 @@
-{
-    "130.240.202.22:49960":{
-        "contact":"william@willeponken.me",
-        "gpg":"DECA60149478ECFE",
-        "login":"public-peer",
-        "password":"y4j84802yfyxpzrtbzbwtj3hd1l9mrc",
-        "peerName":"bliss.willeponken.me",
-        "publicKey":"tpf7pdj6pby9r2smxuwmkvzfrfj6jb0brch8yhp3jsxbrf3ld0h0.k"
-    }
-}

EU/uk/london/ansuz.science.k

@@ -1,8 +0,0 @@
-{
-    "139.162.219.143:2331":{
-        "contact":"ansuz@transitiontech.ca",
-        "password":"CJ36KhxxO7nmfCy1kVB27rhwlWgnG95i",
-        "publicKey":"bddc5j6sc45hlrdnccu120zwnmm2z0qlbfkxn9n8xbs0vqgx9fh0.k",
-        "user":"ansuz"
-    }
-}

EU/uk/london/cwningen.cymru.k

@@ -1,34 +0,0 @@
-{
-    "46.235.225.176:31545":{
-        "contact":"hostmaster@cwningen.cymru",
-        "gpg":"B60E86E6",
-        "login":"public-peer",
-        "password":"p0w2yzku3lj126fs2z1wrlt1w684dzw",
-        "peerName":"llygaid.cwningen.cymru",
-        "publicKey":"8268mn1bvz66nbb74tqw7ynjkcjrtruv8pgjf9kr34zv5d60p3r0.k"
-    },
-    "93.93.129.43:31545":{
-        "contact":"hostmaster@cwningen.cymru",
-        "gpg":"B60E86E6",
-        "login":"public-peer",
-        "password":"p0zk85ff2lk3zbvgypzr1tvbu1gnlkc",
-        "peerName":"penfar.cwningen.cymru",
-        "publicKey":"7ktfb2n336bguhfx81ts15qgjb8mjj4rz3vrnvj2dw89wsmmtpg0.k"
-    },
-    "[2001:67c:2990:a00::2eeb:e1b0]:31545":{
-        "contact":"hostmaster@cwningen.cymru",
-        "gpg":"B60E86E6",
-        "login":"public-peer",
-        "password":"p0w2yzku3lj126fs2z1wrlt1w684dzw",
-        "peerName":"llygaid.cwningen.cymru",
-        "publicKey":"8268mn1bvz66nbb74tqw7ynjkcjrtruv8pgjf9kr34zv5d60p3r0.k"
-    },
-    "[2001:67c:2990:b00::5d5d:812b]:31545":{
-        "contact":"hostmaster@cwningen.cymru",
-        "gpg":"B60E86E6",
-        "login":"public-peer",
-        "password":"p0zk85ff2lk3zbvgypzr1tvbu1gnlkc",
-        "peerName":"penfar.cwningen.cymru",
-        "publicKey":"7ktfb2n336bguhfx81ts15qgjb8mjj4rz3vrnvj2dw89wsmmtpg0.k"
-    }
-}

NA/ca/quebec/ca.hub.icfreedom.net.k

@@ -1,8 +0,0 @@
-{
-    "ca.hub.icfreedom.net:25109":{
-        "contact":"mixxituk@gmail.com",
-        "password":".!jjR[tyKF1ZO(J7mbf1=9!0jS^(~LUb#JPknsO,",
-        "publicKey":"g0q7z39pnptj1r5src9jnpp5wuzl1rtg608gy5xmd4ulpg275520.k",
-        "user":"ca.hub.icfreedom.net"
-    }
-}

NA/us/california/irvinca-usa.k

@@ -1,9 +0,0 @@
-{
-    "68.96.80.118:64137":{
-        "contact":"kylerschin@gmail.com",
-        "login":"default-login",
-        "password":"34pq18yfsc40yy360hz191u807gk6fk",
-        "peerName":"h.glitchedpixels.com",
-        "publicKey":"tfxxckg18zfxrb3xs3p4f7d9xgxscg13v2zwtjh6ndn704n816l0.k"
-    }
-}

NA/us/newyork/weuxel.usa.k

@@ -1,8 +0,0 @@
-{
-    "192.241.171.154:62718":{
-        "contact":"hype@smash-net.org",
-        "password":"public_access",
-        "publicKey":"q5nhj9kg6ddmk571jb259mct2ljd10z9xvyf05y3hu66wk4qnk20.k",
-        "user":"weuxel"
-    }
-}

NA/us/oregon/h.us-west.hub.icfreedom.net.k

@@ -1,8 +0,0 @@
-{
-    "us-west.hub.icfreedom.net:56941":{
-        "contact":"mixxituk@gmail.com",
-        "password":"80b8cqnbfy560f9mh8g3dqkh17gwp6g",
-        "publicKey":"wjzupkw8h2n20krbf887zyhu107j1dsz8m34rfbb9z10063ym2t0.k",
-        "user":"us-west.hub.icfreedom.net"
-    }
-}

README.md

@@ -15,12 +15,15 @@ To connect your node to one of these public peers, follow [the steps in the cjdn
 
 ## Adding your public node's credentials
 
-If you've created a public node, and would like to have it listed here, fork the repo, add a keyfile, and submit a PR.
+If you've created a public node, and would like to have it listed here, fork the repo, add a keyfile, run `./tests.py` (make sure your file passes the test), and submit a PR.
+
+We won't merge your credentials until our tests are passing.
 
 ### Filepath conventions
-Credentials are sorted geographically, by [continent](https://github.com/hyperboria/docs/blob/master/cjdns/nodeinfo-json.md#regarding-continent-codes), region, and municipality.
+Credentials are sorted geographically, by [continent](https://github.com/hyperboria/docs/blob/master/cjdns/nodeinfo-json.md#regarding-continent-codes) code.
+Nodes may be classified further, at the discretion of the node operator, and the administrators of the repository.
 
-For example, a node in New York City is listed at `NA/us/newyork`.
+The suggested format is `/continent/country/region/municipality`. For example, `/na/ca/ontario/toronto/`.
 
 Region and municipality codes are based on self identification, not any ISO standard.
 An operator might prefer to list their node in Cascadia instead of Washington state.
@@ -36,18 +39,30 @@ We have tried to standardize the structure of the actual credential files, as su
   + password
   + publicKey
   + contact (a means of contacting the operator)
+* The following fields are not yet required, but are recommended:
+  + gpg, listing your 16 character pgp fingerprint (all caps, no spaces)
+  + peerName, a human-readable name for the node
 * credentials should be formatted such that:
-  - there is a space after each colon
   - indentation uses four spaces
   - the file ends with a newline character.
+* credentials must use IP:port strings for keys
+  - credentials using hostnames will not be accepted
+* If you are hosting it on a major server provider, please provide the name and shorthand for server. 
+  - On digitalocean, That may be ```digitalocean sfo2```
+  - On linode, that may be ```linode uswest``` or ```linode tokyo2```
+  - On AWS, use the region, followed by the city. Usable Server names are listed can be found on found on the [AWS WEBSITE](https://aws.amazon.com/about-aws/global-infrastructure/)
+  
+      EX: useastnorthernvirginia,useastohio,southamericasaopaulo
 
 ```
 {
-    "192.168.1.5:10326": {
+    "192.168.1.5:10326":{
-        "login": "default-login",
+        "contact":"alice@bob.com",
-        "password": "nq1uhmf06k8c5594jqmpgy26813b81s",
+        "gpg":"FC00FC00FC00FC00",
-        "publicKey": "ssxlh80x0bqjfrnbkm1801xsxyd8zd45jkwn1zhlnccqj4hdqun0.k",
+        "login":"default-login",
-        "peerName": "your-name-goes-here"
+        "password":"nq1uhmf06k8c5594jqmpgy26813b81s",
+        "peerName":"your-name-goes-here",
+        "publicKey":"ssxlh80x0bqjfrnbkm1801xsxyd8zd45jkwn1zhlnccqj4hdqun0.k"
     }
 }
 ```
@@ -83,6 +98,5 @@ Peers.map(function (creds, path) {
 /*  the underlying data is exposed in a nested json structure */
 console.log(Peers.peers);
 
-console.log(Peers.peers.NA.us.california);
+console.log(Peers.peers.na.us.california);
 ```
-

af/za/deavmi.md

@@ -0,0 +1,6 @@
+"[2a04:5b81:2010::90]:6261": {
+	"login": "deavmi_links",
+	"password": "mu1sv9h45w41z47b9lcpl7gr56q38m0",
+	"publicKey": "qkw11v5yff3tp3sv0dbmmk73lgwwpmcsy0v4mx3gdlmj61yhy7u0.k",
+	"peerName": "deavmiNode"
+}

as/jp/tokyo.trnsz-jp.k

@@ -0,0 +1,9 @@
+{
+    "139.162.119.37:22237":{
+        "contact":"trn on irc.fc00.io",
+        "login":"default-login",
+        "password":"x6knr8yqg6620dd0dxf81w7sy1p4723",
+        "peerName":"trnsz-jp",
+        "publicKey":"u64fnj4b3s0mcbgf9zfh08qbxh556p8z2z2plw2qp97bpcdg6gf0.k"
+    }
+}

eu/ch/vaud/cjdns.theswissbay.ch

@@ -0,0 +1,10 @@
+{
+    "81.6.2.165:56879":{
+        "contact":"gopfertaminomal@theswissbay.ch",
+        "login":"theswissbay-peering-login",
+        "password":"rr1lsx8vvxq7m5107gvsn98gc2h2l54",
+        "peerName":"theswissbay.ch",
+        "publicKey":"nuvtkly8swgkwsyyjrv89f4y4y0w3x17w61twgsfh9zv1r87h060.k",
+        "website":"https://theswissbay.ch"
+    }
+}

eu/ch/zurich/0.h.pfactum.k

@@ -0,0 +1,10 @@
+{
+    "140.238.168.104:17122":{
+        "contact":"oleksandr@natalenko.name",
+        "location":"oracle zrh",
+        "login":"eey6ay0mi3aiwohV2Eequaiciequ2eiz",
+        "password":"bbfgfh3lgbxw9yr70wmux6jn85h9dcn",
+        "peerName":"0.h.pfactum.k",
+        "publicKey":"mz1hh3f7fc8bwrjvsh0rfrrjndspkj8pfdppcxnjcsu4bw7xm410.k"
+    }
+}

eu/de/Frankfurt/h.rwfr.k

@@ -0,0 +1,9 @@
+{
+    "160.20.147.198:53340":{
+        "contact":"anticipaste3@gmail.com",
+        "login":"default-login",
+        "password":"w6db8n5gb4wtjy0ud32vhql7469g1sb",
+        "peerName":"h.rwfr.k",
+        "publicKey":"byxcwmgbhkcgt3vv2820vujbc65szwkn9sj7vk1x3tjdw4q0sc30.k"
+    }
+}

eu/de/Frankfurt/sssemil.k

@@ -0,0 +1,16 @@
+{
+    "45.32.152.232:5078":{
+        "contact":"suleymanovemil8@gmail.com",
+        "login":"default-login",
+        "password":"v277jzr7r3jgk0vk1389b2c3h0gy98t",
+        "peerName":"sssemil.k",
+        "publicKey":"08bz912l989nzqc21q9x5qr96ns465nd71f290hb9q40z94jjw60.k"
+    },
+    "[2001:19f0:6c01:1f4f:5400:03ff:fe2f:dc95]:5078":{
+        "contact":"suleymanovemil8@gmail.com",
+        "login":"default-login",
+        "password":"v277jzr7r3jgk0vk1389b2c3h0gy98t",
+        "peerName":"sssemil.k",
+        "publicKey":"08bz912l989nzqc21q9x5qr96ns465nd71f290hb9q40z94jjw60.k"
+    }
+}

eu/fr/paris/h.totem.tfnux.org.k

@@ -0,0 +1,16 @@
+{
+    "163.172.26.210:27410":{
+        "contact":"adraenwan@tfnux.org",
+        "login":"public-peer",
+        "password":"ZGZWKOX5H535MG7MRYRKFMF4IY5GFCO5",
+        "peerName":"h.totem.tfnux.org",
+        "publicKey":"8bqv77rkzn888mcr8wu3k9b22hpczhn7c0zzyrqpj4bbx8rbf810.k"
+    },
+    "[2001:bc8:2495:100::1]:27410":{
+        "contact":"adraenwan@tfnux.org",
+        "login":"public-peer",
+        "password":"ZGZWKOX5H535MG7MRYRKFMF4IY5GFCO5",
+        "peerName":"h.totem.tfnux.org",
+        "publicKey":"8bqv77rkzn888mcr8wu3k9b22hpczhn7c0zzyrqpj4bbx8rbf810.k"
+    }
+}

eu/fr/paris/h.valdek.ml.k

@@ -0,0 +1,10 @@
+{
+    "51.254.84.52:40504":{
+        "contact":"workenergetix(a7)yandex.ru",
+        "ipv6":"2001:41d0:a:1a3b::49",
+        "login":"agusha",
+        "password":"IIYTNH_B3Pb1BAET_D0MA_HA_FEHOBAPBITAG_Bminor_Em_C_D",
+        "peerName":"valdek.ml",
+        "publicKey":"fnqfcu85xcxk6s052xzlu5rk68z91qyyf9jtf33cp48f8cuhl4g0.k"
+    }
+}

eu/lt/vilnius/borg.vilnius.lt.k

@@ -0,0 +1,9 @@
+{
+    "185.25.48.153:13109":{
+        "contact":"xmpp:borg@xabber.org",
+        "password":"public",
+        "peerName":"borg-vilnius",
+        "publicKey":"pkq30hrl9zyzwn03u6lchh20crfgq46m1dfb5zwfhpx3c6v2l420.k",
+        "user":"public"
+    }
+}

eu/nl/amsterdam/finlaydag33k.nl.k

@@ -0,0 +1,9 @@
+{
+    "212.187.50.177:62810":{
+        "contact":"contact@finlaydag33k.nl",
+        "login":"meshwithme",
+        "password":"iwanttomesh",
+        "peerName":"cjdns-01.finlaydag33k.nl",
+        "publicKey":"67zwu83kcglutjp18xfhjjc41qn0m5srjc07un0bn4x09uwq1by0.k"
+    }
+}

eu/nl/amsterdam/h.mercury.tfnux.org.k

@@ -0,0 +1,16 @@
+{
+    "51.15.3.66:27410":{
+        "contact":"adraenwan@tfnux.org",
+        "login":"public-peer",
+        "password":"jkb46blldfp56j3lbm37nj3uj1j72h1",
+        "peerName":"h.totem.tfnux.org",
+        "publicKey":"8bqv77rkzn888mcr8wu3k9b22hpczhn7c0zzyrqpj4bbx8rbf810.k"
+    },
+    "[2001:bc8:2495:100::1]:27410":{
+        "contact":"adraenwan@tfnux.org",
+        "login":"public-peer",
+        "password":"jkb46blldfp56j3lbm37nj3uj1j72h1",
+        "peerName":"h.totem.tfnux.org",
+        "publicKey":"8bqv77rkzn888mcr8wu3k9b22hpczhn7c0zzyrqpj4bbx8rbf810.k"
+    }
+}

eu/nl/amsterdam/igel-amersfoort.ams.k

@@ -1,9 +1,9 @@
 {
-    "192.198.82.242:27823":{
+    "185.243.112.90:27823":{
         "contact":"Igel@hyperboria.ca",
         "gpg":"A84DFFE62B451511",
         "password":"alfa-charlie-alfa-bravo",
-        "peerName":"igel-northcarolina",
+        "peerName":"igel-amersfoort",
         "publicKey":"1nctdb89gtfrlnu71zyq97n14frl1r4z0ylwzc8vn7kpvrzu4yl0.k"
     }
 }

eu/nl/amsterdam/sabsare.geek.k

@@ -0,0 +1,18 @@
+{
+    "163.172.222.21:3111":{
+        "contact":"sabsare@disroot.org",
+        "gpg":"7267 B3AF BBA3 020D DAA9  00DC A4D0 24EC FAEF 0B4D",
+        "login":"default-login",
+        "password":"lwmnsu9t63rzfbjj74ttv525s2phq96",
+        "peerName":"h.sabsare.geek",
+        "publicKey":"c6x0vfhh88ncz4by4ss3kmf09c7lp5nv9jufs8r3mkcudxfvb9v0.k"
+    },
+    "[2001:bc8:25f0:200::1:f]:8060":{
+        "contact":"sabsare@disroot.org",
+        "gpg":"7267 B3AF BBA3 020D DAA9  00DC A4D0 24EC FAEF 0B4D",
+        "login":"default-login",
+        "password":"lwmnsu9t63rzfbjj74ttv525s2phq96",
+        "peerName":"h.sabsare.geek",
+        "publicKey":"c6x0vfhh88ncz4by4ss3kmf09c7lp5nv9jufs8r3mkcudxfvb9v0.k"
+    }
+}

eu/no/oslo/hyperboria.hackeriet.no.k

@@ -0,0 +1,16 @@
+{
+    "185.35.202.206:60392":{
+        "contact":"nett@hackeriet.no",
+        "login":"public",
+        "password":"bKOWX81lA1qHLdi1kxw8qZC1",
+        "peerName":"hyperboria.hackeriet.no",
+        "publicKey":"vufgpj15lvfcwu9rk6vg0y14rl1xhg3m491bjlus5zr6bq9llcb0.k"
+    },
+    "[2a02:ed06::206]:60392":{
+        "contact":"nett@hackeriet.no",
+        "login":"public",
+        "password":"bKOWX81lA1qHLdi1kxw8qZC1",
+        "peerName":"hyperboria.hackeriet.no",
+        "publicKey":"vufgpj15lvfcwu9rk6vg0y14rl1xhg3m491bjlus5zr6bq9llcb0.k"
+    }
+}

eu/pl/warsaw/magik6k.net.k

@@ -1,8 +1,8 @@
 {
-    "51.254.25.16:1132":{
+    "51.75.35.194:1132":{
         "contact":"me@magik6k.net",
         "password":"thah9aePha1Vusha6ovhpublic",
-        "peerName":"Magik6k-sbg1",
+        "peerName":"Magik6k-waw-public",
         "publicKey":"kw0vfw3tmb6u6p21z5jmmymdlumwknlg3x8muk5mcw66tdpqlw30.k"
     }
 }

eu/ru/moscow/h.bunjlabs.com.k

@@ -1,9 +1,9 @@
 {
-    "185.125.216.67:24297":{
+    "94.142.141.189:50433":{
         "contact":"contact@bunjlabs.com",
         "login":"default-login",
         "password":"c5q2j63x5nkmt2yg2vjmlnfuh1jnjjf",
         "peerName":"h.bunjlabs.com",
-        "publicKey":"5dkw4x4tczb6x164qklggbgfy35cs5uxjl6tyyu4slu7nm4062q0.k"
+        "publicKey":"0gdj2xzn01lzjjcrykjvwp8flnxkp1b3jny0drl5b168lmpsmfj0.k"
     }
 }

eu/ru/moscow/node01.msk.ru-mesh.net.k

@@ -0,0 +1,9 @@
+{
+    "194.67.213.84:24519":{
+        "contact":"show.vars@gmail.com",
+        "login":"default-login",
+        "password":"37yuffz9hs4lk0wjnvyzj5yx45l444v",
+        "peerName":"node01.msk.ru-mesh.net",
+        "publicKey":"9f79752ml0p6glqdnj93352tj3hmctmf8jg8rbgp1wj8mh09lmv0.k"
+    }
+}

eu/ru/novosibirsk/meanmail.k

@@ -0,0 +1,10 @@
+{
+    "91.234.81.181:7485":{
+        "contact":"cjdns@meanmail.ru",
+        "gpg":"82A4C11393800B6AEBC790D2EC1F3EE797AF5FA2",
+        "login":"default-login",
+        "password":"zfhb88fzf2lmpb5g2bgju6ps33lfr1c",
+        "peerName":"meanmail",
+        "publicKey":"0x3bvhjx0knnq67ruwmz369tuflr8zknkzbx7wgn60s4nujugdk0.k"
+    }
+}

eu/ru/spb/dskrylnikov.k

@@ -0,0 +1,9 @@
+{
+    "95.213.251.59:60246":{
+        "contact":"skrylnikov@protonmail.com",
+        "login":"public",
+        "password":"public_passwd",
+        "peerName":"dskrylnikov",
+        "publicKey":"v0wjlvtkxdu5tr7htymsuytwxtqlrnyjlhk59pw6s11mj4ggw7p0.k"
+    }
+}

eu/ru/spb/ru.spb.tokakoka.k

@@ -0,0 +1,9 @@
+{
+    "91.122.62.105:36510":{
+        "contact":"info@tokakoka.ru",
+        "login":"default-login",
+        "password":"hf3y45w5hf0ckl8zltldn8pry02lccd",
+        "peerName":"ru.spb.tokakoka",
+        "publicKey":"mvds4b1j97zn7uvxyczwsdhmcq5chs561gu0fml7996zvbvpmu00.k"
+    }
+}

eu/se/lulea/bohr.willeponken.me.k

@@ -0,0 +1,10 @@
+{
+    "130.240.202.22:5039":{
+        "contact":"william@willeponken.me",
+        "gpg":"DECA60149478ECFE",
+        "login":"public-peer",
+        "password":"zuqcdlv9kj0cvghl4vdx28bcz4vnzf9",
+        "peerName":"bohr.willeponken.me",
+        "publicKey":"b83r3fpguqp0w506n1u41dx8wk9kd7shv7ldfy7vxkkxb6h7yjj0.k"
+    }
+}

eu/ua/kiev/h.saloid.ua

@@ -0,0 +1,9 @@
+{
+    "93.175.235.192:48433":{
+        "contact":"svetotled@gmail.com",
+        "login":"saloid",
+        "password":"w5w3xg1dm46q3qlhrfpqcy20q2skb6u",
+        "peerName":"h.saloid.ua",
+        "publicKey":"f9f9n0rn4d11hffvhn9y3grgg1twuqurdtxwmn0skprz510g5w90.k"
+    }
+}

eu/ua/kiev/kiev/ic.hellomouse.cf.k

@@ -0,0 +1,18 @@
+{
+    "185.140.54.19:35907":{
+        "contact":"iczero4@gmail.com",
+        "gpg":"613CE9DA0E9A3F70EC97760E4BAC4EBB8461FC7E",
+        "login":"public",
+        "password":"fwlmbx2f3udkd0ymknq4pwwgu2bjklx",
+        "peerName":"ic.hellomouse.cf",
+        "publicKey":"gtbfndu2tvfbwuydm7v0kpnqpgcburtymhz3ph9kfrjg4n8bh3j0.k"
+    },
+    "[2a05:dfc7:dfc7:20::1]:35907":{
+        "contact":"iczero4@gmail.com",
+        "gpg":"613CE9DA0E9A3F70EC97760E4BAC4EBB8461FC7E",
+        "login":"public",
+        "password":"fwlmbx2f3udkd0ymknq4pwwgu2bjklx",
+        "peerName":"ic.hellomouse.cf",
+        "publicKey":"gtbfndu2tvfbwuydm7v0kpnqpgcburtymhz3ph9kfrjg4n8bh3j0.k"
+    }
+}

eu/uk/birmingham/cocolino.fun.k

@@ -0,0 +1,10 @@
+{
+    "82.5.34.168:37144":{
+        "contact":"arvamircea@gmail.com",
+        "gpg":"NULL",
+        "login":"julian_assange_public",
+        "password":"qu3r1l25lgqkqspjhms1phclj56tvr5",
+        "peerName":"Coco's public node",
+        "publicKey":"3bur7ln0ccbvwwgqjn662ttwuwgyfvsnw3d0h6d1qf8x54cs4m20.k"
+    }
+}

eu/uk/london/cwningen.cymru.k

@@ -0,0 +1,30 @@
+{
+    "44.131.22.1:43022":{
+        "contact":"hostmaster@cwningen.cymru",
+        "login":"public-peer",
+        "password":"s22z2q6y8fsj28myjlp7yx6gv0wn1q2",
+        "peerName":"penfar.cwningen.cymru",
+        "publicKey":"pp6c01cnz51t2vyl1jmzbply1n662c13nm6mzprx0g5djkvl3470.k"
+    },
+    "44.131.22.48:9740":{
+        "contact":"hostmaster@cwningen.cymru",
+        "login":"public-peer",
+        "password":"6uyxcspqzuxycd1nrwjugmhfh7r2qwd",
+        "peerName":"traed.cwningen.cymru",
+        "publicKey":"p8q8bsbvlr3xjh2hqlzyfcgjsk2mjm7fl8s5w73v68925n4f6nb0.k"
+    },
+    "[2001:67c:2990:b00::5d5d:812b]:43022":{
+        "contact":"hostmaster@cwningen.cymru",
+        "login":"public-peer",
+        "password":"s22z2q6y8fsj28myjlp7yx6gv0wn1q2",
+        "peerName":"penfar.cwningen.cymru",
+        "publicKey":"pp6c01cnz51t2vyl1jmzbply1n662c13nm6mzprx0g5djkvl3470.k"
+    },
+    "[2001:67c:2990:f00::5d5d:32fd]:9740":{
+        "contact":"hostmaster@cwningen.cymru",
+        "login":"public-peer",
+        "password":"6uyxcspqzuxycd1nrwjugmhfh7r2qwd",
+        "peerName":"traed.cwningen.cymru",
+        "publicKey":"p8q8bsbvlr3xjh2hqlzyfcgjsk2mjm7fl8s5w73v68925n4f6nb0.k"
+    }
+}

index.js

@@ -1,4 +1,6 @@
 var Fs = require("fs"),
+    Package = require("./package.json"),
+    version = module.exports.version = Package.version,
     Path = require("path"),
     DIRNAME = __dirname,
     read = function (p) {
@@ -41,7 +43,9 @@ var Fs = require("fs"),
                     find(peers, A.slice(1))[name] = {};
                     walk(A.concat(name));
                 } else if (/\.k$/.test(name)) {
-                    find(peers, A.slice(1))[name] = read(fullPath);
+                    var obj = find(peers, A.slice(1))[name] = read(fullPath);
+                    // embed the location in the object
+                    obj.location = A.slice(1);
                 }
             });
         };
@@ -67,7 +71,6 @@ var Fs = require("fs"),
                     var path = p.slice(0).concat(k);
 
                     if (isCred(k)) {
-                        //console.log(o[k]);
                         L.push(f(o[k], path));
                     }
                     walk(o[k], path, f);

na/ca/ontario/kusoneko.moe.k

@@ -0,0 +1,20 @@
+{
+    "137.220.55.93:32307":{
+        "contact":"kusoneko@kusoneko.moe",
+        "gpg":"5F580A604D06074DF62435268FDECBBC178C72E1",
+        "location":"toronto",
+        "login":"public-peer",
+        "password":"242yl4g4nmu0rygusyhxu9xd13lrhuj",
+        "peerName":"kusoneko.moe",
+        "publicKey":"nvl82112jgj26sgv6r7sbuqc7wh1n7w1stsj327lbcu8n2yycf20.k"
+    },
+    "[2001:19f0:b001:379:5400:3ff:fe68:1cc6]:32307":{
+        "contact":"kusoneko@kusoneko.moe",
+        "gpg":"5F580A604D06074DF62435268FDECBBC178C72E1",
+        "location":"toronto",
+        "login":"public-peer",
+        "password":"242yl4g4nmu0rygusyhxu9xd13lrhuj",
+        "peerName":"kusoneko.moe",
+        "publicKey":"nvl82112jgj26sgv6r7sbuqc7wh1n7w1stsj327lbcu8n2yycf20.k"
+    }
+}

na/ca/ontario/linux1.tor1.watters.ws.k

@@ -0,0 +1,11 @@
+{
+    "165.227.44.84:34838":{
+        "contact":"wattersm@watters.ws",
+        "gpg":"E2A3328281D1DA0A08D34FC2058F0C51586CA8C6",
+        "location":"Digital Ocean tor1",
+        "login":"public-access",
+        "password":"8n2w2qu2lfndhgx8xwgp18vyq7fhvux",
+        "peerName":"linux1.tor1.watters.ws",
+        "publicKey":"b465hml7z3g1vj22ktqdrc3z17mwjxl44cg0mj903n9vycxzqpv0.k"
+    }
+}

na/ca/ontario/stash-crypto.k

@@ -0,0 +1,23 @@
+{
+    "149.56.19.79:55159":{
+        "contact":"infrastructure@stashcrypto.com",
+        "login":"default-login",
+        "password":"dgv86ktpblc2h4y93fsqpshcg2lbp5d",
+        "peerName":"git.stashcrypto.net",
+        "publicKey":"zbfurpx9n6whzwu6vrlfgmw8g56rmchfmhxxtpg0hwhl84vqf1y0.k"
+    },
+    "158.69.119.35:9218":{
+        "contact":"infrastructure@stashcrypto.com",
+        "login":"default-login",
+        "password":"w5huch4mn6tkgfp3j9sr8p8r13j3j33",
+        "peerName":"seed.stashcrypto.net",
+        "publicKey":"rzg61b3fsb675732g5rn8g1x61ypm1z7402n072qmrbbhgzm93f0.k"
+    },
+    "[2607:5300:61:44f::]:55159":{
+        "contact":"infrastructure@stashcrypto.com",
+        "login":"default-login",
+        "password":"dgv86ktpblc2h4y93fsqpshcg2lbp5d",
+        "peerName":"git.stashcrypto.net",
+        "publicKey":"zbfurpx9n6whzwu6vrlfgmw8g56rmchfmhxxtpg0hwhl84vqf1y0.k"
+    }
+}

na/ca/quebec/beauharnois/larynx.ventricle.us.k

@@ -0,0 +1,11 @@
+{
+    "149.56.98.167:3703":{
+        "contact":"code@ventricle.us",
+        "gpg":"7FE895160E3314027CD3B5D37392CF088BB4345C",
+        "location":"ovh beauharnois",
+        "login":"public-peer",
+        "password":"ppm6j89mgvss7uvtntcd9scy6166mwb",
+        "peerName":"larynx.ventricle.us",
+        "publicKey":"jg035j9hup776kwz1k4n0bwpggxp1qmts6t715x53g8vutxktzz0.k"
+    }
+}

na/us/california/computer-pig.k

@@ -0,0 +1,10 @@
+{
+    "97.90.35.107:55602":{
+        "contact":"happysmash27@protonmail.com",
+        "gpg":"1567396F2C90D234",
+        "login":"default-login",
+        "password":"4w386mlblb5rgypmh79gpft1l6vywj8",
+        "peerName":"computer-pig",
+        "publicKey":"fgyf3hnrygwlud6xp92n4q2b2h7qsghkmrrvcscrcmj7qb00c8s0.k"
+    }
+}

na/us/california/orange-county/yk3music.k

@@ -0,0 +1,20 @@
+{
+    "68.96.83.151:60405":{
+        "contact":"contact@yk3music.com",
+        "ipfs":"/tcp/4001/ipfs/QmZEiPvrfZHapq4uiyTDEcR2szCUhDnjdS4q3Uv2b1Uh88",
+        "ipv6":"fcbb:1db3:54fb:e519:d915:d7db:4893:4f30",
+        "organization":"Yk3 Music",
+        "password":"98b31ngx6mw2zcd4jwqycrkcp7jnc31",
+        "peerName":"yk3music-irvine",
+        "publicKey":"kllz76rusmyk3748yz3tgnv9xhtv08nd2nss31fjuwkgwf9hvys0.k"
+    },
+    "[2600:8802:2600:6b9:2c1a:7ece:f34a:a61a]:60405":{
+        "contact":"contact@yk3music.com",
+        "ipfs":"/tcp/4001/ipfs/QmZEiPvrfZHapq4uiyTDEcR2szCUhDnjdS4q3Uv2b1Uh88",
+        "ipv6":"fcbb:1db3:54fb:e519:d915:d7db:4893:4f30",
+        "organization":"Yk3 Music",
+        "password":"98b31ngx6mw2zcd4jwqycrkcp7jnc31",
+        "peerName":"yk3music-irvine",
+        "publicKey":"kllz76rusmyk3748yz3tgnv9xhtv08nd2nss31fjuwkgwf9hvys0.k"
+    }
+}

na/us/massachusetts/igel-massachusetts.usa.k

@@ -0,0 +1,16 @@
+{
+    "192.34.85.155:2359":{
+        "contact":"Igel@hyperboria.ca",
+        "gpg":"A84DFFE62B451511",
+        "password":"alfa-charlie-alfa-bravo",
+        "peerName":"igel-boston",
+        "publicKey":"rdxg1nzvmjdj4fyguqydmnl659p7m3x26r6un4ql966q4xt988j0.k"
+    },
+    "[2602:ff65:0:1::fc00]:2359":{
+        "contact":"Igel@hyperboria.ca",
+        "gpg":"A84DFFE62B451511",
+        "password":"alfa-charlie-alfa-bravo",
+        "peerName":"igel-boston",
+        "publicKey":"rdxg1nzvmjdj4fyguqydmnl659p7m3x26r6un4ql966q4xt988j0.k"
+    }
+}

na/us/newyork/cord.ventricle.us.k

@@ -1,18 +1,20 @@
 {
     "107.170.57.34:63472":{
         "contact":"code@ventricle.us",
+        "gpg":"7FE895160E3314027CD3B5D37392CF088BB4345C",
         "location":"digitalocean nyc2",
         "login":"public-peer",
         "password":"ppm6j89mgvss7uvtntcd9scy6166mwb",
-        "peerName":"Jacob Henner",
+        "peerName":"cord.ventricle.us",
         "publicKey":"1xkf13m9r9h502yuffsq1cg13s5648bpxrtf2c3xcq1mlj893s90.k"
     },
     "[2604:a880:0:1010::f:4001]:63472":{
         "contact":"code@ventricle.us",
+        "gpg":"7FE895160E3314027CD3B5D37392CF088BB4345C",
         "location":"digitalocean nyc2",
         "login":"public-peer",
         "password":"ppm6j89mgvss7uvtntcd9scy6166mwb",
-        "peerName":"Jacob Henner",
+        "peerName":"cord.ventricle.us",
         "publicKey":"1xkf13m9r9h502yuffsq1cg13s5648bpxrtf2c3xcq1mlj893s90.k"
     }
 }

na/us/northcarolina/charlotte/ic2.hellomouse.cf.k

@@ -0,0 +1,18 @@
+{
+    "185.140.54.73:30800":{
+        "contact":"iczero4@gmail.com",
+        "gpg":"613CE9DA0E9A3F70EC97760E4BAC4EBB8461FC7E",
+        "login":"public",
+        "password":"fwlmbx2f3udkd0ymknq4pwwgu2bjklx",
+        "peerName":"ic2.hellomouse.cf",
+        "publicKey":"c15sfmskdpmj2qw5lfvgfuzggyyk1bjzj4lu3yf6h1x2ckclwdd0.k"
+    },
+    "[2a05:dfc7:dfc8:1d3::1]:30800":{
+        "contact":"iczero4@gmail.com",
+        "gpg":"613CE9DA0E9A3F70EC97760E4BAC4EBB8461FC7E",
+        "login":"public",
+        "password":"fwlmbx2f3udkd0ymknq4pwwgu2bjklx",
+        "peerName":"ic2.hellomouse.cf",
+        "publicKey":"c15sfmskdpmj2qw5lfvgfuzggyyk1bjzj4lu3yf6h1x2ckclwdd0.k"
+    }
+}

na/us/texas/dallas.trnsz.k

@@ -0,0 +1,9 @@
+{
+    "198.58.100.240:22237":{
+        "contact":"jhj@trnsz.com",
+        "login":"default-login",
+        "password":"pqr5brz16vzzu6vhjuj7tv3n078kr5f",
+        "peerName":"trnsz",
+        "publicKey":"ubbtkp0txwjh44v8kkznvhjqqwr1hd2jzv5ms9zlkfk25svxvtg0.k"
+    }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hyperboria-peers",
-  "version": "1.0.4",
+  "version": "1.0.36",
   "description": "A geographically sorted list of public peering credentials for joining Hyperboria",
   "main": "index.js",
   "scripts": {

sa/br/saopaulo/sp.yetanothernerd.xyz.k

@@ -0,0 +1,10 @@
+{
+    "45.231.133.188:63319":{
+        "contact":"yangm97@gmail.com",
+        "gpg":"CC7D230C1C6ED7E2",
+        "login":"public",
+        "password":"40wr3r9l3l5f2p812mzy5bdd80xjb6k",
+        "peerName":"h.sp.yetanothernerd.xyz",
+        "publicKey":"9jjq45h13t7fdq2t8tdf59p6cplnv8un35dhmwjf032wmf3340w0.k"
+    }
+}

testAvailable.py

@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+"""Ping nodes and show unavailable."""
+import json
+import os
+import sys
+import subprocess
+
+RED    = '\x1b[01;31m'
+GREEN  = '\x1b[01;32m'
+YELLOW = '\x1b[01;33m'
+END    = '\x1b[0m'
+
+
+def validate(path):
+	"""Test a single set of peering creds."""
+	result = True
+	print("Pinging %s" % path)
+	try:
+		with open(path) as f:
+			for host in json.loads(f.read()):
+				if host[0] == '[': continue
+				ipv4 = host.split(':')[0]
+				res  = subprocess.call(['ping', '-c3', '-W5', ipv4], stdout=subprocess.DEVNULL)
+				if res:
+					print("    %s%s is failed%s" % (RED, ipv4, END))
+					result = False
+				else:
+					print("    %s%s is ok%s" % (GREEN, ipv4, END))
+	except ValueError:
+		print("    %sInvalid JSON!%s" % (RED, END))
+		result = False
+	except KeyboardInterrupt:
+		print("    %sInterrupt%s" % (RED, END))
+		sys.exit(1)
+	return result
+
+if __name__ == "__main__":
+	success = True
+	for directory, subdirs, files in os.walk('.'):
+		if len(files) > 0:
+			if directory != '.' and not directory.startswith('./.git'):
+				for f in files:
+					result = validate("%s/%s" % (directory, f))
+					if not result:
+						success = False
+	if not success:
+		sys.exit(1)

tests.js

@@ -19,6 +19,7 @@ var isIp = function (host) {
 
 var credsWithDns = Peers.filter(function (x, p) {
     return Object.keys(x).some(function (k) {
+        if (Array.isArray(x[k])) { return; }
         return !isIp(k);
     });
 });
@@ -36,24 +37,44 @@ if (credsWithDns.length) {
     * contact
 */
 
-var requiredFields = ['password', 'publicKey', 'contact'];
+var requiredFields = ['password', 'publicKey', 'contact', 'peerName'];
+var recommendedFields = ['gpg', 'peerName'];
 
 var insufficientFields = Peers.filter(function (x, p) {
     var problem = false;
-    Object.keys(x).map(function (k) {
+    var comment = false;
+
+    var path = '/' + p.join('/');
+
+    var requiredMsg = "[%s] => %s is missing the required field '%s'";
+    var recommendedMsg = "[%s] => '%s' is missing the recommended field '%s'";
+    Object.keys(x).forEach(function (k) {
+        if (Array.isArray(x[k])) { return; }
+
+
         var cred = x[k];
         var fields = Object.keys(cred);
-        requiredFields.forEach(function (field) {
+
-            if (fields.indexOf(field) === -1) {
+        recommendedFields.forEach(function (field) {
-                problem = true;
+            if (typeof(cred[field]) !== 'undefined') { return; }
-            }
+            console.log(recommendedMsg, path, k, field);
+            comment = true;
+            problem = true;
         });
+
+        requiredFields.forEach(function (field) {
+            if (typeof(cred[field]) !== 'undefined') { return; }
+            console.error(requiredMsg, path, k, field);
+            problem = true;
+        })
     });
+
+    //if (comment || problem) { console.log(); }
     return problem;
 });
 
 if (insufficientFields.length) {
-    console.log("The following peers did not have all the required fields");
+    //console.log("The following peers did not have all the required fields");
-    console.log(insufficientFields);
+    //console.log(insufficientFields);
 }
 

tests.py

@@ -4,8 +4,8 @@ import json
 import os
 import sys
 
-REQUIRED_FIELDS = ['publicKey', 'password', 'contact']
+REQUIRED_FIELDS = ['publicKey', 'password', 'contact', 'peerName']
-RECOMMENDED_FIELDS = ['gpg']
+RECOMMENDED_FIELDS = ['gpg', 'login']
 
 RED = '\x1b[01;31m'
 GREEN = '\x1b[01;32m'