diff options
| author | Paul Buetow <paul@buetow.org> | 2022-07-13 13:29:58 +0100 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2022-07-13 13:29:58 +0100 |
| commit | c14126bdb3cebec42e9e8216d360b724228df222 (patch) | |
| tree | d45bf7de86b51b42bf8e2ad3c9e1e17fbd89ecb3 | |
| parent | 0f841977cfa1f2b934f433ac4239e612b44e5dcf (diff) | |
small improvements for paul and tmp subdomains
| -rw-r--r-- | frontends/Rexfile | 2 | ||||
| -rw-r--r-- | frontends/etc/httpd.conf.tpl | 26 | ||||
| -rw-r--r-- | frontends/var/nsd/zones/master/buetow.org.zone.tpl | 3 |
3 files changed, 18 insertions, 13 deletions
diff --git a/frontends/Rexfile b/frontends/Rexfile index 5eeda02..bd7558d 100644 --- a/frontends/Rexfile +++ b/frontends/Rexfile @@ -77,7 +77,7 @@ our $filewalk = sub { our $secrets = sub { read_file './secrets/' . shift }; our @dns_zones = qw/buetow.org dtail.dev foo.surf foo.zone irregular.ninja sidewalk.ninja snonux.de snonux.me snonux.land/; -our @acme_hosts = qw/paul.buetow.org buetow.org dtail.dev foo.zone irregular.ninja snonux.land/; +our @acme_hosts = qw/buetow.org paul.buetow.org tmp.buetow.org dtail.dev foo.zone irregular.ninja snonux.land/; # UTILITY TASKS diff --git a/frontends/etc/httpd.conf.tpl b/frontends/etc/httpd.conf.tpl index c536766..013e779 100644 --- a/frontends/etc/httpd.conf.tpl +++ b/frontends/etc/httpd.conf.tpl @@ -64,25 +64,27 @@ server "<%= $prefix %>buetow.org" { certificate "/etc/ssl/<%= $prefix %>buetow.org.fullchain.pem" key "/etc/ssl/private/<%= $prefix %>buetow.org.key" } - root "/htdocs/buetow.org" - location match "/tmp/.*" { - directory auto index - } - location match "/.*" { - block return 302 "https://paul.buetow.org" - } + block return 302 "https://paul.buetow.org" } -<% if ($primary) { %> -server "paul.buetow.org" { +server "<%= $prefix %>paul.buetow.org" { listen on * tls port 443 tls { - certificate "/etc/ssl/paul.buetow.org.fullchain.pem" - key "/etc/ssl/private/paul.buetow.org.key" + certificate "/etc/ssl/<%= $prefix %>paul.buetow.org.fullchain.pem" + key "/etc/ssl/private/<%= $prefix %>paul.buetow.org.key" } block return 302 "https://foo.zone/contact-information.html" } -<% } %> + +server "<%= $prefix %>tmp.buetow.org" { + listen on * tls port 443 + tls { + certificate "/etc/ssl/<%= $prefix %>tmp.buetow.org.fullchain.pem" + key "/etc/ssl/private/<%= $prefix %>tmp.buetow.org.key" + } + root "/htdocs/buetow.org/tmp" + directory auto index +} # Legacy hosts server "snonux.de" { diff --git a/frontends/var/nsd/zones/master/buetow.org.zone.tpl b/frontends/var/nsd/zones/master/buetow.org.zone.tpl index df35a53..9643206 100644 --- a/frontends/var/nsd/zones/master/buetow.org.zone.tpl +++ b/frontends/var/nsd/zones/master/buetow.org.zone.tpl @@ -22,12 +22,15 @@ $TTL 4h blowfish 86400 IN A 23.88.35.144 blowfish 86400 IN AAAA 2a01:4f8:c17:20f1::42 git1 3600 IN CNAME blowfish +paul 3600 IN CNAME blowfish +tmp 3600 IN CNAME blowfish twofish 86400 IN A 108.160.134.135 twofish 86400 IN AAAA 2401:c080:1000:45af:5400:3ff:fec6:ca1d git2 3600 IN CNAME twofish www 3600 IN CNAME twofish www.paul 3600 IN CNAME twofish +www.tmp 3600 IN CNAME twofish vulcan 86400 IN A 95.216.174.192 vulcan 86400 IN AAAA 2a01:4f9:c010:250e::1 |