aboutsummaryrefslogtreecommitdiffstats
path: root/terminaldweller.com
diff options
context:
space:
mode:
Diffstat (limited to 'terminaldweller.com')
-rw-r--r--terminaldweller.com/cargo/docker-compose.yaml3
-rw-r--r--terminaldweller.com/cargo/nginx.conf4
-rwxr-xr-xterminaldweller.com/gophernicus/run.sh3
-rw-r--r--terminaldweller.com/limnoria/docker-compose.yaml18
-rw-r--r--terminaldweller.com/lokinet/docker-compose.yaml20
-rw-r--r--terminaldweller.com/lokinet/nginx.conf22
-rw-r--r--terminaldweller.com/main/nginx.conf1
-rw-r--r--terminaldweller.com/main/srv/index.html199
-rw-r--r--terminaldweller.com/matterbridge/docker-compose.yml13
-rw-r--r--terminaldweller.com/matterbridge/matterbridge.toml35
-rw-r--r--terminaldweller.com/privatebin/docker-compose.yaml3
-rw-r--r--terminaldweller.com/privatebin/nginx.conf6
-rw-r--r--terminaldweller.com/rss-bridge/docker-compose.yaml3
-rw-r--r--terminaldweller.com/rss-bridge/nginx.conf6
-rwxr-xr-xterminaldweller.com/sopel/run.sh9
-rwxr-xr-xterminaldweller.com/update_main.sh33
-rw-r--r--terminaldweller.com/yggdrasil/docker-compose.yaml20
-rw-r--r--terminaldweller.com/yggdrasil/nginx.conf22
18 files changed, 354 insertions, 66 deletions
diff --git a/terminaldweller.com/cargo/docker-compose.yaml b/terminaldweller.com/cargo/docker-compose.yaml
index 7cbb5d9..61eccb5 100644
--- a/terminaldweller.com/cargo/docker-compose.yaml
+++ b/terminaldweller.com/cargo/docker-compose.yaml
@@ -12,7 +12,8 @@ services:
volumes:
- ./nginx.conf:/etc/nginx/nginx.conf:ro
- /home/ubuntu/cargo:/cargo
- - /etc/letsencrypt/archive/cargo.terminaldweller.com/:/certs/
+ - /etc/letsencrypt/live/cargo.terminaldweller.com/fullchain.pem:/etc/letsencrypt/live/cargo.terminaldweller.com/fullchain.pem:ro
+ - /etc/letsencrypt/live/cargo.terminaldweller.com/privkey.pem:/etc/letsencrypt/live/cargo.terminaldweller.com/privkey.pem:ro
cap_drop:
- ALL
cap_add:
diff --git a/terminaldweller.com/cargo/nginx.conf b/terminaldweller.com/cargo/nginx.conf
index bec87f2..467de67 100644
--- a/terminaldweller.com/cargo/nginx.conf
+++ b/terminaldweller.com/cargo/nginx.conf
@@ -8,8 +8,8 @@ http {
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
ssl_ciphers HIGH:!aNULL:!MD5:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
ssl_prefer_server_ciphers on;
- ssl_certificate /certs/fullchain1.pem;
- ssl_certificate_key /certs/privkey1.pem;
+ ssl_certificate /etc/letsencrypt/live/cargo.terminaldweller.com/fullchain.pem;
+ ssl_certificate_key /etc/letsencrypt/live/cargo.terminaldweller.com/privkey.pem;
ssl_protocols TLSv1.2 TLSv1.3;
add_header Content-Security-Policy "default-src 'self';";
add_header X-Frame-Options SAMEORIGIN always;
diff --git a/terminaldweller.com/gophernicus/run.sh b/terminaldweller.com/gophernicus/run.sh
new file mode 100755
index 0000000..9c8502a
--- /dev/null
+++ b/terminaldweller.com/gophernicus/run.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+docker run --hostname gopher.terminaldweller.com -p 70:70 -v .:/var/gopher joshkaiju/gophernicus
diff --git a/terminaldweller.com/limnoria/docker-compose.yaml b/terminaldweller.com/limnoria/docker-compose.yaml
new file mode 100644
index 0000000..d8d0fef
--- /dev/null
+++ b/terminaldweller.com/limnoria/docker-compose.yaml
@@ -0,0 +1,18 @@
+version: "3"
+services:
+ limnoria:
+ image: lscr.io/linuxserver/limnoria:latest
+ container_name: limnoria
+ environment:
+ - PUID=1000
+ - PGID=1000
+ - TZ=Etc/UTC
+ volumes:
+ - ./config:/config
+ ports:
+ - 127.0.0.1:8080:8080
+ restart: unless-stopped
+ networks:
+ - limnorianet
+networks:
+ limnorianet:
diff --git a/terminaldweller.com/lokinet/docker-compose.yaml b/terminaldweller.com/lokinet/docker-compose.yaml
new file mode 100644
index 0000000..3a6d001
--- /dev/null
+++ b/terminaldweller.com/lokinet/docker-compose.yaml
@@ -0,0 +1,20 @@
+version: "3"
+services:
+ nginx:
+ image: nginx:stable
+ networks:
+ - mainnet
+ ports:
+ - "172.16.0.1:80:80"
+ restart: unless-stopped
+ volumes:
+ - ./nginx.conf:/etc/nginx/nginx.conf:ro
+ - ./srv:/srv:ro
+ cap_drop:
+ - ALL
+ cap_add:
+ - CHOWN
+ - SETGID
+ - SETUID
+networks:
+ mainnet:
diff --git a/terminaldweller.com/lokinet/nginx.conf b/terminaldweller.com/lokinet/nginx.conf
new file mode 100644
index 0000000..c8e6ad9
--- /dev/null
+++ b/terminaldweller.com/lokinet/nginx.conf
@@ -0,0 +1,22 @@
+events {
+ worker_connections 1024;
+}
+http {
+ server {
+ listen 80;
+ keepalive_timeout 70;
+ add_header Content-Security-Policy "default-src 'self';";
+ add_header X-Frame-Options SAMEORIGIN always;
+ add_header X-Content-Type-Options "nosniff" always;
+ add_header X-XSS-Protection "1; mode=block" always;
+ add_header Referrer-Policy "no-referrer";
+ sendfile on;
+ tcp_nopush on;
+
+ location / {
+ root /srv/;
+ add_header Access-Control-Allow-Origin "*";
+ add_header Content-Disposition "inline";
+ }
+ }
+}
diff --git a/terminaldweller.com/main/nginx.conf b/terminaldweller.com/main/nginx.conf
index 3801219..e4f047f 100644
--- a/terminaldweller.com/main/nginx.conf
+++ b/terminaldweller.com/main/nginx.conf
@@ -59,6 +59,7 @@ http {
location / {
root /srv/;
add_header Access-Control-Allow-Origin "*";
+ add_header Content-Disposition "inline";
}
}
}
diff --git a/terminaldweller.com/main/srv/index.html b/terminaldweller.com/main/srv/index.html
index 8f90c05..83fbfe4 100644
--- a/terminaldweller.com/main/srv/index.html
+++ b/terminaldweller.com/main/srv/index.html
@@ -23,76 +23,165 @@
-o-hyphens:auto;
hyphens:auto;
}
+ ::selection {
+ background: #5f875f;
+ color: #000000;
+ }
+ h3 {
+ margin: 2px;
+ }
+ .line {
+ border-bottom: thin solid #00af87;
+ width: 50%;
+ margin-left: auto;
+ margin-right: auto;
+ }
+ .fingerprint {
+ color: #5f87d7;
+ }
+ .fingerprint::selection {
+ color: #000000;
+ background: #5f87d7;
+ }
+ .pseudolink {
+ user-select: all;
+ }
</style>
</head>
- <body style="color:#005f87;background:#000000;text-align:center;padding:0px;border:0px;margin:0px;font-family:mono;">
- <p style="font-size:20px;font-weight:bold;padding:0px;border:0px;margin:0px;">This is a list of links:</p>
- <p>
+ <body style="color:#005f87;background:#000000;text-align:center;padding:0px;border:0px;margin:0px;font-family:mono;border:solid;">
+ <h2>LIST OF LINKS</h2>
+ <p class="line">
+ <div style="color: #005f00;font-weight: bold;">
+ Timestamp: Tue Apr 18 03:55:01 PM UTC 2023
+ </div>
+ </p>
+ <p class="line">
<div>This page is available on:</div>
- <div><a href="https://terminaldweller.com">web2</a> - <span style="user-select: all;">https://terminaldweller.com</span></div>
- <div>IPFS from <a href="https://ipfs.terminaldweller.com">https://ipfs.terminaldweller.com</a> or from <a href="https://terminaldweller.eth.link">terminaldweller.eth</a></div>
- <div>On <a href="gemini://gemini.terminaldweller.com">Gemini</a> - <span style="user-select: all;">gemini://gemini.terminaldweller.com</span></div>
- <div><a href="http://iedzwh5v2vouywqy4eak3eu33amfn3rzhdcln7j4r5kcyvf46cea.b32.i2p/">i2p mirror</a> - <span style="user-select: all;">http://iedzwh5v2vouywqy4eak3eu33amfn3rzhdcln7j4r5kcyvf46cea.b32.i2p</span></div>
- <div><a href="http://dqunl5rzlv6skqfklqr4dwi4zph2vqoaennc7qoinqs5mlug4docq2yd.onion/">tor mirror</a> - <span style="user-select: all;">http://dqunl5rzlv6skqfklqr4dwi4zph2vqoaennc7qoinqs5mlug4docq2yd.onion</span></div>
- <p>WKD direct and advanced are setup on/for the domain.</p>
- <p>
- <div><a href="https://keyoxide.org/hkp/9e20464f1ccf3b103249fa93a6a0f5158b3881df">keyoxide</a></div>
- <div>I don't use all the accounts listed on keyoxide regularly. The preferred methods of contacting me are the ones that are listed here, IRC, email and XMPP (The order is not significant).</div>
+ <div><a href="https://terminaldweller.com">web2</a> - &lt;<span class="pseudolink">https://terminaldweller.com</span>&gt;</div>
+ <div><a href="https://ipfs.terminaldweller.com">IPFS</a> - <span class="pseudolink">https://ipfs.terminaldweller.com</span> or <span class="pseudolink">terminaldweller.eth</span></div>
+ <div><a href="gemini://gemini.terminaldweller.com">gemini</a> - <span class="pseudolink">gemini://gemini.terminaldweller.com</span></div>
+ <div><a href="http://iedzwh5v2vouywqy4eak3eu33amfn3rzhdcln7j4r5kcyvf46cea.b32.i2p/">i2p mirror</a> - <span class="pseudolink">http://iedzwh5v2vouywqy4eak3eu33amfn3rzhdcln7j4r5kcyvf46cea.b32.i2p</span></div>
+ <div><a href="http://dqunl5rzlv6skqfklqr4dwi4zph2vqoaennc7qoinqs5mlug4docq2yd.onion/">tor mirror</a> - <span class="pseudolink">http://dqunl5rzlv6skqfklqr4dwi4zph2vqoaennc7qoinqs5mlug4docq2yd.onion</span></div>
+ <div><a href="http://[21e:cd57:a147:322a:723b:a322:e4c8:c26e]/">yggdrasil</a> - <span class="pseudolink">http://[21e:cd57:a147:322a:723b:a322:e4c8:c26e]</span></div>
+ <div><a href="http://fyqzoraakwjwkj48cmp4ho8gy9k3hdk67stjb8z34d1u3p9urtgy.loki">lokinet</a> - <span class="pseudolink">http://fyqzoraakwjwkj48cmp4ho8gy9k3hdk67stjb8z34d1u3p9urtgy.loki</span></div>
+ <div><a href="gopher://gopher.terminaldweller.com">gopher</a> - <span class="pseudolink">gopher://gopher.terminaldweller.com</span></div>
+ </p>
+ <p class="line">
+ <h3>WKD <a class="plus" href="https://wiki.gnupg.org/WKD" style="color: #005f00;text-decoration: none;">+</a></h3>
+ <div>WKD direct and advanced are setup on/for the domain.</div>
+ </p>
+ <p class="line">
+ <h3>OpenAlias <a href="https://openalias.org/" style="color: #005f00;text-decoration: none;">+</a></h3>
+ <div>OpenAlias records are set for the domain.</div>
+ </p>
+ <p class="line">
+ <h3>Keyoxide <a href="https://keyoxide.org/" style="color: #005f00;text-decoration: none">+</a></h3>
+ <div><a href="https://keyoxide.org/hkp/9e20464f1ccf3b103249fa93a6a0f5158b3881df">keyoxide</a> - <span class="pseudolink">https://keyoxide.org/hkp/9e20464f1ccf3b103249fa93a6a0f5158b3881df</span></div>
+ <div>I don't use all the accounts listed on the PGP pubkey regularly. The preferred methods of contacting me are the ones that are listed here, IRC, email and XMPP (The order is not significant).</div>
+ <br/>
+ <div>Proofs that are expected to fail:</div>
+ <ul style="display: table;margin: 0 auto;">
+ <li>IRC OFTC</li>
+ <li>IRC Rizon</li>
+ <li>IRC Tilde</li>
+ <li>Opencollective</li>
+ </ul>
</p>
<div>
- <div>PGP FP: <span style="user-select: all;">9E20464F1CCF3B103249FA93A6A0F5158B3881DF</span> - <a href="https://github.com/terminaldweller.gpg">github</a>, <a href="https://gitlab.com/terminaldweller.gpg">gitlab</a>, <a href="https://codeberg.org/terminaldweller.gpg">codeberg</a>, <a href="keys/gpg_pubkey">self-hosted</a></div>
- <div>I manually upload my PGP key to <a href="https://keys.openpgp.org">https://keys.openpgp.org</a> and <a href="https://pgp.mit.edu/">https://pgp.mit.edu/</a>.</div>
- <div>SSH FP: <span style="user-select: all;">SHA256:tyuaTy005jkJOIPXkrJAAlCKD91d1ftEXzGTqjmEZh4</span> - <a href="https://github.com/terminaldweller.keys">github</a>, <a href="https://gitlab.com/terminaldweller.keys">gitlab</a>, <a href="https://codeberg.org/terminaldweller.keys">codeberg</a>, <a href="keys/id_rsa_pub">self-hosted</a></div>
- <p>
- <div>IRC:</div>
- <div><a href="https://libera.chat">Libera</a>: terminaldweller FP:<span style="user-select: all;">FEF763019F0799C1B5CD190FC89080240665CDCAE1CB889D4413775447A4826F48B18DC134D3ACDDE1D932CF3280E6026099857CF46177F1D87CD9AA859C615F</span></div>
- <div><a href="https://oftc.net/">OFTC</a>: terminaldweller FP:<span style="user-select: all;">1072EFECA623C6E3D7A6628BEB6021F77EA2C876</span></div>
- <div><a href="https://rizon.net/">Rizon</a>: terminaldweller FP:<span style="user-select: all;">1072EFECA623C6E3D7A6628BEB6021F77EA2C876</span></div>
- <div><a href="https://tilde.chat/">Tilde</a>: terminaldweller FP:<span style="user-select: all;">1072EFECA623C6E3D7A6628BEB6021F77EA2C876</span></div>
- <div><a href="https://bnet.eu.org/">Bonobonet</a>: terminaldweller FP:<span style="user-select: all;">5e3bd8ab6f8c6f6a614d4b2245fd6b5737a6e59917c6719de62b55bac77b978c</span></div>
- <div>You can also find me on Libera, OFTC and Rizon in ##terminaldweller.</div>
+ <p class="line">
+ <h3>PGP Key: devi@terminaldweller.com</h3>
+ <div>PGP FP: <span class="fingerprint pseudolink">9E20464F1CCF3B103249FA93A6A0F5158B3881DF</span></div>
+ <div><a href="https://github.com/terminaldweller.gpg">github</a> - <span class="pseudolink">https://github.com/terminaldweller.gpg</span></div>
+ <div><a href="https://gitlab.com/terminaldweller.gpg">gitlab</a> - <span class="pseudolink">https://gitlab.com/terminaldweller.gpg</span></div>
+ <div><a href="https://codeberg.org/terminaldweller.gpg">codeberg</a> - <span class="pseudolink">https://codeberg.org/terminaldweller.gpg</span></div>
+ <div><a href="keys/gpg_pubkey">self-hosted</a></div>
+ <div>I manually upload the PGP key to <a href="https://keys.openpgp.org">https://keys.openpgp.org</a> and <a href="https://pgp.mit.edu/">https://pgp.mit.edu/</a> as well.</div>
+ <div>The PGP key you get from Codeberg will be a bit different since Codeberg requires you to sign a random string first before verifying your PGP public key.</div>
+ <br/>
+ <div style="font-weight: bold;">I try to keep the key updated but due to keyoxide shenanigans, from time to time, the key might be missing some packets.</div>
+ </p>
+ <p class="line">
+ <h3>SSH Key</h3>
+ <div>SSH FP: <span class="fingerprint pseudolink">SHA256:tyuaTy005jkJOIPXkrJAAlCKD91d1ftEXzGTqjmEZh4</span></div>
+ <div><a href="https://github.com/terminaldweller.keys">github</a> - <span class="pseudolink">https://github.com/terminaldweller.keys</span></div>
+ <div><a href="https://gitlab.com/terminaldweller.keys">gitlab</a> - <span class="pseudolink">https://gitlab.com/terminaldweller.keys</span></div>
+ <div><a href="https://codeberg.org/terminaldweller.keys">codeberg</a> - <span class="pseudolink">https://codeberg.org/terminaldweller.keys</span></div>
+ <div><a href="keys/id_rsa_pub">self-hosted</a></div>
+ </p>
+ <p class="line">
+ <h3>PGP key: thabogre@gmail.com</h3>
+ <div>PGP FP: <span class="fingerprint pseudolink">FB3E38C3D7C6C07C66A4E3AD4041446A786EBAB4</span></div>
+ <div><a href="keys/gmail_gpg_pubkey">self-hosted</a></div>
+ <div>I manually upload the PGP key to <a href="https://keys.openpgp.org">https://keys.openpgp.org</a> and <a href="https://pgp.mit.edu/">https://pgp.mit.edu/</a> as well.</div>
+ </p>
+ <p class="line">
+ <h3>PGP key: bloodstalker@zoho.com</h3>
+ <div>PGP FP: <span class="fingerprint pseudolink">1501CFE6C731BA61BE6BC065F4241FB7ACBB40E1</span></div>
+ <div><a href="keys/zoho_gpg_pubkey">self-hosted</a></div>
+ <div>I manually upload the PGP key to <a href="https://keys.openpgp.org">https://keys.openpgp.org</a> and <a href="https://pgp.mit.edu/">https://pgp.mit.edu/</a> as well.</div>
+ </p>
+ <p class="line">
+ <h3>IRC</h3>
+ <div><a href="https://libera.chat">Libera</a>: terminaldweller FP: <span class="fingerprint pseudolink">FEF763019F0799C1B5CD190FC89080240665CDCAE1CB889D4413775447A4826F48B18DC134D3ACDDE1D932CF3280E6026099857CF46177F1D87CD9AA859C615F</span></div>
+ <div><a href="https://oftc.net/">OFTC</a>: terminaldweller FP: <span class="fingerprint pseudolink">1072EFECA623C6E3D7A6628BEB6021F77EA2C876</span></div>
+ <div><a href="https://rizon.net/">Rizon</a>: terminaldweller FP: <span class="fingerprint pseudolink">1072EFECA623C6E3D7A6628BEB6021F77EA2C876</span></div>
+ <div><a href="https://tilde.chat/">Tilde</a>: terminaldweller FP: <span class="fingerprint pseudolink">1072EFECA623C6E3D7A6628BEB6021F77EA2C876</span></div>
+ <div><a href="https://bnet.eu.org/">Bonobonet</a>: terminaldweller FP: <span class="fingerprint pseudolink">5e3bd8ab6f8c6f6a614d4b2245fd6b5737a6e59917c6719de62b55bac77b978c</span></div>
+ <br/>
+ <div>You can also find me on Libera, OFTC and Rizon in ##terminaldweller.</div>
</p>
</div>
+ <p class="line">
+ <h3>XMPP</h3>
+ <div><span class="pseudolink">devi@jabber.terminaldweller.com</span></div>
+ <div><span class="pseudolink">devi@draugr.de</span></div>
+ <br/>
+ <div>(currently I do not have OMEMO, just OTR)</div>
</p>
- <p>
- <div>XMPP:</div>
- <div><span style="user-select: all;">devi@jabber.terminaldweller.com</span></div>
- <div><span style="user-select: all;">devi@draugr.de</span></div>
- </p>
- <p>
- <div>Email:</div>
+ <p class="line">
+ <h3>Email</h3>
<div style="font-weight:bold;">(the order is significant)</div>
- <div><span style="user-select: all;">devi@terminaldweller.com</span></div>
- <div><span style="user-select: all;">thabogre@gmail.com</span></div>
- <div><span style="user-select: all;">bloodstalker@zoho.com</span></div>
- <div><span style="user-select: all;">farzadsadeghi@protonmail.ch</span></div>
+ <div><span class="pseudolink">devi@terminaldweller.com</span></div>
+ <div><span class="pseudolink">thabogre@gmail.com</span></div>
+ <div><span class="pseudolink">bloodstalker@zoho.com</span></div>
+ <div><span class="pseudolink">farzadsadeghi@protonmail.ch</span></div>
+ <br/>
<div>All emails have the ssh and pgp key fingerprints as signature. You can ask for one.</div>
- <div>I sign all emails, unless I receive an encrypted email in which case, I will also encrypt the response.</div>
+ <div>For emails, I have adopted a "polite" policy. I sign all emails, unless I receive an encrypted email in which case, I will also encrypt the response.</div>
</p>
- <p>
- <div>Matrix:</div>
- <div><a href="https://matrix.to/#/@devi:terminaldweller.com">@devi:terminaldweller.com</a></div>
- <div><a href="https://matrix.to/#/@terminaldweller:matrix.org">@terminaldweller:matrix.org</a></div>
+ <p class="line">
+ <h3>Matrix</h3>
+ <div><a href="https://matrix.to/#/@devi:terminaldweller.com">@devi:terminaldweller.com</a> - <span class="pseudolink">https://matrix.to/#/@devi:terminaldweller.com</span></div>
+ <div><a href="https://matrix.to/#/@terminaldweller:matrix.org">@terminaldweller:matrix.org</a> - <span class="pseudolink">https://matrix.to/#/@terminaldweller:matrix.org</span></div>
</p>
- <p>
- <div>OpenID: <a href="https://launchpad.net/~terminaldweller">https://launchpad.net/~terminaldweller</a></div>
+ <p class="line">
+ <h3>OpenID</h3>
+ <div>OpenID: <a href="https://launchpad.net/~terminaldweller">https://launchpad.net/~terminaldweller</a> - <span class="pseudolink">https://launchpad.net/~terminaldweller</span></div>
</p>
- <p>
- <div>Git:</div>
- <div><a href="https://github.com/terminaldweller">github.com/terminaldweller</a></div>
+ <p class="line">
+ <h3>Git</h3>
+ <div><a href="https://github.com/terminaldweller">github.com/terminaldweller</a> - <span class="pseudolink">https://github.com/terminaldweller</span></div>
<div>Mirrors:</div>
- <div><a href="https://git.terminaldweller.com">git.terminaldweller.com</a></div>
- <div><a href="https://codeberg.org/terminaldweller">codeberg.org/terminaldweller</a></div>
- <div><a href="https://gitlab.com/terminaldweller">gitlab.com/terminaldweller</a></div>
+ <div><a href="https://git.terminaldweller.com">git.terminaldweller.com</a> - <span class="pseudolink">https://git.terminaldweller.com</span></div>
+ <div><a href="https://codeberg.org/terminaldweller">codeberg.org/terminaldweller</a> - <span class="pseudolink">https://codeberg.org/terminaldweller</span></div>
+ <div><a href="https://gitlab.com/terminaldweller">gitlab.com/terminaldweller</a> - <span class="pseudolink">https://gitlab.com/terminaldweller</span></div>
</p>
- <p>
- <div>Mastodon:</div>
- <div><a href="https://pleroma.terminaldweller.com/users/devi">@devi@pleroma.terminaldweller.com</a></div>
- <div><a href="https://fosstodon.org/@terminaldweller">@terminaldweller@fosstodon.com</a></div>
+ <p class="line">
+ <h3>Mastodon</h3>
+ <div><a href="https://pleroma.terminaldweller.com/users/devi">@devi@pleroma.terminaldweller.com</a> - <span class="pseudolink">https://pleroma.terminaldweller.com/users/devi</span></div>
+ <div><a href="https://fosstodon.org/@terminaldweller">@terminaldweller@fosstodon.com</a> - <span class="pseudolink">https://fosstodon.org/@terminaldweller</span></div>
+ </p>
+ <p class="line">
+ <h3>Blog</h3>
+ <div style="text-align: &quote|&quote|center;"><a href="https://blog.terminaldweller.com">Blog</a> - <span class="pseudolink">https://blog.terminaldweller.com</span> | <a href="https://blog.terminaldweller.com/rss/feed">RSS</a> - <span class="pseudolink">https://blog.terminaldweller.com/rss/feed</span></div>
+ </p>
+ <p class="line">
+ <h3>Linkedin</h3>
+ <div><a href="https://www.linkedin.com/in/farzad-sadeghi/">Linkedin</a> - <span class="pseudolink">https://www.linkedin.com/in/farzad-sadeghi</span></div>
+ </p>
+ <p class="line">
+ <h3>Services</h3>
+ <div>N/A</div>
</p>
- <p>Blog: <a href="https://blog.terminaldweller.com">Blog</a> <a href="https://blog.terminaldweller.com/rss/feed">RSS</a></p>
- <div>
- <div>Services: N/A</div>
- </div>
</body>
</html>
diff --git a/terminaldweller.com/matterbridge/docker-compose.yml b/terminaldweller.com/matterbridge/docker-compose.yml
new file mode 100644
index 0000000..6edaff5
--- /dev/null
+++ b/terminaldweller.com/matterbridge/docker-compose.yml
@@ -0,0 +1,13 @@
+version: '3'
+services:
+ matterbridge:
+ image: 42wim/matterbridge:1.26
+ volumes:
+ - ./matterbridge.toml:/etc/matterbridge/matterbridge.toml:ro
+ networks:
+ - matternet
+ restart: unless-stopped
+ labels:
+ - traefik.enable=false
+networks:
+ matternet:
diff --git a/terminaldweller.com/matterbridge/matterbridge.toml b/terminaldweller.com/matterbridge/matterbridge.toml
new file mode 100644
index 0000000..4ee98a3
--- /dev/null
+++ b/terminaldweller.com/matterbridge/matterbridge.toml
@@ -0,0 +1,35 @@
+[general]
+RemoteNickFormat="[{PROTOCOL}/{BRIDGE}] <{NICK}> "
+
+[matrix.matrix]
+Server="https://matrix.org"
+Login="termibot"
+Password="" #pragma: allowlist secret
+NoHomeServerSuffix=true
+
+[matrix.terminaldweller]
+Server="https://matrix.terminaldweller.com"
+Login="devi"
+Password="" #pragma: allowlist secret
+NoHomeServerSuffix=true
+
+[irc.devinet]
+Nick=""
+NickServNick=""
+NickServPassword="" #pragma: allowlist secret
+Server="irc.terminaldweller.com:6697"
+UseTLS=true
+UseSASL=true
+SkipTLSVerify=false
+
+[[gateway]]
+ name="gate_one"
+ enable=true
+
+ [[gateway.in]]
+ account="matrix.matrix"
+ channel="#doipver:matrix.org"
+
+ [[gateway.inout]]
+ account="irc.devinet"
+ channel="#matterbridge"
diff --git a/terminaldweller.com/privatebin/docker-compose.yaml b/terminaldweller.com/privatebin/docker-compose.yaml
index c6f97e3..4e1d482 100644
--- a/terminaldweller.com/privatebin/docker-compose.yaml
+++ b/terminaldweller.com/privatebin/docker-compose.yaml
@@ -31,7 +31,8 @@ services:
- NET_BIND_SERVICE
volumes:
- ./nginx.conf:/etc/nginx/nginx.conf:ro
- - /etc/letsencrypt/archive/pastebin.terminaldweller.com/:/certs/:ro
+ - /etc/letsencrypt/live/pastebin.terminaldweller.com/fullchain.pem:/etc/letsencrypt/live/pastebin.terminaldweller.com/fullchain.pem:ro
+ - /etc/letsencrypt/live/pastebin.terminaldweller.com/privkey.pem:/etc/letsencrypt/live/pastebin.terminaldweller.com/privkey.pem:ro
networks:
privatebinnet:
volumes:
diff --git a/terminaldweller.com/privatebin/nginx.conf b/terminaldweller.com/privatebin/nginx.conf
index 78b0bc5..cb4004e 100644
--- a/terminaldweller.com/privatebin/nginx.conf
+++ b/terminaldweller.com/privatebin/nginx.conf
@@ -9,8 +9,8 @@ http {
listen 443 ssl;
keepalive_timeout 60;
charset utf-8;
- ssl_certificate /certs/fullchain1.pem;
- ssl_certificate_key /certs/privkey1.pem;
+ ssl_certificate /etc/letsencrypt/live/pastebin.terminaldweller.com/fullchain.perm;
+ ssl_certificate_key /etc/letsencrypt/live/pastebin.terminaldweller.com/privkey.perm;
ssl_ciphers HIGH:!aNULL:!MD5:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
ssl_protocols TLSv1.3;
ssl_session_cache shared:SSL:50m;
@@ -30,7 +30,7 @@ http {
# resolver 9.9.9.9 208.67.222.222;
# ssl_stapling on;
# ssl_stapling_verify on;
- ssl_trusted_certificate /certs/cert1.pem;
+ # ssl_trusted_certificate /certs/cert1.pem;
error_page 401 403 404 /404.html;
location / {
diff --git a/terminaldweller.com/rss-bridge/docker-compose.yaml b/terminaldweller.com/rss-bridge/docker-compose.yaml
index 4ddf7e1..eba20d4 100644
--- a/terminaldweller.com/rss-bridge/docker-compose.yaml
+++ b/terminaldweller.com/rss-bridge/docker-compose.yaml
@@ -33,6 +33,7 @@ services:
- NET_BIND_SERVICE
volumes:
- ./nginx.conf:/etc/nginx/nginx.conf:ro
- - /etc/letsencrypt/archive/rssgen.terminaldweller.com/:/certs/:ro
+ - /etc/letsencrypt/live/rssgen.terminaldweller.com/fullchain.pem:/etc/letsencrypt/live/rssgen.terminaldweller.com/fullchain.pem:ro
+ - /etc/letsencrypt/live/rssgen.terminaldweller.com/privkey.pem:/etc/letsencrypt/live/rssgen.terminaldweller.com/privkey.pem:ro
networks:
rssbridgenet:
diff --git a/terminaldweller.com/rss-bridge/nginx.conf b/terminaldweller.com/rss-bridge/nginx.conf
index b80883b..a6588e9 100644
--- a/terminaldweller.com/rss-bridge/nginx.conf
+++ b/terminaldweller.com/rss-bridge/nginx.conf
@@ -9,8 +9,8 @@ http {
listen 443 ssl;
keepalive_timeout 60;
charset utf-8;
- ssl_certificate /certs/fullchain1.pem;
- ssl_certificate_key /certs/privkey1.pem;
+ ssl_certificate /etc/letsencrypt/live/rssgen.terminaldweller.com/fullchain.pem;
+ ssl_certificate_key /etc/letsencrypt/live/rssgen.terminaldweller.com/privkey.pem;
ssl_ciphers HIGH:!aNULL:!MD5:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
ssl_protocols TLSv1.2 TLSv1.3;
ssl_session_cache shared:SSL:50m;
@@ -30,7 +30,7 @@ http {
# resolver 9.9.9.9 208.67.222.222;
# ssl_stapling on;
# ssl_stapling_verify on;
- ssl_trusted_certificate /certs/cert1.pem;
+ # ssl_trusted_certificate /certs/cert1.pem;
error_page 401 403 404 /404.html;
location / {
diff --git a/terminaldweller.com/sopel/run.sh b/terminaldweller.com/sopel/run.sh
new file mode 100755
index 0000000..0f305e8
--- /dev/null
+++ b/terminaldweller.com/sopel/run.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+docker run \
+ -e PUID=1000 \
+ -e PGID=1000 \
+ -v ./.sopel/:/home/sopel/.sopel/ \
+ -e EXTRA_PYPI_PACKAGES="sopel-modules.weather sopel-modules.cryptocurrency sopel-modules.urban" \
+ -ti \
+ sopelirc/sopel
diff --git a/terminaldweller.com/update_main.sh b/terminaldweller.com/update_main.sh
new file mode 100755
index 0000000..3b0afcb
--- /dev/null
+++ b/terminaldweller.com/update_main.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+set -ex
+
+# PROXY="proxychains4 -q -f ~/proxies/ice/proxychains.conf"
+PROXY=""
+
+# GPG
+gpg2 --export --armor devi@terminaldweller.com > gpg_pubkey
+gpg2 --export devi@terminaldweller.com > gpg_pubkey.asc
+mv ./gpg_pubkey ./main/srv/keys/
+mv ./gpg_pubkey.asc ./main/srv/.well-known/openpgpkey/hu/
+
+gpg2 --export --armor thabogre@gmail.com > gmail_gpg_pubkey
+mv ./gmail_gpg_pubkey ./main/srv/keys/
+
+gpg2 --export --armor bloodstalker@zoho.com > zoho_gpg_pubkey
+mv ./zoho_gpg_pubkey ./main/srv/keys/
+
+# main
+#lokinet
+${PROXY} scp -r -P 3333 ./main/srv/ ubuntu@185.130.45.46:/home/ubuntu/snapp/
+#yggdrasil
+${PROXY} scp -r -P 3333 ./main/srv/ ubuntu@185.130.47.208:/home/ubuntu/snapp/
+#web2/tor/i2p
+${PROXY} scp -r -P 3333 ./main/srv/ ubuntu@185.130.47.208:/home/ubuntu/terminaldweller.com/
+#gopher
+pandoc --from html --to plain --reference-links --reference-location=block --columns=70 -o ./index.txt ./main/srv/index.html
+${PROXY} scp -P 3333 ./index.txt ubuntu@185.130.47.81:/home/ubuntu/gophers/
+rm ./index.txt
+#gemini
+~/devi/html2gmi.git/master/html2gmi -m -t -l 1000 -i ~/scripts/terminaldweller.com/main/srv/index.html > index.gmi
+${PROXY} scp -4 -P 3333 ./index.gmi ubuntu@jump8.terminaldweller.com:/home/ubuntu/gemini/srv/
+rm ./index.gmi
diff --git a/terminaldweller.com/yggdrasil/docker-compose.yaml b/terminaldweller.com/yggdrasil/docker-compose.yaml
new file mode 100644
index 0000000..5dd0c4c
--- /dev/null
+++ b/terminaldweller.com/yggdrasil/docker-compose.yaml
@@ -0,0 +1,20 @@
+version: "3"
+services:
+ nginx:
+ image: nginx:stable
+ networks:
+ - mainnet
+ ports:
+ - "[21e:cd57:a147:322a:723b:a322:e4c8:c26e]:80:80"
+ restart: unless-stopped
+ volumes:
+ - ./nginx.conf:/etc/nginx/nginx.conf:ro
+ - ./srv:/srv:ro
+ cap_drop:
+ - ALL
+ cap_add:
+ - CHOWN
+ - SETGID
+ - SETUID
+networks:
+ mainnet:
diff --git a/terminaldweller.com/yggdrasil/nginx.conf b/terminaldweller.com/yggdrasil/nginx.conf
new file mode 100644
index 0000000..c8e6ad9
--- /dev/null
+++ b/terminaldweller.com/yggdrasil/nginx.conf
@@ -0,0 +1,22 @@
+events {
+ worker_connections 1024;
+}
+http {
+ server {
+ listen 80;
+ keepalive_timeout 70;
+ add_header Content-Security-Policy "default-src 'self';";
+ add_header X-Frame-Options SAMEORIGIN always;
+ add_header X-Content-Type-Options "nosniff" always;
+ add_header X-XSS-Protection "1; mode=block" always;
+ add_header Referrer-Policy "no-referrer";
+ sendfile on;
+ tcp_nopush on;
+
+ location / {
+ root /srv/;
+ add_header Access-Control-Allow-Origin "*";
+ add_header Content-Disposition "inline";
+ }
+ }
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 23:49:22 +0000