diff options
| -rw-r--r-- | frontends/Rexfile | 8 | ||||
| -rw-r--r-- | frontends/etc/gogios.json.tpl | 2 | ||||
| -rw-r--r-- | frontends/etc/httpd.conf.tpl | 12 | ||||
| -rw-r--r-- | frontends/var/nsd/zones/master/buetow.org.zone.tpl | 7 |
4 files changed, 20 insertions, 9 deletions
diff --git a/frontends/Rexfile b/frontends/Rexfile index acd8e19..d8b9d53 100644 --- a/frontends/Rexfile +++ b/frontends/Rexfile @@ -72,9 +72,6 @@ our $fqdns = 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.foo paul.cyou/; -our @dns_zones_remove = qw//; - # k3s cluster running on FreeBSD in my LAN our @f3s_hosts = qw/f3s.buetow.org git.f3s.buetow.org cgit.f3s.buetow.org immich.f3s.buetow.org argocd.f3s.buetow.org keybr.f3s.buetow.org anki.f3s.buetow.org bag.f3s.buetow.org flux.f3s.buetow.org audiobookshelf.f3s.buetow.org grafana.f3s.buetow.org radicale.f3s.buetow.org vault.f3s.buetow.org syncthing.f3s.buetow.org uprecords.f3s.buetow.org koreader.f3s.buetow.org filebrowser.f3s.buetow.org webdav.f3s.buetow.org/; @@ -82,13 +79,10 @@ our @f3s_hosts = # optionally, only enable manually for temp time, as no password protection yet # push @f3s_hosts, 'registry.f3s.buetow.org'; -our @acme_hosts = - qw/foo.zone dtail.dev buetow.org git.buetow.org paul.buetow.org joern.buetow.org dory.buetow.org ecat.buetow.org blog.buetow.org znc.buetow.org stats.foo.zone irregular.ninja alt.irregular.ninja snonux.foo gogios.buetow.org blowfish.buetow.org fishfinger.buetow.org/; -push @acme_hosts, @f3s_hosts; our @dns_zones = qw/buetow.org dtail.dev foo.zone irregular.ninja snonux.foo/; our @dns_zones_remove = qw/paul.cyou/; our @acme_hosts = - qw/buetow.org git.buetow.org paul.buetow.org dory.buetow.org solarcat.buetow.org fotos.buetow.org znc.buetow.org dtail.dev foo.zone irregular.ninja alt.irregular.ninja snonux.foo/; + qw/buetow.org git.buetow.org paul.buetow.org dory.buetow.org solarcat.buetow.org fotos.buetow.org znc.buetow.org dtail.dev foo.zone irregular.ninja alt.irregular.ninja snonux.foo gogios.buetow.org blowfish.buetow.org fishfinger.buetow.org/; # WireGuard IP addresses for ping checks our %wg0_ips = ( diff --git a/frontends/etc/gogios.json.tpl b/frontends/etc/gogios.json.tpl index 60315fe..40eed45 100644 --- a/frontends/etc/gogios.json.tpl +++ b/frontends/etc/gogios.json.tpl @@ -7,7 +7,6 @@ "StateDir": "/var/run/gogios", "HTMLStatusFile": "/var/www/htdocs/buetow.org/self/gogios/index.html", "PrometheusHosts": ["r0.wg0:30090", "r1.wg0:30090", "r2.wg0:30090"], - "PrometheusNotifyDisable": true, "Checks": { <% for my $host (qw(master standby)) { -%> <% for my $proto (4, 6) { -%> @@ -25,7 +24,6 @@ "Check Ping<%= $proto %> <%= $host %>.wg0.wan.buetow.org": { "Plugin": "<%= $plugin_dir %>/check_ping", "Args": ["-H", "<%= $host %>.wg0.wan.buetow.org", "-<%= $proto %>", "-w", "100,10%", "-c", "200,15%"], - "NotifyDisable": true, "RandomSpread": 10, "Retries": 3, "RetryInterval": 3 diff --git a/frontends/etc/httpd.conf.tpl b/frontends/etc/httpd.conf.tpl index 6a313ae..394349b 100644 --- a/frontends/etc/httpd.conf.tpl +++ b/frontends/etc/httpd.conf.tpl @@ -151,6 +151,18 @@ server "<%= $prefix %>dory.buetow.org" { } <% } -%> +# Solarcat special host +<% for my $prefix (@prefixes) { -%> +server "<%= $prefix %>solarcat.buetow.org" { + listen on * port 8080 + log style forwarded + location * { + root "/htdocs/joern/solarcat.buetow.org" + directory auto index + } +} +<% } -%> + # ecat special host <% for my $prefix (@prefixes) { -%> server "<%= $prefix %>ecat.buetow.org" { diff --git a/frontends/var/nsd/zones/master/buetow.org.zone.tpl b/frontends/var/nsd/zones/master/buetow.org.zone.tpl index 5ae4c08..b11a691 100644 --- a/frontends/var/nsd/zones/master/buetow.org.zone.tpl +++ b/frontends/var/nsd/zones/master/buetow.org.zone.tpl @@ -75,6 +75,13 @@ www.dory 300 IN AAAA <%= $ips->{current_master}{ipv6} %> ; Enable failover standby.dory 300 IN A <%= $ips->{current_standby}{ipv4} %> ; Enable failover standby.dory 300 IN AAAA <%= $ips->{current_standby}{ipv6} %> ; Enable failover +solarcat 300 IN A <%= $ips->{current_master}{ipv4} %> ; Enable failover +solarcat 300 IN AAAA <%= $ips->{current_master}{ipv6} %> ; Enable failover +www.solarcat 300 IN A <%= $ips->{current_master}{ipv4} %> ; Enable failover +www.solarcat 300 IN AAAA <%= $ips->{current_master}{ipv6} %> ; Enable failover +standby.solarcat 300 IN A <%= $ips->{current_standby}{ipv4} %> ; Enable failover +standby.solarcat 300 IN AAAA <%= $ips->{current_standby}{ipv6} %> ; Enable failover + ecat 300 IN A <%= $ips->{current_master}{ipv4} %> ; Enable failover ecat 300 IN AAAA <%= $ips->{current_master}{ipv6} %> ; Enable failover www.ecat 300 IN A <%= $ips->{current_master}{ipv4} %> ; Enable failover |