From 46f0db2d6005fdb25dd4751a47efc4b861857bd2 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Sun, 18 May 2025 21:05:51 +0200
Subject: [PATCH] fix: fix monitoring endpoints for new services

---
 hosts/sire/guests/ente.nix   | 23 ++++++++++-------------
 hosts/ward/guests/mealie.nix | 11 +++++------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/hosts/sire/guests/ente.nix b/hosts/sire/guests/ente.nix
index e4d7d5b..8bf6932 100644
--- a/hosts/sire/guests/ente.nix
+++ b/hosts/sire/guests/ente.nix
@@ -14,22 +14,17 @@ let
   s3Domain = "s3.photos.${globals.domains.me}";
 
   proxyConfig = remoteAddr: nginxExtraConfig: {
-    upstreams.ente = {
-      servers."${remoteAddr}:80" = { };
-      extraConfig = ''
-        zone ente 64k;
-        keepalive 20;
-      '';
-      monitoring.enable = true;
-    };
-
     upstreams.museum = {
       servers."${remoteAddr}:8080" = { };
       extraConfig = ''
         zone museum 64k;
         keepalive 20;
       '';
-      monitoring.enable = true;
+      monitoring = {
+        enable = true;
+        path = "/ping";
+        expectedStatus = 200;
+      };
     };
 
     upstreams.minio = {
@@ -38,7 +33,11 @@ let
         zone minio 64k;
         keepalive 20;
       '';
-      monitoring.enable = true;
+      monitoring = {
+        enable = true;
+        path = "/minio/health/live";
+        expectedStatus = 200;
+      };
     };
 
     virtualHosts =
@@ -81,7 +80,6 @@ in
   wireguard.proxy-sentinel = {
     client.via = "sentinel";
     firewallRuleForNode.sentinel.allowedTCPPorts = [
-      80
       8080
       9000
     ];
@@ -90,7 +88,6 @@ in
   wireguard.proxy-home = {
     client.via = "ward";
     firewallRuleForNode.ward-web-proxy.allowedTCPPorts = [
-      80
       8080
       9000
     ];
diff --git a/hosts/ward/guests/mealie.nix b/hosts/ward/guests/mealie.nix
index d899080..5ac0bdf 100644
--- a/hosts/ward/guests/mealie.nix
+++ b/hosts/ward/guests/mealie.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  mealieDomain = "mealie.${globals.domains.personal}";
+  mealieDomain = "mealie.${globals.domains.me}";
 in
 {
   wireguard.proxy-home = {
@@ -22,9 +22,8 @@ in
   globals.services.mealie.domain = mealieDomain;
   globals.monitoring.http.mealie = {
     url = "https://${mealieDomain}";
-    # FIXME: todooooooooooo
-    expectedBodyRegex = "TODO";
-    network = "internet";
+    expectedBodyRegex = ''<title>Mealie<\title>'';
+    network = "home-lan.vlans.services";
   };
 
   environment.persistence."/persist".directories = [
@@ -62,8 +61,8 @@ in
         '';
         monitoring = {
           enable = true;
-          # FIXME: todooooooooooo
-          expectedBodyRegex = "TODO";
+          expectedStatus = 200;
+          expectedBodyRegex = ''<title>Mealie<\title>'';
         };
       };
       virtualHosts.${mealieDomain} = {