From 63e73928c0ced28f6f09175c5abd7f71c163fc6f Mon Sep 17 00:00:00 2001 From: Simon Marsh Date: Sat, 25 Nov 2023 23:39:02 +0000 Subject: [PATCH] new nodes --- content/network/IPAM.md | 17 +++++++++-------- content/services/shell.md | 22 +++++----------------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/content/network/IPAM.md b/content/network/IPAM.md index c00562b..da68e4e 100644 --- a/content/network/IPAM.md +++ b/content/network/IPAM.md @@ -45,7 +45,8 @@ IP address tables |traefik-na.burble.dn42|172.20.129.14|fd42:4242:2601:ac84::1|North America traefik cluster| | |_172.20.129.15-19_| |_Unallocated_| ||172.20.129.20/30|_n/a_|[Dialup Service](/retro/modem/) endpoints| -| |_172.20.129.24-26_| |_Unallocated_| +|shell.de-fra2.burble.dn42|172.20.129.24|fd42:4242:2601:100b:216:3eff:fe31:e5d6|de-fra2 shell service| +|shell.uk-lon4.burble.dn42|172.20.129.25|fd42:4242:2601:1005:_tbc_|uk-lon4 shell service| |shell.us-nyc2.burble.dn42|172.20.129.26|fd42:4242:2601:101d:216:3eff:fefc:722|us-nyc2 shell service| |shell.us-lax1.burble.dn42|172.20.129.27|fd42:4242:2601:100a:216:3eff:fe5c:30b2|us-lax1 shell service| |shell.fr-par1.burble.dn42|172.20.129.28|fd42:4242:2601:1017:216:3eff:fe01:2f1f|fr-par1 shell service| @@ -56,23 +57,23 @@ IP address tables |DNS|IPv4|IPv6|Comment| |:--|:--|:--|:--| |*unassigned* |172.20.129.164|fd42:4242:2601:3f::1|| -|*unassigned* |172.20.129.165|fd42:4242:2601:3a::1|| +|us-nyc3.burble.dn42 |172.20.129.165|fd42:4242:2601:3a::1|| |uk-lon2.burble.dn42 |172.20.129.166|fd42:4242:2601:2e::1|Private Node| |ca-bhs2.burble.dn42 |172.20.129.167|fd42:4242:2601:2d::1|*being decommissioned 2024*| -|*unassigned* |172.20.129.168|fd42:4242:2601:34::1|| +|nl-ams2.burble.dn42 |172.20.129.168|fd42:4242:2601:34::1|Private Node| |de-fra1.burble.dn42 |172.20.129.169|fd42:4242:2601:31::1|| |de-fra3.burble.dn42 |172.20.129.170|fd42:4242:2601:2c::1|| -|de-fra2.burble.d42 |172.20.129.171|fd42:4242:2601:2b::1|Private Node| +|de-fra2.burble.dn42 |172.20.129.171|fd42:4242:2601:2b::1|Private Node| |us-lax1.burble.dn42 |172.20.129.172|fd42:4242:2601:2a::1|| |ch-zur2.burble.dn42 |172.20.129.173|fd42:4242:2601:27::1|Private Node| |ch-zur1.burble.dn42 |172.20.129.174|fd42:4242:2601:28::1|| |us-nyc1.burble.dn42 |172.20.129.175|fd42:4242:2601:29::1|| |us-nyc2.burble.dn42 |172.20.129.176|fd42:4242:2601:3d::1|Private Node| -|*unassigned* |172.20.129.177|fd42:4242:2601:25::1|| -|*unassigned* |172.20.129.178|fd42:4242:2601:24::1|| +|uk-lon4.burble.dn42 |172.20.129.177|fd42:4242:2601:25::1|Private Node| +|uk-lon5.burble.dn42 |172.20.129.178|fd42:4242:2601:24::1|Private Node| |*unassigned* |172.20.129.179|fd42:4242:2601:23::1|| -|*unassigned* |172.20.129.180|fd42:4242:2601:38::1|| -|*unassigned* |172.20.129.181|fd42:4242:2601:37::1|| +|us-lax2.burble.dn42 |172.20.129.180|fd42:4242:2601:38::1|| +|de-nue1.burble.dn42 |172.20.129.181|fd42:4242:2601:37::1|Private Node| |*unassigned* |172.20.129.182|fd42:4242:2601:3e::1|| |*unassigned* |172.20.129.183|fd42:4242:2601:3c::1|| |uk-lon3.burble.dn42 |172.20.129.184|fd42:4242:2601:30::1|Private Node| diff --git a/content/services/shell.md b/content/services/shell.md index 3a6621d..02cb964 100644 --- a/content/services/shell.md +++ b/content/services/shell.md @@ -6,9 +6,10 @@ weight: 60 burble.dn42 provides shell accounts on the following servers: - shell.fr-par1.burble.dn42 -- shell.ca-bhs2.burble.dn42 - shell.us-lax1.burble.dn42 - shell.us-nyc2.burble.dn42 +- shell.uk-lon4.burble.dn42 +- shell.de-fra2.burble.dn42 There is also an anycast address [shell.burble.dn42](https://shell.burble.dn42) that will route to the closest server. @@ -49,10 +50,6 @@ Your home directory is created automatically on first access and will then persist across logins. Home directories are *not* replicated across servers. -### Web SSH Client - -You can also connect to the shell servers via [sshwifty](https://sshwifty.burble.dn42/). - ## Key Services ### Installed Packages @@ -75,13 +72,14 @@ and CGI (`~/public_html/cgi-bin/`) enabled. The webserver is accessed over https and has a dn42 certificate. - `https://shell.fr-par1.burble.dn42/~/` -- `https://shell.ca-bhs2.burble.dn42/~/` - `https://shell.us-lax1.burble.dn42/~/` - `https://shell.us-nyc2.burble.dn42/~/` +- `https://shell.uk-lon4.burble.dn42/~/` +- `https://shell.de-fra2.burble.dn42/~/` - `https://shell.burble.dn42/~/` {{}} -Remember that any files need to be accessible by the webserver +Remember that any files need to be accessible by the webserver, which runs as user/group www-data/www-data; CGI scripts must also be executable. The default umask of 077 means that the webserver won't be able to read your public_html folder or any files within it without changing permissions. @@ -170,16 +168,6 @@ There are also a small number of X11 apps installed on the servers: ssh -X shell.burble.dn42 -f 'xterm & xeyes' ``` -### Performance Monitoring - -Some of the shell servers are monitored using netdata and prometheus, with -performance graphs available in [grafana](https://grafana.burble.dn42). - -The netdata dashboard is also directly accessible: - -- [http://shell.fr-par1.burble.dn42:19999](http://shell.fr-par1.burble.dn42:19999) -- [http://shell.ca-bhs2.burble.dn42:19999](http://shell.ca-bhs2.burble.dn42:19999) - ### Integration with S3 object storage The shell servers include [rclone](https://rclone.org/) which can be used to access