add dedicated paul.buetow.org capsule

3 files changed, 16 insertions, 22 deletions

diff --git a/frontends/etc/httpd.conf.tpl b/frontends/etc/httpd.conf.tpl
index 5084545..42a2104 100644
--- a/frontends/etc/httpd.conf.tpl
+++ b/frontends/etc/httpd.conf.tpl
@@ -30,7 +30,7 @@ server "<%= "$hostname.$domain" %>" {
 }
 
 # Gemtexter hosts
-<% for my $host (qw/foo.zone snonux.land/) { %>
+<% for my $host (qw/foo.zone snonux.land paul.buetow.org/) { %>
 server "<%= $prefix.$host %>" {
   listen on * tls port 443
   tls {
@@ -44,6 +44,18 @@ server "<%= $prefix.$host %>" {
 }
 <% } %>
 
+# buetow.org special host
+server "<%= $prefix %>buetow.org" {
+  listen on * tls port 443
+  tls {
+    certificate "/etc/ssl/<%= $prefix %>buetow.org.fullchain.pem"
+    key "/etc/ssl/private/<%= $prefix %>buetow.org.key"
+  }
+  location * {
+    block return 302 "https://<%= $prefix %>paul.buetow.org"
+  }
+}
+
 # DTail special host
 server "<%= $prefix %>dtail.dev" {
   listen on * tls port 443
@@ -82,25 +94,6 @@ server "<%= $prefix %>dory.buetow.org" {
   }
 }
 
-# buetow.org special host.
-server "<%= $prefix %>buetow.org" {
-  listen on * tls port 443
-  tls {
-    certificate "/etc/ssl/<%= $prefix %>buetow.org.fullchain.pem"
-    key "/etc/ssl/private/<%= $prefix %>buetow.org.key"
-  }
-  block return 302 "https://paul.buetow.org"
-}
-
-server "<%= $prefix %>paul.buetow.org" {
-  listen on * tls port 443
-  tls {
-    certificate "/etc/ssl/<%= $prefix %>paul.buetow.org.fullchain.pem"
-    key "/etc/ssl/private/<%= $prefix %>paul.buetow.org.key"
-  }
-  block return 302 "https://foo.zone/contact-information.html"
-}
-
 server "<%= $prefix %>tmp.buetow.org" {
   listen on * tls port 443
   tls {
diff --git a/frontends/etc/relayd.conf.tpl b/frontends/etc/relayd.conf.tpl
index 4d702be..1f3e60f 100644
--- a/frontends/etc/relayd.conf.tpl
+++ b/frontends/etc/relayd.conf.tpl
@@ -7,8 +7,9 @@ log connection
 
 tcp protocol "gemini" {
     tls keypair <%= $prefix %>foo.zone
-    tls keypair <%= $prefix %>buetow.org
     tls keypair <%= $prefix %>snonux.land
+    tls keypair <%= $prefix %>buetow.org
+    tls keypair <%= $prefix %>paul.buetow.org
     tls keypair snonux.de
 }
 
diff --git a/frontends/scripts/gemtexter.sh.tpl b/frontends/scripts/gemtexter.sh.tpl
index 649396b..e62d050 100644
--- a/frontends/scripts/gemtexter.sh.tpl
+++ b/frontends/scripts/gemtexter.sh.tpl
@@ -23,7 +23,7 @@ function ensure_site {
     fi
 }
 
-for site in foo.zone snonux.land; do 
+for site in foo.zone snonux.land paul.buetow.org; do
     ensure_site \
         /var/gemini/$site \
         https://codeberg.org/snonux/$site \