diff --git a/hosts/monitoring-3/rules.yml b/hosts/monitoring-3/rules.yml index 2493b04..bb0f5c9 100644 --- a/hosts/monitoring-3/rules.yml +++ b/hosts/monitoring-3/rules.yml @@ -87,3 +87,11 @@ groups: annotations: summary: "GPG {{ $labels.fingerprint }} is expiring soon" description: "GPG with fingerprint {{ $labels.fingerprint }} is expiring in less then six weeks" + - alert: NadjaTopIPv4ProxyBroken + expr: probe_success{job="blackbox_local_http6", target="blog.nadja.top"} != on (target) probe_success{job="blackbox_local_http4", target="blog.nadja.top"} + for: 5m + labels: + severity: critical + annotations: + summary: "blog.nadja.top unreachable via IPv4" + description: "blog.nadja.top unreachable IPv4, but reachable via IPv6" diff --git a/modules/nginx-port-forward/default.nix b/modules/nginx-port-forward/default.nix index 7a13859..014543f 100644 --- a/modules/nginx-port-forward/default.nix +++ b/modules/nginx-port-forward/default.nix @@ -9,7 +9,7 @@ let mkServerBlock = isUDP: port: forward: '' server { - resolver 127.0.0.53 ipv4=off; + resolver 127.0.0.53 ipv4=off valid=30s; listen ${port}${optionalString isUDP " udp"}${optionalString (forward.certName != null) " ssl"}; listen [::]:${port}${optionalString isUDP " udp"}${optionalString (forward.certName != null) " ssl"}; diff --git a/pkgs/overrides/dino.nix b/pkgs/overrides/dino.nix new file mode 100644 index 0000000..0952ada --- /dev/null +++ b/pkgs/overrides/dino.nix @@ -0,0 +1,8 @@ +final: prev: +prev.dino.overrideAttrs (finalAttrs: prevAttrs: { + mesonFlags = prevAttrs.mesonFlags ++ [ + (final.lib.mesonEnable "plugin-openpgp" false) + (final.lib.mesonEnable "plugin-notification-sound" false) + ]; +}) + diff --git a/pkgs/pkgs.nix b/pkgs/pkgs.nix index ac6b08a..8e2c444 100644 --- a/pkgs/pkgs.nix +++ b/pkgs/pkgs.nix @@ -27,5 +27,6 @@ update-from-hydra = final: prev: final.callPackage ./update-from-hydra {}; uptimestatus = final: prev: final.python3.pkgs.callPackage ./uptimestatus {}; + dino = final: prev: import ./overrides/dino.nix final prev; xmppc = final: prev: import ./overrides/xmppc.nix final prev; }