1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-10 23:00:39 +02:00

fix: fix monitoring endpoints for new services

This commit is contained in:
oddlama 2025-05-18 21:05:51 +02:00
parent 3c38eaf072
commit 46f0db2d60
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
2 changed files with 15 additions and 19 deletions

View file

@ -14,22 +14,17 @@ let
s3Domain = "s3.photos.${globals.domains.me}"; s3Domain = "s3.photos.${globals.domains.me}";
proxyConfig = remoteAddr: nginxExtraConfig: { proxyConfig = remoteAddr: nginxExtraConfig: {
upstreams.ente = {
servers."${remoteAddr}:80" = { };
extraConfig = ''
zone ente 64k;
keepalive 20;
'';
monitoring.enable = true;
};
upstreams.museum = { upstreams.museum = {
servers."${remoteAddr}:8080" = { }; servers."${remoteAddr}:8080" = { };
extraConfig = '' extraConfig = ''
zone museum 64k; zone museum 64k;
keepalive 20; keepalive 20;
''; '';
monitoring.enable = true; monitoring = {
enable = true;
path = "/ping";
expectedStatus = 200;
};
}; };
upstreams.minio = { upstreams.minio = {
@ -38,7 +33,11 @@ let
zone minio 64k; zone minio 64k;
keepalive 20; keepalive 20;
''; '';
monitoring.enable = true; monitoring = {
enable = true;
path = "/minio/health/live";
expectedStatus = 200;
};
}; };
virtualHosts = virtualHosts =
@ -81,7 +80,6 @@ in
wireguard.proxy-sentinel = { wireguard.proxy-sentinel = {
client.via = "sentinel"; client.via = "sentinel";
firewallRuleForNode.sentinel.allowedTCPPorts = [ firewallRuleForNode.sentinel.allowedTCPPorts = [
80
8080 8080
9000 9000
]; ];
@ -90,7 +88,6 @@ in
wireguard.proxy-home = { wireguard.proxy-home = {
client.via = "ward"; client.via = "ward";
firewallRuleForNode.ward-web-proxy.allowedTCPPorts = [ firewallRuleForNode.ward-web-proxy.allowedTCPPorts = [
80
8080 8080
9000 9000
]; ];

View file

@ -5,7 +5,7 @@
... ...
}: }:
let let
mealieDomain = "mealie.${globals.domains.personal}"; mealieDomain = "mealie.${globals.domains.me}";
in in
{ {
wireguard.proxy-home = { wireguard.proxy-home = {
@ -22,9 +22,8 @@ in
globals.services.mealie.domain = mealieDomain; globals.services.mealie.domain = mealieDomain;
globals.monitoring.http.mealie = { globals.monitoring.http.mealie = {
url = "https://${mealieDomain}"; url = "https://${mealieDomain}";
# FIXME: todooooooooooo expectedBodyRegex = ''<title>Mealie<\title>'';
expectedBodyRegex = "TODO"; network = "home-lan.vlans.services";
network = "internet";
}; };
environment.persistence."/persist".directories = [ environment.persistence."/persist".directories = [
@ -62,8 +61,8 @@ in
''; '';
monitoring = { monitoring = {
enable = true; enable = true;
# FIXME: todooooooooooo expectedStatus = 200;
expectedBodyRegex = "TODO"; expectedBodyRegex = ''<title>Mealie<\title>'';
}; };
}; };
virtualHosts.${mealieDomain} = { virtualHosts.${mealieDomain} = {