redirect all to foo.surf

1 files changed, 9 insertions, 23 deletions

diff --git a/openbsd/frontends/etc/httpd.conf b/openbsd/frontends/etc/httpd.conf
index faa7db9..e0b7971 100644
--- a/openbsd/frontends/etc/httpd.conf
+++ b/openbsd/frontends/etc/httpd.conf
@@ -22,13 +22,9 @@ server "foo.surf" {
 }
 
 server "snonux.de" {
+	alias "www.snonux.de"
 	listen on * port 80
-	block return 302 "https://snonux.de"
-}
-
-server "www.snonux.de" {
-	listen on * port 80
-	block return 302 "https://www.snonux.de"
+        block return 302 "https://foo.surf$REQUEST_URI"
 }
 
 server "snonux.de" {
@@ -38,26 +34,19 @@ server "snonux.de" {
 		certificate "/etc/ssl/snonux.de.fullchain.pem"
 		key "/etc/ssl/private/snonux.de.key"
 	}
-	location "/*" {
-		root "/htdocs/gemtexter/snonux.de"
-		directory auto index
-	}
+        block return 302 "https://foo.surf$REQUEST_URI"
 }
 
 server "buetow.org" {
+	alias "www.buetow.org"
 	listen on * port 80
-	block return 302 "https://buetow.org"
-}
-
-server "www.buetow.org" {
-	listen on * port 80
-	block return 302 "https://www.buetow.org"
+        block return 302 "https://foo.surf$REQUEST_URI"
 }
 
 server "paul.buetow.org" {
 	alias "contact.buetow.org"
 	listen on * port 80
-	block return 302 "https://buetow.org/contact-information.html"
+	block return 302 "https://foo.surf/contact-information.html"
 }
 
 server "buetow.org" {
@@ -67,10 +56,7 @@ server "buetow.org" {
 		certificate "/etc/ssl/buetow.org.fullchain.pem"
 		key "/etc/ssl/private/buetow.org.key"
 	}
-	location "/*" {
-		root "/htdocs/gemtexter/buetow.org"
-		directory auto index
-	}
+        block return 302 "https://foo.surf$REQUEST_URI"
 }
 
 server "dtail.dev" {
@@ -93,7 +79,7 @@ server "dtail.dev" {
 
 server "default" {
 	listen on * port 80
-	block return 302 "https://foo.surf"
+        block return 302 "https://foo.surf$REQUEST_URI"
 }
 
 server "default" {
@@ -102,5 +88,5 @@ server "default" {
 		certificate "/etc/ssl/foo.surf.fullchain.pem"
 		key "/etc/ssl/private/foo.surf.key"
 	}
-	block return 302 "https://foo.surf"
+        block return 302 "https://foo.surf$REQUEST_URI"
 }