diff options
| -rw-r--r-- | openbsd/frontends/etc/httpd.conf | 198 | ||||
| -rw-r--r-- | openbsd/frontends/var/nsd:blowfish/etc/nsd.conf | 6 | ||||
| -rw-r--r-- | openbsd/frontends/var/nsd:twofish/etc/nsd.conf | 5 |
3 files changed, 118 insertions, 91 deletions
diff --git a/openbsd/frontends/etc/httpd.conf b/openbsd/frontends/etc/httpd.conf index 5af3338..0fe7ec0 100644 --- a/openbsd/frontends/etc/httpd.conf +++ b/openbsd/frontends/etc/httpd.conf @@ -1,142 +1,158 @@ server "foo.zone" { - listen on * port 80 - block return 302 "https://foo.zone" + listen on * port 80 + block return 302 "https://foo.zone" } server "www.foo.zone" { - listen on * port 80 - block return 302 "https://www.foo.zone" + listen on * port 80 + block return 302 "https://www.foo.zone" } server "foo.zone" { - alias "www.foo.zone" - listen on * tls port 443 - tls { - certificate "/etc/ssl/foo.zone.fullchain.pem" - key "/etc/ssl/private/foo.zone.key" - } - location "/*" { - root "/htdocs/gemtexter/foo.zone" - directory auto index - } + alias "www.foo.zone" + listen on * tls port 443 + tls { + certificate "/etc/ssl/foo.zone.fullchain.pem" + key "/etc/ssl/private/foo.zone.key" + } + location "/*" { + root "/htdocs/gemtexter/foo.zone" + directory auto index + } } -server "sidewalk.ninja" { - listen on * port 80 - block return 302 "https://sidewalk.ninja" +server "irregular.ninja" { + listen on * port 80 + block return 302 "https://irregular.ninja" } -server "www.sidewalk.ninja" { - listen on * port 80 - block return 302 "https://www.sidewalk.ninja" +server "www.irregular.ninja" { + listen on * port 80 + block return 302 "https://www.irregular.ninja" } -server "sidewalk.ninja" { - alias "www.sidewalk.ninja" - listen on * tls port 443 - tls { - certificate "/etc/ssl/sidewalk.ninja.fullchain.pem" - key "/etc/ssl/private/sidewalk.ninja.key" - } - location "/*" { - root "/htdocs/sidewalk.ninja" - directory auto index - } +server "irregular.ninja" { + alias "www.irregular.ninja" + listen on * tls port 443 + tls { + certificate "/etc/ssl/irregular.ninja.fullchain.pem" + key "/etc/ssl/private/irregular.ninja.key" + } + location "/*" { + root "/htdocs/irregular.ninja" + directory auto index + } } server "snonux.de" { - alias "www.snonux.de" - listen on * port 80 + alias "www.snonux.de" + listen on * port 80 block return 302 "https://foo.zone$REQUEST_URI" } server "snonux.de" { - alias "www.snonux.de" - listen on * tls port 443 - tls { - certificate "/etc/ssl/snonux.de.fullchain.pem" - key "/etc/ssl/private/snonux.de.key" - } - block return 302 "https://foo.zone$REQUEST_URI" + alias "www.snonux.de" + listen on * tls port 443 + tls { + certificate "/etc/ssl/snonux.de.fullchain.pem" + key "/etc/ssl/private/snonux.de.key" + } + 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" + 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" + 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 "sidewalk.ninja" { + alias "www.sidewalk.ninja" + listen on * port 80 + block return 302 "https://foo.zone$REQUEST_URI" +} + +server "sidewalk.ninja" { + alias "www.sidewalk.ninja" + listen on * tls port 443 + tls { + certificate "/etc/ssl/sidewalk.ninja.fullchain.pem" + key "/etc/ssl/private/sidewalk.ninja.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.zone$REQUEST_URI" + alias "www.buetow.org" + listen on * port 80 + 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.zone/contact-information.html" + alias "contact.buetow.org" + listen on * port 80 + block return 302 "https://foo.zone/contact-information.html" } server "tmp.buetow.org" { - listen on * port 80 - block return 302 "https://buetow.org/tmp/" + listen on * port 80 + block return 302 "https://buetow.org/tmp/" } server "buetow.org" { - alias "www.buetow.org" - listen on * tls port 443 - tls { - certificate "/etc/ssl/buetow.org.fullchain.pem" - key "/etc/ssl/private/buetow.org.key" - } - root "/htdocs/buetow.org" - location match "/tmp/.*" { - directory auto index - } - location match "/.*" { - block return 302 "https://foo.zone$REQUEST_URI" - } + alias "www.buetow.org" + listen on * tls port 443 + tls { + certificate "/etc/ssl/buetow.org.fullchain.pem" + key "/etc/ssl/private/buetow.org.key" + } + root "/htdocs/buetow.org" + location match "/tmp/.*" { + directory auto index + } + location match "/.*" { + block return 302 "https://foo.zone$REQUEST_URI" + } } server "dtail.dev" { - alias "www.dtail.dev" - listen on * port 80 - block return 302 "https://dail.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" - key "/etc/ssl/private/dtail.dev.key" - } - location * { - block return 302 "https://github.dtail.dev" - } + alias "www.dtail.dev" + listen on * tls port 443 + tls { + certificate "/etc/ssl/dtail.dev.fullchain.pem" + key "/etc/ssl/private/dtail.dev.key" + } + location * { + block return 302 "https://github.dtail.dev" + } } server "default" { - listen on * port 80 - block return 302 "https://foo.zone$REQUEST_URI" + listen on * port 80 + block return 302 "https://foo.zone$REQUEST_URI" } server "default" { - listen on * tls port 443 - tls { - certificate "/etc/ssl/foo.zone.fullchain.pem" - key "/etc/ssl/private/foo.zone.key" - } - block return 302 "https://foo.zone$REQUEST_URI" + listen on * tls port 443 + tls { + certificate "/etc/ssl/foo.zone.fullchain.pem" + key "/etc/ssl/private/foo.zone.key" + } + block return 302 "https://foo.zone$REQUEST_URI" } diff --git a/openbsd/frontends/var/nsd:blowfish/etc/nsd.conf b/openbsd/frontends/var/nsd:blowfish/etc/nsd.conf index 920e9a2..535acea 100644 --- a/openbsd/frontends/var/nsd:blowfish/etc/nsd.conf +++ b/openbsd/frontends/var/nsd:blowfish/etc/nsd.conf @@ -41,6 +41,12 @@ zone: provide-xfr: 108.160.134.135 blowfish.buetow.org zone: + name: "irregular.ninja" + zonefile: "master/irregular.ninja.zone" + notify: 108.160.134.135 blowfish.buetow.org + provide-xfr: 108.160.134.135 blowfish.buetow.org + +zone: name: "sidewalk.ninja" zonefile: "master/sidewalk.ninja.zone" notify: 108.160.134.135 blowfish.buetow.org diff --git a/openbsd/frontends/var/nsd:twofish/etc/nsd.conf b/openbsd/frontends/var/nsd:twofish/etc/nsd.conf index 8922730..0727d89 100644 --- a/openbsd/frontends/var/nsd:twofish/etc/nsd.conf +++ b/openbsd/frontends/var/nsd:twofish/etc/nsd.conf @@ -35,6 +35,11 @@ zone: request-xfr: 23.88.35.144 blowfish.buetow.org zone: + name: "irregular.ninja" + allow-notify: 23.88.35.144 blowfish.buetow.org + request-xfr: 23.88.35.144 blowfish.buetow.org + +zone: name: "sidewalk.ninja" allow-notify: 23.88.35.144 blowfish.buetow.org request-xfr: 23.88.35.144 blowfish.buetow.org |