about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2022-11-06T18·51+0100
committersterni <sternenseemann@systemli.org>2022-11-07T14·43+0000
commit83dabf8955bae6d8dce4a06745d72f661fb5a0e0 (patch)
tree21ad450770a280f2d49cd866fd63780ffc9015fa
parentbf1a2686e71e2350942580ebb6d9f57834ad0eb8 (diff)
fix(ops/machines/whitby): serve grafana at status.tvl.su again r/5260
This is a follow up to cl/7191 which neglected to adjust the
status.tvl.su.nix module and re-enable it.

Change-Id: Icc1917004cd50e5eab61a29bc68b393ba9bd6325
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7226
Tested-by: BuildkiteCI
Reviewed-by: lukegb <lukegb@tvl.fyi>
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: grfn <grfn@gws.fyi>
-rw-r--r--ops/machines/whitby/default.nix2
-rw-r--r--ops/modules/www/status.tvl.su.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/ops/machines/whitby/default.nix b/ops/machines/whitby/default.nix
index c31fe428c4..62f8cedb63 100644
--- a/ops/machines/whitby/default.nix
+++ b/ops/machines/whitby/default.nix
@@ -41,7 +41,7 @@ in
     (mod "www/nixery.dev.nix")
     (mod "www/self-redirect.nix")
     (mod "www/static.tvl.fyi.nix")
-    # (mod "www/status.tvl.su.nix")
+    (mod "www/status.tvl.su.nix")
     (mod "www/tazj.in.nix")
     (mod "www/todo.tvl.fyi.nix")
     (mod "www/tvixbolt.tvl.su.nix")
diff --git a/ops/modules/www/status.tvl.su.nix b/ops/modules/www/status.tvl.su.nix
index 2bb6093c14..7079c60260 100644
--- a/ops/modules/www/status.tvl.su.nix
+++ b/ops/modules/www/status.tvl.su.nix
@@ -18,7 +18,7 @@
       forceSSL = true;
 
       locations."/" = {
-        proxyPass = "http://localhost:${toString config.services.grafana.port}";
+        proxyPass = "http://localhost:${toString config.services.grafana.settings.server.http_port}";
       };
     };
   };