add foo.zone

5 files changed, 66 insertions, 18 deletions

diff --git a/openbsd/frontends/etc/httpd.conf b/openbsd/frontends/etc/httpd.conf
index e0b7971..0228967 100644
--- a/openbsd/frontends/etc/httpd.conf
+++ b/openbsd/frontends/etc/httpd.conf
@@ -1,22 +1,22 @@
-server "foo.surf" {
+server "foo.zone" {
 	listen on * port 80
-	block return 302 "https://foo.surf"
+	block return 302 "https://foo.zone"
 }
 
-server "www.foo.surf" {
+server "www.foo.zone" {
 	listen on * port 80
-	block return 302 "https://www.foo.surf"
+	block return 302 "https://www.foo.zone"
 }
 
-server "foo.surf" {
-	alias "www.foo.surf"
+server "foo.zone" {
+	alias "www.foo.zone"
 	listen on * tls port 443
 	tls {
-		certificate "/etc/ssl/foo.surf.fullchain.pem"
-		key "/etc/ssl/private/foo.surf.key"
+		certificate "/etc/ssl/foo.zone.fullchain.pem"
+		key "/etc/ssl/private/foo.zone.key"
 	}
 	location "/*" {
-		root "/htdocs/gemtexter/foo.surf"
+		root "/htdocs/gemtexter/foo.zone"
 		directory auto index
 	}
 }
@@ -24,7 +24,7 @@ server "foo.surf" {
 server "snonux.de" {
 	alias "www.snonux.de"
 	listen on * port 80
-        block return 302 "https://foo.surf$REQUEST_URI"
+        block return 302 "https://foo.zone$REQUEST_URI"
 }
 
 server "snonux.de" {
@@ -34,19 +34,35 @@ server "snonux.de" {
 		certificate "/etc/ssl/snonux.de.fullchain.pem"
 		key "/etc/ssl/private/snonux.de.key"
 	}
-        block return 302 "https://foo.surf$REQUEST_URI"
+        block return 302 "https://foo.zone$REQUEST_URI"
+}
+
+server "foo.surf" {
+	alias "www.foo.surf"
+	listen on * port 80
+        block return 302 "https://foo.zone$REQUEST_URI"
+}
+
+server "foo.surf" {
+	alias "www.foo.surf"
+	listen on * tls port 443
+	tls {
+		certificate "/etc/ssl/foo.surf.fullchain.pem"
+		key "/etc/ssl/private/foo.surf.key"
+	}
+        block return 302 "https://foo.zone$REQUEST_URI"
 }
 
 server "buetow.org" {
 	alias "www.buetow.org"
 	listen on * port 80
-        block return 302 "https://foo.surf$REQUEST_URI"
+        block return 302 "https://foo.zone$REQUEST_URI"
 }
 
 server "paul.buetow.org" {
 	alias "contact.buetow.org"
 	listen on * port 80
-	block return 302 "https://foo.surf/contact-information.html"
+	block return 302 "https://foo.zone/contact-information.html"
 }
 
 server "buetow.org" {
@@ -56,7 +72,7 @@ server "buetow.org" {
 		certificate "/etc/ssl/buetow.org.fullchain.pem"
 		key "/etc/ssl/private/buetow.org.key"
 	}
-        block return 302 "https://foo.surf$REQUEST_URI"
+        block return 302 "https://foo.zone$REQUEST_URI"
 }
 
 server "dtail.dev" {
@@ -79,14 +95,14 @@ server "dtail.dev" {
 
 server "default" {
 	listen on * port 80
-        block return 302 "https://foo.surf$REQUEST_URI"
+        block return 302 "https://foo.zone$REQUEST_URI"
 }
 
 server "default" {
 	listen on * tls port 443
 	tls {
-		certificate "/etc/ssl/foo.surf.fullchain.pem"
-		key "/etc/ssl/private/foo.surf.key"
+		certificate "/etc/ssl/foo.zone.fullchain.pem"
+		key "/etc/ssl/private/foo.zone.key"
 	}
-        block return 302 "https://foo.surf$REQUEST_URI"
+        block return 302 "https://foo.zone$REQUEST_URI"
 }
diff --git a/openbsd/frontends/etc/relayd.conf:blowfish b/openbsd/frontends/etc/relayd.conf:blowfish
index e899b83..5bfc1f8 100644
--- a/openbsd/frontends/etc/relayd.conf:blowfish
+++ b/openbsd/frontends/etc/relayd.conf:blowfish
@@ -1,6 +1,7 @@
 log connection
 
 tcp protocol "gemini" {
+    tls keypair foo.zone
     tls keypair foo.surf
     tls keypair buetow.org
     tls keypair snonux.de
diff --git a/openbsd/frontends/var/nsd.blowfish/etc/nsd.conf b/openbsd/frontends/var/nsd.blowfish/etc/nsd.conf
index 4817554..d95a168 100644
--- a/openbsd/frontends/var/nsd.blowfish/etc/nsd.conf
+++ b/openbsd/frontends/var/nsd.blowfish/etc/nsd.conf
@@ -23,6 +23,12 @@ zone:
 	provide-xfr: 108.160.134.135 blowfish.buetow.org
 
 zone:
+	name: "foo.zone"
+	zonefile: "master/foo.zone.zone"
+	notify: 108.160.134.135 blowfish.buetow.org
+	provide-xfr: 108.160.134.135 blowfish.buetow.org
+
+zone:
 	name: "foo.surf"
 	zonefile: "master/foo.surf.zone"
 	notify: 108.160.134.135 blowfish.buetow.org
diff --git a/openbsd/frontends/var/nsd.blowfish/zones/master/foo.zone.zone b/openbsd/frontends/var/nsd.blowfish/zones/master/foo.zone.zone
new file mode 100644
index 0000000..df318a2
--- /dev/null
+++ b/openbsd/frontends/var/nsd.blowfish/zones/master/foo.zone.zone
@@ -0,0 +1,20 @@
+$ORIGIN foo.zone.
+$TTL 4h
+@        IN  SOA  blowfish.buetow.org. hostmaster.buetow.org. (
+                  2022011706      ; serial
+                  1h              ; refresh
+                  30m             ; retry
+                  7d              ; expire
+                  1h )            ; negative
+         IN NS   blowfish.buetow.org.
+         IN NS   twofish.buetow.org.
+
+         IN MX 10 buetow.org.
+         IN MX 20 www.buetow.org.
+
+
+         86400 IN A 23.88.35.144
+         86400 IN AAAA 2a01:4f8:c17:20f1::42
+*        86400 IN CNAME blowfish.buetow.org.
+www      86400 IN CNAME twofish.buetow.org.
+www2     86400 IN CNAME snonux.codeberg.page.
diff --git a/openbsd/frontends/var/nsd.twofish/etc/nsd.conf b/openbsd/frontends/var/nsd.twofish/etc/nsd.conf
index b40ceee..3ce547a 100644
--- a/openbsd/frontends/var/nsd.twofish/etc/nsd.conf
+++ b/openbsd/frontends/var/nsd.twofish/etc/nsd.conf
@@ -20,6 +20,11 @@ zone:
 	request-xfr: 23.88.35.144 blowfish.buetow.org
 
 zone:
+	name: "foo.zone"
+	allow-notify: 23.88.35.144 blowfish.buetow.org
+	request-xfr: 23.88.35.144 blowfish.buetow.org
+
+zone:
 	name: "foo.surf"
 	allow-notify: 23.88.35.144 blowfish.buetow.org
 	request-xfr: 23.88.35.144 blowfish.buetow.org