From 51d0bff0047affa7af8db2b737d5cb4fc8f3d0b5 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Sun, 19 Jul 2026 16:45:24 +0200 Subject: modules/monitoring/scrutiny: Don't expose web-service This just doesn't make sense, when we also have grafana. --- hosts/by-name/server2/configuration.nix | 1 - modules/by-name/mo/monitoring/components/scrutiny.nix | 19 ------------------- zones/vhack.eu/zone.nix | 1 - 3 files changed, 21 deletions(-) diff --git a/hosts/by-name/server2/configuration.nix b/hosts/by-name/server2/configuration.nix index d772bcd..2e04324 100644 --- a/hosts/by-name/server2/configuration.nix +++ b/hosts/by-name/server2/configuration.nix @@ -36,7 +36,6 @@ adminPassword = ./secrets/grafana/adminPassword.age; secretKey = ./secrets/grafana/secretKey.age; }; - scrutiny.fqdn = "scrutiny.vhack.eu"; }; dns = { diff --git a/modules/by-name/mo/monitoring/components/scrutiny.nix b/modules/by-name/mo/monitoring/components/scrutiny.nix index 706a7c6..000efac 100644 --- a/modules/by-name/mo/monitoring/components/scrutiny.nix +++ b/modules/by-name/mo/monitoring/components/scrutiny.nix @@ -8,15 +8,6 @@ in { options.vhack.monitoring.scrutiny = { enable = lib.mkEnableOption "scrutiny service"; - - fqdn = lib.mkOption { - type = lib.types.nullOr lib.types.str; - description = '' - If a string, this will be the domain under which the scrutiny web interface will be servced. - - If null, the web interface will not be served and only the prometheus metrics will be accessible. - ''; - }; }; config = lib.mkIf cfg.enable { @@ -79,16 +70,6 @@ in { enable = true; }; }; - - nginx = lib.mkIf (cfg.fqdn != null) { - virtualHosts."${cfg.fqdn}" = { - locations."/".proxyPass = "http://127.0.0.1:${toString config.services.scrutiny.settings.web.listen.port}"; - - enableACME = true; - forceSSL = true; - }; - }; - netdata = { enable = true; config = { diff --git a/zones/vhack.eu/zone.nix b/zones/vhack.eu/zone.nix index 951b21a..c528c54 100644 --- a/zones/vhack.eu/zone.nix +++ b/zones/vhack.eu/zone.nix @@ -150,7 +150,6 @@ in { atuin-sync.CNAME = ["server2.vhack.eu."]; grafana.CNAME = ["server2.vhack.eu."]; - scrutiny.CNAME = ["server2.vhack.eu."]; dav.CNAME = ["server2.vhack.eu."]; etebase.CNAME = ["server2.vhack.eu."]; -- cgit v1.3.1