refactor httpd conf - also, acme is not used

1 files changed, 27 insertions, 39 deletions

diff --git a/openbsd/frontends/etc/httpd.conf b/openbsd/frontends/etc/httpd.conf
index fc75c97..e5411b7 100644
--- a/openbsd/frontends/etc/httpd.conf
+++ b/openbsd/frontends/etc/httpd.conf
@@ -1,5 +1,11 @@
 server "snonux.de" {
 	alias "www.snonux.de"
+	listen on * port 80
+	block return 302 "https://snonux.de"
+}
+
+server "snonux.de" {
+	alias "www.snonux.de"
 	listen on * tls port 443
 	tls {
 		certificate "/etc/ssl/snonux.de.fullchain.pem"
@@ -9,10 +15,18 @@ server "snonux.de" {
 		root "/htdocs/gemtexter/snonux.de"
 		directory auto index
 	}
-	location "/.well-known/acme-challenge/*" {
-		root "/acme"
-		request strip 2
-	}
+}
+
+server "buetow.org" {
+	alias "www.buetow.org"
+	listen on * port 80
+	block return 302 "https://buetow.org"
+}
+
+server "paul.buetow.org" {
+	alias "contact.buetow.org"
+	listen on * port 80
+	block return 302 "https://buetow.org/contact-information.html"
 }
 
 server "buetow.org" {
@@ -22,17 +36,20 @@ server "buetow.org" {
 		certificate "/etc/ssl/buetow.org.fullchain.pem"
 		key "/etc/ssl/private/buetow.org.key"
 	}
-	location * {
-		block return 302 "https://snonux.de$DOCUMENT_URI"
-	}
-	location "/.well-known/acme-challenge/*" {
-		root "/acme"
-		request strip 2
+	location "/*" {
+		root "/htdocs/gemtexter/buetow.org"
+		directory auto index
 	}
 }
 
 server "dtail.dev" {
 	alias "www.dtail.dev"
+	listen on * port 80
+	block return 302 "https://dail.dev"
+}
+
+server "dtail.dev" {
+	alias "www.dtail.dev"
 	listen on * tls port 443
 	tls {
 		certificate "/etc/ssl/dtail.dev.fullchain.pem"
@@ -41,34 +58,6 @@ server "dtail.dev" {
 	location * {
 		block return 302 "https://github.dtail.dev"
 	}
-	location "/.well-known/acme-challenge/*" {
-		root "/acme"
-		request strip 2
-	}
-}
-
-server "snonux.de" {
-	alias "www.snonux.de"
-	listen on * port 80
-	block return 302 "https://snonux.de"
-}
-
-server "buetow.org" {
-	alias "www.buetow.org"
-	listen on * port 80
-	block return 302 "https://buetow.org"
-}
-
-server "paul.buetow.org" {
-	alias "contact.buetow.org"
-	listen on * port 80
-	block return 302 "https://buetow.org/contact-information.html"
-}
-
-server "dtail.dev" {
-	alias "www.dtail.dev"
-	listen on * port 80
-	block return 302 "https://dail.dev"
 }
 
 server "default" {
@@ -84,4 +73,3 @@ server "default" {
 	}
 	block return 302 "https://snonux.de"
 }
-