aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitconfig6
-rw-r--r--terminaldweller.com/gemini/Dockerfile2
-rw-r--r--terminaldweller.com/gemini/docker-compose.yaml6
-rw-r--r--terminaldweller.com/gemini/index.gmi52
-rw-r--r--terminaldweller.com/main/srv/index.html1
5 files changed, 42 insertions, 25 deletions
diff --git a/.gitconfig b/.gitconfig
index 2d9922a..b468d4b 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -3,6 +3,7 @@
# Please adapt and uncomment the following lines:
name = terminaldweller
email = thabogre@gmail.com
+ signingkey = /home/devi/.ssh/id_rsa.pub
# https://stackoverflow.com/questions/1838873/visualizing-branch-topology-in-git
[color "decorate"]
@@ -123,3 +124,8 @@
diffFilter = diff-highlight
[core]
editor = vim
+ # hooksPath = ~/devi-githooks
+[commit]
+ gpgsign = true
+[gpg]
+ format = ssh
diff --git a/terminaldweller.com/gemini/Dockerfile b/terminaldweller.com/gemini/Dockerfile
index 0817979..1c576fd 100644
--- a/terminaldweller.com/gemini/Dockerfile
+++ b/terminaldweller.com/gemini/Dockerfile
@@ -9,5 +9,5 @@ RUN apk update \
&& apk add --no-cache cargo \
&& cargo install agate
#COPY --from=certbuilder /certs /certs
-COPY ./index.gmi /srv/index.gmi
+# COPY ./index.gmi /srv/index.gmi
#ENTRYPOINT ["agate"]
diff --git a/terminaldweller.com/gemini/docker-compose.yaml b/terminaldweller.com/gemini/docker-compose.yaml
index 6a3c7aa..42a8a88 100644
--- a/terminaldweller.com/gemini/docker-compose.yaml
+++ b/terminaldweller.com/gemini/docker-compose.yaml
@@ -16,5 +16,11 @@ services:
- CHOWN
- SETGID
- SETUID
+ volumes:
+ # we have to use the same cert because of TOFU
+ - certs:/.certificates/
+ - ./index.gmi:/srv/index.gmi:ro
networks:
agatenet:
+volumes:
+ certs:
diff --git a/terminaldweller.com/gemini/index.gmi b/terminaldweller.com/gemini/index.gmi
index 405bc7f..6e6d96c 100644
--- a/terminaldweller.com/gemini/index.gmi
+++ b/terminaldweller.com/gemini/index.gmi
@@ -5,13 +5,16 @@ This is a list of links:
The same links are available on IPFS on https://ipfs.terminaldweller.com[1] or on terminaldweller.eth[2]
WKD direct and advanced are setup on/for the domain.
-* GPG: 9E 20 46 4F 1C CF 3B 10 32 49 FA 93 A6 A0 F5 15 8B 38 81 DFj[3]
-* SSH: SHA256:tyuaTy005jkJOIPXkrJAAlCKD91d1ftEXzGTqjmEZh4[4]
-* IRC Libera[5]: terminaldweller FP:FEF763019F0799C1B5CD190FC89080240665CDCAE1CB889D4413775447A4826F48B18DC134D3ACDDE1D932CF3280E6026099857CF46177F1D87CD9AA859C615F
-* IRC OFTC[6]: terminaldweller FP:1072EFECA623C6E3D7A6628BEB6021F77EA2C876
-* IRC Tilde[7]: terminaldweller FP:1072EFECA623C6E3D7A6628BEB6021F77EA2C876
-* IRC Rizon[8]: terminaldweller FP:1072EFECA623C6E3D7A6628BEB6021F77EA2C876
+keyoxide[3]
+
+* GPG: 9E 20 46 4F 1C CF 3B 10 32 49 FA 93 A6 A0 F5 15 8B 38 81 DFj[4]
+* SSH: SHA256:tyuaTy005jkJOIPXkrJAAlCKD91d1ftEXzGTqjmEZh4[5]
+
+* IRC Libera[6]: terminaldweller FP:FEF763019F0799C1B5CD190FC89080240665CDCAE1CB889D4413775447A4826F48B18DC134D3ACDDE1D932CF3280E6026099857CF46177F1D87CD9AA859C615F
+* IRC OFTC[7]: terminaldweller FP:1072EFECA623C6E3D7A6628BEB6021F77EA2C876
+* IRC Tilde[8]: terminaldweller FP:1072EFECA623C6E3D7A6628BEB6021F77EA2C876
+* IRC Rizon[9]: terminaldweller FP:1072EFECA623C6E3D7A6628BEB6021F77EA2C876
XMPP: devi@jabber.terminaldweller.com
@@ -20,31 +23,32 @@ The order is significant:
* Email: thabogre@gmail.com
* Email: farzadsadeghi@protonmail.ch
-Github: terminaldweller[9]
+Github: terminaldweller[10]
-Mastodon: @terminaldweller@terminaldweller.com[10]
-If you cant find the handle then you need to log in. I'm not hosting my own mastodon instance. I'm just hosting my own webfinger. The actual handle is @terminaldweller@fosstodon.org[11]
+Mastodon: @terminaldweller@terminaldweller.com[11]
+If you cant find the handle then you need to log in. I'm not hosting my own mastodon instance. I'm just hosting my own webfinger. The actual handle is @terminaldweller@fosstodon.org[12]
-Git mirror: git.terminaldweller.com[12]
+Git mirror: git.terminaldweller.com[13]
-Blog: Blog[13] RSS[14]
+Blog: Blog[14] RSS[15]
-Linkedin[15]
+Linkedin[16]
Services: N/A
[1] https://ipfs.terminaldweller.com
[2] https://terminaldweller.eth.link
-[3] https://github.com/terminaldweller.gpg
-[4] https://github.com/terminaldweller.keys
-[5] https://libera.chat
-[6] https://oftc.net
-[7] https://tilde.chat
-[8] https://rizon.net
-[9] https://github.com/terminaldweller
-[10] https://fosstodon.org/@terminaldweller
+[3] https://keyoxide.org/hkp/9e20464f1ccf3b103249fa93a6a0f5158b3881df
+[4] https://github.com/terminaldweller.gpg
+[5] https://github.com/terminaldweller.keys
+[6] https://libera.chat
+[7] https://oftc.net
+[9] https://tilde.chat
+[9] https://rizon.net
+[10] https://github.com/terminaldweller
[11] https://fosstodon.org/@terminaldweller
-[12] https://git.terminaldweller.com
-[13] https://blog.terminaldweller.com
-[14] https://blog.terminaldweller.com/rss/feed
-[15] https://www.linkedin.com/in/farzad-sadeghi
+[12] https://fosstodon.org/@terminaldweller
+[13] https://git.terminaldweller.com
+[14] https://blog.terminaldweller.com
+[15] https://blog.terminaldweller.com/rss/feed
+[16] https://www.linkedin.com/in/farzad-sadeghi
diff --git a/terminaldweller.com/main/srv/index.html b/terminaldweller.com/main/srv/index.html
index 6c5e671..e66fdd3 100644
--- a/terminaldweller.com/main/srv/index.html
+++ b/terminaldweller.com/main/srv/index.html
@@ -19,6 +19,7 @@
<div>The page is available on IPFS on <a href="https://ipfs.terminaldweller.com">https://ipfs.terminaldweller.com</a> or on <a href="https://terminaldweller.eth.link">terminaldweller.eth</a></div>
<div>It's also available on <a href="gemini://gemini.terminaldweller.com">Gemini</a></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></p>
<div>
<div><a href="https://github.com/terminaldweller.gpg">GPG: 9E 20 46 4F 1C CF 3B 10 32 49 FA 93 A6 A0 F5 15 8B 38 81 DF</a></div>
<div><a href="https://github.com/terminaldweller.keys">SSH: SHA256:tyuaTy005jkJOIPXkrJAAlCKD91d1ftEXzGTqjmEZh4</a></div>