From 560285e7c9dbbfc6a6035da454dda5c5f8d809ae Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Mon, 25 Mar 2019 18:04:52 +0000 Subject: [PATCH] Normalise the public peers repo --- README.md | 30 +++++++++++++- asia/japan.md | 8 ++-- europe/czechia.md | 11 +---- europe/finland.md | 6 +-- europe/france.md | 39 +++++++----------- europe/germany.md | 18 ++++----- europe/netherlands.md | 27 +++++-------- europe/poland.md | 8 ++-- europe/romania.md | 11 +---- europe/russia.md | 7 +--- europe/sweden.md | 5 ++- europe/ukraine.md | 7 +--- europe/united-kingdom.md | 9 ++--- north-america/canada.md | 10 ++--- north-america/united-states.md | 73 ++++++++++++++-------------------- oceania/australia.md | 16 +++----- other/i2p.md | 8 +--- other/tor.md | 17 +++----- south-america/brazil.md | 7 +--- 19 files changed, 133 insertions(+), 184 deletions(-) diff --git a/README.md b/README.md index 420c086..1c24570 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,31 @@ # Public Peers -This repository contains peering information for publicly accessible nodes on the Yggdrasil network. +This repository contains peering information for publicly accessible nodes on +the Yggdrasil network. If you are new to the network then this is a good place +to start in order to get connected. -In most cases, public peers should be accessible by adding the string provided for each peer to the `Peers: [],` list of your config file (comma separated). +In most cases, public peers should be accessible by adding the string provided +for each peer to the `Peers: []` section of your `yggdrasil.conf` configuration +file. + +Example in `yggdrasil.conf`: +``` +Peers: +[ + tcp://a.b.c.d:e + tcp://d.c.b.a:e + tcp://[a:b:c::d]:e + tcp://[d:c:b::a]:e +] +``` + +### How do I pick peers? + +Always try to pick peers that are as close to you geographically as possible, as +this will keep the latency of the network down. + +If you are using a home connection then you should avoid peering with any nodes +that are far away, as you may end up carrying traffic for the rest of the +network. + +For normal usage, you probably only need 2 or 3 peers. diff --git a/asia/japan.md b/asia/japan.md index 23c3060..6b13f66 100644 --- a/asia/japan.md +++ b/asia/japan.md @@ -2,8 +2,6 @@ Add the strings from the below to the `Peers: [],` list of your config file (comma separated) to connect to these nodes. -Tokyo, operated by [BAN AI Systems](https://ban.ai/) - -`"139.162.119.37:44478"` - -`"[2400:8902::f03c:91ff:fe1f:c32a]:44478"` +* Tokyo, operated by [BAN AI Systems](https://ban.ai/) + * `tcp://139.162.119.37:44478` + * `tcp://[2400:8902::f03c:91ff:fe1f:c32a]:44478` diff --git a/europe/czechia.md b/europe/czechia.md index 4887366..e64196f 100644 --- a/europe/czechia.md +++ b/europe/czechia.md @@ -3,13 +3,4 @@ Add the strings from the list below to the `Peers: [],` list of your config file (comma separated) to connect to these nodes. * *PEER IS DOWN CURRENTLY* Prague, awnet.cz, operated by [carnhofdaki](https://github.com/carnhofdaki) - * `"94.230.156.206:9000"` - -Example: - -``` - Peers: - [ - tcp://94.230.156.206:9000 - ] -``` + * `tcp://94.230.156.206:9000` diff --git a/europe/finland.md b/europe/finland.md index 01e8aff..ea8d8b9 100644 --- a/europe/finland.md +++ b/europe/finland.md @@ -3,8 +3,8 @@ Add the strings from the below to the `Peers: [],` list of your config file (comma separated) to connect to these nodes. * Ulvila, operated by [ano](https://github.com/ano0) - * `"tcp://185.87.111.202:8080"` + * `tcp://185.87.111.202:8080` * Tuusula, Hetzner, operated by [sin](https://2f30.org) - * `"tcp://95.216.146.86:12080"` - * `"tcp://[2a01:4f9:c010:afa::2f30]:12080"` + * `tcp://95.216.146.86:12080` + * `tcp://[2a01:4f9:c010:afa::2f30]:12080` diff --git a/europe/france.md b/europe/france.md index b6768e7..541158f 100644 --- a/europe/france.md +++ b/europe/france.md @@ -2,32 +2,23 @@ Add the strings from the below to the `Peers: [],` list of your config file (comma separated) to connect to these nodes. -Gravelines, operated by [Philly Mesh](https://phillymesh.net) +* Gravelines, operated by [Philly Mesh](https://phillymesh.net) + * `tcp://37.187.124.224:12345` + * `tcp://[2001:41d0:a:f5e0::1]:12345` -`"37.187.124.224:12345"` +* Paris, operated by [Arceliar](https://github.com/Arceliar) + * `tcp://51.15.204.214:12345` -`"[2001:41d0:a:f5e0::1]:12345"` +* Paris, operated by [yakamo](https://github.com/yakamok) + * `tcp://51.15.205.147:62071` -Paris, operated by [Arceliar](https://github.com/Arceliar) +* Roubaix, OVH, operated by [cwinfo](https://cwinfo.net) and [cwchristerw](https://christerwaren.fi) + * `tcp://51.255.223.60:64982` + * `tcp://[2001:41d0:2:c44a:51:255:223:60]:64982` -`"51.15.204.214:12345"` +* Strasbourg, OVH, operated by [cwinfo](https://cwinfo.net) and [cwchristerw](https://christerwaren.fi) + * `tcp://46.105.92.61:62506` + * `tcp://[2001:41d0:401:3000::4227]:62506` -Paris, operated by [yakamo](https://github.com/yakamok) - -`"51.15.205.147:62071"` - -Roubaix, OVH, operated by [cwinfo](https://cwinfo.net) and [cwchristerw](https://christerwaren.fi) - -`"51.255.223.60:64982"` - -`"[2001:41d0:2:c44a:51:255:223:60]:64982"` - -Strasbourg, OVH, operated by [cwinfo](https://cwinfo.net) and [cwchristerw](https://christerwaren.fi) - -`"46.105.92.61:62506"` - -`"[2001:41d0:401:3000::4227]:62506"` - -Paris, operated by [frafra](https://frafra.eu) - -`"[2001:bc8:4400:2500::22:b13]:35033"` +* Paris, operated by [frafra](https://frafra.eu) + * `tcp://[2001:bc8:4400:2500::22:b13]:35033` diff --git a/europe/germany.md b/europe/germany.md index 7229dfa..ffbb6a6 100644 --- a/europe/germany.md +++ b/europe/germany.md @@ -3,18 +3,18 @@ Add the strings from the below to the `Peers: [],` list of your config file (comma separated) to connect to these nodes. * Limburg, OVH, less then 1ms from Frankfurt, operated by [jcgruenhage](https://jcg.re/) - * `"51.75.65.46:65352"` - + * `tcp://51.75.65.46:65352` + * Limburg, OVH, operated by [cwinfo](https://cwinfo.net) and [cwchristerw](https://christerwaren.fi) - * `"54.38.157.232:37145"` - * `"[2001:41d0:701:1100::36e]:37145"` + * `tcp://54.38.157.232:37145` + * `tcp://[2001:41d0:701:1100::36e]:37145` * Baden-Baden, IONOS, operated by [jcgruenhage](https://jcg.re/) - * `"82.165.69.111:61216"` + * `tcp://82.165.69.111:61216` -* Frankfurt, DigitalOcean, operated by [Mikaela](https://mikaela.info/) - * `"tcp://46.101.250.19:48286"` - * `"tcp://[2a03:b0c0:3:d0::31f:d001]:48286"` +* Frankfurt, DigitalOcean, operated by [Mikaela](https://mikaela.info/) + * `tcp://46.101.250.19:48286` + * `tcp://[2a03:b0c0:3:d0::31f:d001]:48286` * Falkenstein, Hetzner, FSN1-DC7, operated by [Kipari](https://christoffer.space) - * `tcp://5.9.112.248:39444` + * `tcp://5.9.112.248:39444` diff --git a/europe/netherlands.md b/europe/netherlands.md index c182e63..430b448 100644 --- a/europe/netherlands.md +++ b/europe/netherlands.md @@ -2,23 +2,16 @@ Add the strings from the below to the `Peers: [],` list of your config file (comma separated) to connect to these nodes. -Amsterdam, operated by [TechInc](https://techinc.nl) +* Amsterdam, operated by [TechInc](https://techinc.nl) + * `tcp://195.169.146.32:55060` -`"195.169.146.32:55060"` +* Amsterdam, operated by [Piele / CreativeServer.Net](https://github.com/petertambach) + * `tcp://85.17.15.221:35239` + * `tcp://[2001:1af8:4700:a119:7::1]:35239` -Amsterdam, operated by [Piele / CreativeServer.Net](https://github.com/petertambach) - -`"85.17.15.221:35239"` - -`"[2001:1af8:4700:a119:7::1]:35239"` - -Amsterdam, operated by [Philly Mesh](https://phillymesh.net) - -`"146.185.176.36:12345"` - -`"[2a03:b0c0:0:1010::1a7:c001]:12345"` - -Amsterdam, operated by [Rostyslav Sotnychenko](https://github.com/rsotnychenko) - -`tcp://ams1.y.sota.sh:8080` (both IPv4 and IPv6 are supported) +* Amsterdam, operated by [Philly Mesh](https://phillymesh.net) + * `tcp://146.185.176.36:12345` + * `tcp://[2a03:b0c0:0:1010::1a7:c001]:12345` +* Amsterdam, operated by [Rostyslav Sotnychenko](https://github.com/rsotnychenko) + * `tcp://ams1.y.sota.sh:8080` (both IPv4 and IPv6 are supported) diff --git a/europe/poland.md b/europe/poland.md index d5f2699..879e3ff 100644 --- a/europe/poland.md +++ b/europe/poland.md @@ -2,8 +2,6 @@ Add the strings from the below to the `Peers: [],` list of your config file (comma separated) to connect to these nodes. -Warsaw, OVH, operated by [cwinfo](https://cwinfo.net) and [cwchristerw](https://christerwaren.fi) - -`"54.37.137.221:37145"` - -`"[2001:41d0:601:1100::cf2]:37145"` +* Warsaw, OVH, operated by [cwinfo](https://cwinfo.net) and [cwchristerw](https://christerwaren.fi) + * `tcp://54.37.137.221:37145` + * `tcp://[2001:41d0:601:1100::cf2]:37145` diff --git a/europe/romania.md b/europe/romania.md index e2b7752..4023018 100644 --- a/europe/romania.md +++ b/europe/romania.md @@ -3,13 +3,4 @@ Add the strings from the list below to the `Peers: [],` list of your config file (comma separated) to connect to these nodes. * Server Room, operated by [evgiv](https://github.com/evgivz) - * `"185.105.4.249:37414"` - -Example: - -``` - Peers: - [ - tcp://185.105.4.249:37414 - ] -``` + * `tcp://185.105.4.249:37414` diff --git a/europe/russia.md b/europe/russia.md index 68a9f9b..18dccef 100644 --- a/europe/russia.md +++ b/europe/russia.md @@ -2,11 +2,8 @@ Add the strings from the below to the `Peers: [],` list of your config file (comma separated) to connect to these nodes. - * [Network neighborhood](http://netwhood.online) public node, Moscow Oblast, Podolsk, ALDIS Telecom Ltd, operated by [abslimit](http://netwhood.online/feedback/) - - * `tcp://46.151.26.194:60575` (IPv4 only) + * `tcp://46.151.26.194:60575` * Saratov, DOM.RU, operated by [void.net.in](https://void.net.in) - * `tcp://void.net.in:1666` (IPv4 only) - + * `tcp://void.net.in:1666` diff --git a/europe/sweden.md b/europe/sweden.md index 77757e3..a2146c9 100644 --- a/europe/sweden.md +++ b/europe/sweden.md @@ -3,6 +3,7 @@ Add the strings from the below to the `Peers: [],` list of your config file (comma separated) to connect to these nodes. * Luleå, Norrbotten, operated by [William](https://willeponken.me/) - * `"tcp://bohr.willeponken.me:42015"` + * `tcp://bohr.willeponken.me:42015` + * Stockholm, presummably, operated by [kaos](https://cryptoanarchy.org/) - * `"tcp://yggdrasil.cryptoanarchy.org:1478"` + * `tcp://yggdrasil.cryptoanarchy.org:1478` diff --git a/europe/ukraine.md b/europe/ukraine.md index 6377a1d..d933b05 100644 --- a/europe/ukraine.md +++ b/europe/ukraine.md @@ -2,8 +2,5 @@ Add the strings from the below to the `Peers: [],` list of your config file (comma separated) to connect to these nodes. - -Kiev, operated by [Rostyslav Sotnychenko](https://github.com/rsotnychenko) - -`tcp://ukr1.y.sota.sh:8080` (IPv4 only) - +* Kiev, operated by [Rostyslav Sotnychenko](https://github.com/rsotnychenko) + * `tcp://ukr1.y.sota.sh:8080` (IPv4 only) diff --git a/europe/united-kingdom.md b/europe/united-kingdom.md index 4f46b9f..4bbc786 100644 --- a/europe/united-kingdom.md +++ b/europe/united-kingdom.md @@ -2,9 +2,8 @@ Add the strings from the below to the `Peers: [],` list of your config file (comma separated) to connect to these nodes. -London, operated by [neilalexander](https://github.com/neilalexander) +### England -``` -tcp://185.164.138.18:1001 -tcp://[2a06:8ec0:0:3027::1]:1001 -``` +* London, operated by [neilalexander](https://github.com/neilalexander) + * `tcp://185.164.138.18:1001` + * `tcp://[2a06:8ec0:0:3027::1]:1001` diff --git a/north-america/canada.md b/north-america/canada.md index aa2dc42..6c6dea3 100644 --- a/north-america/canada.md +++ b/north-america/canada.md @@ -2,10 +2,8 @@ Add the strings from the below to the `Peers: [],` list of your config file (comma separated) to connect to these nodes. -## Ontario +### Ontario -Toronto, operated by [deprecated.systems](https://deprecated.systems) - -`"104.248.104.141:59168"` - -`"[2604:a880:cad:d0::45:d001]:59168"` +* Toronto, operated by [deprecated.systems](https://deprecated.systems) + * `tcp://104.248.104.141:59168` + * `tcp://[2604:a880:cad:d0::45:d001]:59168` diff --git a/north-america/united-states.md b/north-america/united-states.md index 1f53cd7..b20711f 100644 --- a/north-america/united-states.md +++ b/north-america/united-states.md @@ -2,60 +2,45 @@ Add the strings from the below to the `Peers: [],` list of your config file (comma separated) to connect to these nodes. -## Massachusetts +### Massachusetts -Boston, operated by [Stephen304](https://github.com/stephen304) +* Boston, operated by [Stephen304](https://github.com/stephen304) + * `tcp://50.236.201.218:56088` -`"50.236.201.218:56088"` +### Nevada -## Nevada +* Las Vegas, operated by [santost12](https://github.com/santost12) + * `tcp://199.175.54.202:47313` + * `tcp://[2607:8b00:0:96::ac18:1f8]:47313` -Las Vegas, operated by [santost12](https://github.com/santost12) +### New Jersey -`"199.175.54.202:47313"` +* Newark, operated by [Philly Mesh](https://phillymesh.net) + * `tcp://45.76.166.128:12345` + * `tcp://[2001:19f0:5:6ed:5400:ff:fe5f:94f7]:12345` -`"[2607:8b00:0:96::ac18:1f8]:47313"` +* Piscataway, operated by [Asymptote Club](https://asymptote.club) + * `tcp://45.77.107.150:34660` + * `tcp://[2001:19f0:5:2c95:5400:1ff:fe46:9c]:34660` + * `tcp://63.209.33.47:58149` + * `tcp://[2001:19f0:5:2a83:5400:1ff:fe89:44db]:58149` -## New Jersey +### Kansas -Newark, operated by [Philly Mesh](https://phillymesh.net) +* Lenexa, operated by [jcgruenhage](https://jcg.re) + * `tcp://108.175.10.127:61216` -`"45.76.166.128:12345"` +### Texas -`"[2001:19f0:5:6ed:5400:ff:fe5f:94f7]:12345"` +* Dallas, operated by [BAN AI Systems](https://ban.ai/) + * `"198.58.100.240:44478` + * `"[2600:3c00::f03c:91ff:feae:3efa]:44478` -Piscataway, operated by [Asymptote Club](https://asymptote.club) +* Dallas, operated by [neutralinsomniac](https://github.com/neutralinsomniac) + * `tcp://104.225.221.17:59323` -`"45.77.107.150:34660"` +### Washington -`"[2001:19f0:5:2c95:5400:1ff:fe46:9c]:34660"` - -`"63.209.33.47:58149"` - -`"[2001:19f0:5:2a83:5400:1ff:fe89:44db]:58149"` - -## Kansas - -Lenexa, operated by [jcgruenhage](https://jcg.re) - -`"108.175.10.127:61216"` - -## Texas - -Dallas, operated by [BAN AI Systems](https://ban.ai/) - -`"198.58.100.240:44478"` - -`"[2600:3c00::f03c:91ff:feae:3efa]:44478"` - -Dallas, operated by [neutralinsomniac](https://github.com/neutralinsomniac) - -`"104.225.221.17:59323"` - -## Washington - -Seattle, operated by [Philly Mesh](https://phillymesh.net) - -`"167.88.124.177:12345"` - -`"[2604:180:1:568::beef]:12345"` +* Seattle, operated by [Philly Mesh](https://phillymesh.net) + * `tcp://167.88.124.177:12345` + * `tcp://[2604:180:1:568::beef]:12345` diff --git a/oceania/australia.md b/oceania/australia.md index 6c4f4f0..3c02c14 100644 --- a/oceania/australia.md +++ b/oceania/australia.md @@ -2,14 +2,10 @@ Add the strings from the below to the `Peers: [],` list of your config file (comma separated) to connect to these nodes. -Sydney, operated by passenger245 +* Sydney, operated by passenger245 + * `tcp://103.25.58.141:23320` + * `tcp://[2406:d500:6:beef:21a2:a10c:6aea:0001]:23320` -`"tcp://103.25.58.141:23320"` - -`"tcp://[2406:d500:6:beef:21a2:a10c:6aea:0001]:23320"` - -Perth, operated by passenger245 - -`"tcp://45.248.78.75:17220"` - -`"tcp://[2404:f780:8:beef:29e2:81e1:3c73:0001]:17220"` +* Perth, operated by passenger245 + * `tcp://45.248.78.75:17220` + * `tcp://[2404:f780:8:beef:29e2:81e1:3c73:0001]:17220` diff --git a/other/i2p.md b/other/i2p.md index 2497a63..bcf12d9 100644 --- a/other/i2p.md +++ b/other/i2p.md @@ -2,9 +2,5 @@ Note that the following assumes i2p is running locally and has configured SOCKS proxy on `localhost:4447`. -## Nodes - -ST32 (TCP-only, Standard I2P service, b32 address), operated by [cathugger](http://cathugger.i2p/contact.html) - -`"socks://localhost:4447/7mx6ztmimo5nrnmydjjtkr6maupknr3zlyr33umly22pqnivyxcq.b32.i2p:46944"` - +* ST32 (TCP-only, Standard I2P service, b32 address), operated by [cathugger](http://cathugger.i2p/contact.html) + * `socks://localhost:4447/7mx6ztmimo5nrnmydjjtkr6maupknr3zlyr33umly22pqnivyxcq.b32.i2p:46944` diff --git a/other/tor.md b/other/tor.md index 11e5fe7..582f235 100644 --- a/other/tor.md +++ b/other/tor.md @@ -2,16 +2,11 @@ Note that the following assumes tor is running locally and listening on the default `localhost:9050`. -## Nodes +* HS2 (TCP-only, Hidden Service, v2), operated by [Jeff](https://i2p.rocks/contact.txt) + * `socks://localhost:9050/syr3orvfo5nxmao3.onion:40329` -HS2 (TCP-only, Hidden Service, v2), operated by [Jeff](https://i2p.rocks/contact.txt) +* HS3 (TCP-only, Hidden Service, v3), operated by [cathugger](http://cathug2kyi4ilneggumrenayhuhsvrgn6qv2y47bgeet42iivkpynqad.onion/contact.html) + * `socks://localhost:9050/yggnekkmyitzepgl5ltdl277y5wdg36n4pc45sualo3yesm3usnuwyad.onion:1863` -`"socks://localhost:9050/syr3orvfo5nxmao3.onion:40329"` - -HS3 (TCP-only, Hidden Service, v3), operated by [cathugger](http://cathug2kyi4ilneggumrenayhuhsvrgn6qv2y47bgeet42iivkpynqad.onion/contact.html) - -`"socks://localhost:9050/yggnekkmyitzepgl5ltdl277y5wdg36n4pc45sualo3yesm3usnuwyad.onion:1863"` - -HS3 (TCP-only, Hidden Service, v3), operated by [Mikaela](https://mikaela.info/) - -`"socks://127.0.0.1:9050/xvkw4rj7wzy7t75kkanr54zftudlbtpjbavxcsri5irkavclynaw3xqd.onion:1234"` +* HS3 (TCP-only, Hidden Service, v3), operated by [Mikaela](https://mikaela.info/) + * `socks://127.0.0.1:9050/xvkw4rj7wzy7t75kkanr54zftudlbtpjbavxcsri5irkavclynaw3xqd.onion:1234` diff --git a/south-america/brazil.md b/south-america/brazil.md index d006404..499ff71 100644 --- a/south-america/brazil.md +++ b/south-america/brazil.md @@ -2,8 +2,5 @@ Add the strings from the below to the `Peers: [],` list of your config file (comma separated) to connect to these nodes. -## São Paulo - -São Paulo, operated by [Yan Minari](https://yetanothernerd.xyz/) - -`"45.231.133.188:58301"` +* São Paulo, operated by [Yan Minari](https://yetanothernerd.xyz/) + * `tcp://45.231.133.188:58301`