diff options
| -rw-r--r-- | frontends/Rexfile | 2 | ||||
| -rw-r--r-- | frontends/etc/httpd.conf.tpl | 12 | ||||
| -rw-r--r-- | frontends/var/nsd/zones/master/buetow.org.zone.tpl | 7 |
3 files changed, 1 insertions, 20 deletions
diff --git a/frontends/Rexfile b/frontends/Rexfile index d8b9d53..e41b55a 100644 --- a/frontends/Rexfile +++ b/frontends/Rexfile @@ -82,7 +82,7 @@ our @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 gogios.buetow.org blowfish.buetow.org fishfinger.buetow.org/; + qw/buetow.org git.buetow.org paul.buetow.org dory.buetow.org ecat.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/httpd.conf.tpl b/frontends/etc/httpd.conf.tpl index 394349b..6a313ae 100644 --- a/frontends/etc/httpd.conf.tpl +++ b/frontends/etc/httpd.conf.tpl @@ -151,18 +151,6 @@ 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 b11a691..5ae4c08 100644 --- a/frontends/var/nsd/zones/master/buetow.org.zone.tpl +++ b/frontends/var/nsd/zones/master/buetow.org.zone.tpl @@ -75,13 +75,6 @@ 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 |