From c14126bdb3cebec42e9e8216d360b724228df222 Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Wed, 13 Jul 2022 13:29:58 +0100
Subject: small improvements for paul and tmp subdomains

---
 frontends/etc/httpd.conf.tpl | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

(limited to 'frontends/etc')

diff --git a/frontends/etc/httpd.conf.tpl b/frontends/etc/httpd.conf.tpl
index c536766..013e779 100644
--- a/frontends/etc/httpd.conf.tpl
+++ b/frontends/etc/httpd.conf.tpl
@@ -64,25 +64,27 @@ server "<%= $prefix %>buetow.org" {
     certificate "/etc/ssl/<%= $prefix %>buetow.org.fullchain.pem"
     key "/etc/ssl/private/<%= $prefix %>buetow.org.key"
   }
-  root "/htdocs/buetow.org"
-  location match "/tmp/.*" {
-    directory auto index
-  }
-  location match "/.*" {
-    block return 302 "https://paul.buetow.org"
-  }
+  block return 302 "https://paul.buetow.org"
 }
 
-<% if ($primary) { %>
-server "paul.buetow.org" {
+server "<%= $prefix %>paul.buetow.org" {
   listen on * tls port 443
   tls {
-    certificate "/etc/ssl/paul.buetow.org.fullchain.pem"
-    key "/etc/ssl/private/paul.buetow.org.key"
+    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 {
+    certificate "/etc/ssl/<%= $prefix %>tmp.buetow.org.fullchain.pem"
+    key "/etc/ssl/private/<%= $prefix %>tmp.buetow.org.key"
+  }
+  root "/htdocs/buetow.org/tmp"
+  directory auto index
+}
 
 # Legacy hosts
 server "snonux.de" {
-- 
cgit v1.2.3