From c082455b945d8cf4204fca5d321a379ef74e455e Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Fri, 3 Mar 2023 01:28:22 +0200 Subject: add paul.cyou domain --- frontends/Rexfile | 4 ++-- frontends/etc/httpd.conf.tpl | 12 +++++++----- frontends/etc/mail/virtualdomains | 1 + frontends/etc/relayd.conf.tpl | 2 +- frontends/var/nsd/zones/master/paul.cyou.zone.tpl | 18 ++++++++++++++++++ 5 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 frontends/var/nsd/zones/master/paul.cyou.zone.tpl diff --git a/frontends/Rexfile b/frontends/Rexfile index 4da083f..1e8f254 100644 --- a/frontends/Rexfile +++ b/frontends/Rexfile @@ -78,9 +78,9 @@ our $filewalk = sub { # The secret store. Note to myself: "geheim cat rexfilesecrets.txt" our $secrets = sub { read_file './secrets/' . shift }; -our @dns_zones = qw/buetow.org dtail.dev foo.zone irregular.ninja snonux.land/; +our @dns_zones = qw/buetow.org dtail.dev foo.zone irregular.ninja snonux.land paul.cyou/; our @dns_zones_remove = qw/foo.surf snonux.de snonux.me sidewalk.ninja/; -our @acme_hosts = qw/buetow.org paul.buetow.org tmp.buetow.org dory.buetow.org footos.buetow.org znc.buetow.org dtail.dev foo.zone irregular.ninja snonux.land/; +our @acme_hosts = qw/buetow.org paul.buetow.org tmp.buetow.org dory.buetow.org footos.buetow.org znc.buetow.org dtail.dev foo.zone irregular.ninja snonux.land paul.cyou/; # UTILITY TASKS diff --git a/frontends/etc/httpd.conf.tpl b/frontends/etc/httpd.conf.tpl index 844c480..8d8e292 100644 --- a/frontends/etc/httpd.conf.tpl +++ b/frontends/etc/httpd.conf.tpl @@ -44,19 +44,21 @@ server "<%= $prefix.$host %>" { } <% } %> -# buetow.org special host -server "<%= $prefix %>buetow.org" { +# Redirect to paul.buetow.org +<% for my $host (qw/buetow.org paul.cyou/) { %> +server "<%= $prefix.$host %>" { listen on * tls port 443 tls { - certificate "/etc/ssl/<%= $prefix %>buetow.org.fullchain.pem" - key "/etc/ssl/private/<%= $prefix %>buetow.org.key" + certificate "/etc/ssl/<%= $prefix.$host %>.fullchain.pem" + key "/etc/ssl/private/<%= $prefix.$host %>.key" } location * { block return 302 "https://<%= $prefix %>paul.buetow.org" } } +<% } %> -# DTail special host +# Redirec to to gitub.dtail.dev server "<%= $prefix %>dtail.dev" { listen on * tls port 443 tls { diff --git a/frontends/etc/mail/virtualdomains b/frontends/etc/mail/virtualdomains index 11b9b7d..f292782 100644 --- a/frontends/etc/mail/virtualdomains +++ b/frontends/etc/mail/virtualdomains @@ -10,3 +10,4 @@ dev.buetow.org oss.buetow.org snonux.land dtail.dev +paul.cyou diff --git a/frontends/etc/relayd.conf.tpl b/frontends/etc/relayd.conf.tpl index 1f3e60f..047fcb5 100644 --- a/frontends/etc/relayd.conf.tpl +++ b/frontends/etc/relayd.conf.tpl @@ -10,7 +10,7 @@ tcp protocol "gemini" { tls keypair <%= $prefix %>snonux.land tls keypair <%= $prefix %>buetow.org tls keypair <%= $prefix %>paul.buetow.org - tls keypair snonux.de + tls keypair <%= $prefix %>paul.cyou } relay "gemini4" { diff --git a/frontends/var/nsd/zones/master/paul.cyou.zone.tpl b/frontends/var/nsd/zones/master/paul.cyou.zone.tpl new file mode 100644 index 0000000..b8605e5 --- /dev/null +++ b/frontends/var/nsd/zones/master/paul.cyou.zone.tpl @@ -0,0 +1,18 @@ +$ORIGIN paul.cyou. +$TTL 4h +@ IN SOA blowfish.buetow.org. hostmaster.buetow.org. ( + <%= time() %> ; serial + 1h ; refresh + 30m ; retry + 7d ; expire + 1h ) ; negative + IN NS blowfish.buetow.org. + IN NS fishfinger.buetow.org. + + IN MX 10 blowfish.buetow.org. + IN MX 20 fishfinger.buetow.org. + + 300 IN A 23.88.35.144 + 300 IN AAAA 2a01:4f8:c17:20f1::42 +* 300 IN CNAME blowfish.buetow.org. +www 300 IN CNAME fishfinger.buetow.org. -- cgit v1.2.3