diff options
| author | Paul Buetow <paul@buetow.org> | 2026-01-18 16:42:30 +0200 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2026-01-18 16:42:30 +0200 |
| commit | f400a656ceeb0c08428745bd59e5ad30edba6ff9 (patch) | |
| tree | 335fe8f96016394164ddb3e379c7970287cbcc09 | |
| parent | 535711aa372648fc81d3e8f01ad2b5c12561cb95 (diff) | |
fix alerts
| -rw-r--r-- | frontends/Rexfile | 14 | ||||
| -rw-r--r-- | frontends/etc/gogios.json.tpl | 2 | ||||
| -rw-r--r-- | frontends/etc/httpd.conf.tpl | 3 |
3 files changed, 15 insertions, 4 deletions
diff --git a/frontends/Rexfile b/frontends/Rexfile index 971e162..9cce066 100644 --- a/frontends/Rexfile +++ b/frontends/Rexfile @@ -86,6 +86,18 @@ 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; +# WireGuard IP addresses for ping checks +our %wg0_ips = ( + 'blowfish' => { '4' => '192.168.2.110', '6' => 'fd42:beef:cafe:2::110' }, + 'fishfinger' => { '4' => '192.168.2.111', '6' => 'fd42:beef:cafe:2::111' }, + 'f0' => { '4' => '192.168.2.130', '6' => 'fd42:beef:cafe:2::130' }, + 'f1' => { '4' => '192.168.2.131', '6' => 'fd42:beef:cafe:2::131' }, + 'f2' => { '4' => '192.168.2.132', '6' => 'fd42:beef:cafe:2::132' }, + 'r0' => { '4' => '192.168.2.120', '6' => 'fd42:beef:cafe:2::120' }, + 'r1' => { '4' => '192.168.2.121', '6' => 'fd42:beef:cafe:2::121' }, + 'r2' => { '4' => '192.168.2.122', '6' => 'fd42:beef:cafe:2::122' }, +); + # UTILITY TASKS task 'id', group => 'frontends', sub { say run 'id' }; @@ -505,7 +517,7 @@ task 'gogios', mode => '755'; file '/etc/gogios.json', - content => template( './etc/gogios.json.tpl', acme_hosts => \@acme_hosts ), + content => template( './etc/gogios.json.tpl', acme_hosts => \@acme_hosts, wg0_ips => \%wg0_ips ), owner => 'root', group => 'wheel', mode => '744'; diff --git a/frontends/etc/gogios.json.tpl b/frontends/etc/gogios.json.tpl index 8e4bcdb..03b4cab 100644 --- a/frontends/etc/gogios.json.tpl +++ b/frontends/etc/gogios.json.tpl @@ -23,7 +23,7 @@ <% for my $proto (4, 6) { -%> "Check Ping<%= $proto %> <%= $host %>.wg0.wan.buetow.org": { "Plugin": "<%= $plugin_dir %>/check_ping", - "Args": ["-H", "<%= $host %>.wg0.wan.buetow.org", "-<%= $proto %>", "-w", "100,20%", "-c", "200,30%"], + "Args": ["-H", "<%= $wg0_ips->{$host}->{$proto} %>", "-<%= $proto %>", "-w", "40,20%", "-c", "80,30%"], "RandomSpread": 10, "Retries": 5, "RetryInterval": 3 diff --git a/frontends/etc/httpd.conf.tpl b/frontends/etc/httpd.conf.tpl index 6f0c51a..6a313ae 100644 --- a/frontends/etc/httpd.conf.tpl +++ b/frontends/etc/httpd.conf.tpl @@ -94,13 +94,12 @@ server "<%= $prefix %>paul.buetow.org" { } <% } -%> -# Redirect to gitub.dtail.dev <% for my $prefix (@prefixes) { -%> server "<%= $prefix %>dtail.dev" { listen on * port 8080 log style forwarded location * { - block return 302 "https://github.dtail.dev$REQUEST_URI" + block return 302 "https://codeberg.org/snonux/dtail" } } <% } -%> |