From 81e1574023c457f20a7cb40524355164988f1b0c Mon Sep 17 00:00:00 2001
From: Chris Kruining <c.kruining@4dotnet.nl>
Date: Tue, 21 Oct 2025 09:01:22 +0200
Subject: [PATCH] some fixes

---
 .../nixos/services/authentication/zitadel/default.nix |  6 ++++--
 modules/nixos/services/observability/loki/default.nix |  2 +-
 .../nixos/services/observability/promtail/default.nix |  8 +++++---
 systems/x86_64-linux/ulmo/default.nix                 | 11 +++++++++++
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/modules/nixos/services/authentication/zitadel/default.nix b/modules/nixos/services/authentication/zitadel/default.nix
index 2693ed5..e0e4a59 100644
--- a/modules/nixos/services/authentication/zitadel/default.nix
+++ b/modules/nixos/services/authentication/zitadel/default.nix
@@ -117,12 +117,12 @@ in
         enable = true;
         virtualHosts = {
           "auth.kruining.eu".extraConfig = ''
-            reverse_proxy h2c://127.0.0.1:9092
+            reverse_proxy h2c://::1:9092
           '';
         };
         extraConfig = ''
           (auth) {
-            forward_auth h2c://127.0.0.1:9092 {
+            forward_auth h2c://::1:9092 {
               uri /api/authz/forward-auth
               copy_headers Remote-User Remote-Groups Remote-Email Remote-Name
             }
@@ -130,6 +130,8 @@ in
         '';
       };
     };
+      
+    networking.firewall.allowedTCPPorts = [ 80 443 ];
 
     # Secrets
     sops.secrets."zitadel/masterKey" = {
diff --git a/modules/nixos/services/observability/loki/default.nix b/modules/nixos/services/observability/loki/default.nix
index 8f6e0e3..d4774ac 100644
--- a/modules/nixos/services/observability/loki/default.nix
+++ b/modules/nixos/services/observability/loki/default.nix
@@ -23,7 +23,7 @@ in
         common = {
           ring = {
             instance_addr = "127.0.0.1";
-            kvstore.store = "inmmemory";
+            kvstore.store = "inmemory";
           };
           replication_factor = 1;
           path_prefix = "/tmp/loki";
diff --git a/modules/nixos/services/observability/promtail/default.nix b/modules/nixos/services/observability/promtail/default.nix
index 1f32adc..25aabbd 100644
--- a/modules/nixos/services/observability/promtail/default.nix
+++ b/modules/nixos/services/observability/promtail/default.nix
@@ -29,9 +29,11 @@ in
           filename = "filename";
         };
 
-        clients = {
-          url = "http://127.0.0.1:3100/loki/api/v1/push";
-        };
+        clients = [
+          {
+            url = "http://::1:9003/loki/api/v1/push";
+          }
+        ];
 
         scrape_configs = [
           {
diff --git a/systems/x86_64-linux/ulmo/default.nix b/systems/x86_64-linux/ulmo/default.nix
index f93d7d1..0794585 100644
--- a/systems/x86_64-linux/ulmo/default.nix
+++ b/systems/x86_64-linux/ulmo/default.nix
@@ -25,6 +25,17 @@
     };
   };
 
+  # Expose amarht cloud stuff like this until I have a proper solution
+  services.caddy.virtualHosts = {
+    "auth.amarth.cloud".extraConfig = ''
+      reverse_proxy http://192.168.1.223:9092
+    '';
+
+    "amarth.cloud".extraConfig = ''
+      reverse_proxy http://192.168.1.223:8080
+    '';
+  };
+
   sneeuwvlok = {
     services = {
       # authentication.authelia.enable = true;