From 41f2fcd403f27cae1ce8829585a60d21b2164c20 Mon Sep 17 00:00:00 2001
From: arcnmx <git@git.arcn.mx>
Date: Wed, 14 Aug 2024 08:50:41 -0700
Subject: [PATCH] fix(moonraker): listen address

---
 modules/system/exports/moonraker.nix |  1 -
 nixos/fluidd.nix                     | 12 ++++++++++--
 nixos/moonraker.nix                  |  4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/modules/system/exports/moonraker.nix b/modules/system/exports/moonraker.nix
index 791b9c14..55498655 100644
--- a/modules/system/exports/moonraker.nix
+++ b/modules/system/exports/moonraker.nix
@@ -31,7 +31,6 @@ in {
         protocol = "http";
         status = {
           enable = mkAlmostOptionDefault true;
-          gatus.client.network = mkAlmostOptionDefault "ip4";
         };
       };
     };
diff --git a/nixos/fluidd.nix b/nixos/fluidd.nix
index f8afe2ad..a5992347 100644
--- a/nixos/fluidd.nix
+++ b/nixos/fluidd.nix
@@ -1,6 +1,6 @@
-{ config, gensokyo-zone, lib, ... }: let
+{ config, access, gensokyo-zone, lib, ... }: let
   inherit (gensokyo-zone.lib) domain;
-  inherit (lib.modules) mkIf mkDefault;
+  inherit (lib.modules) mkIf mkDefault mkForce;
   inherit (lib.strings) removePrefix;
   cfg = config.services.fluidd;
   serverName = "@fluidd_internal";
@@ -17,6 +17,14 @@ in {
     };
     nginx = mkIf cfg.enable {
       proxied.enable = true;
+      upstreams.fluidd-apiserver = let
+        moonraker = access.proxyUrlFor {
+          serviceName = "moonraker";
+          scheme = "";
+        };
+      in mkForce {
+        servers.${moonraker} = { };
+      };
       virtualHosts = {
         ${cfg.hostName} = {
           enable = false;
diff --git a/nixos/moonraker.nix b/nixos/moonraker.nix
index 9fe4fa23..ec98bbb5 100644
--- a/nixos/moonraker.nix
+++ b/nixos/moonraker.nix
@@ -14,7 +14,7 @@
   services = {
     moonraker = {
       enable = mkDefault true;
-      address = mkDefault "0.0.0.0";
+      address = mkDefault "all";
       user = mkDefault klipper.user;
       group = mkDefault klipper.group;
       port = 7125; # it's the default but i'm specifying it anyway
@@ -46,7 +46,7 @@
           trusted_clients =
             access.cidrForNetwork.allLocal.all
             # XXX: only safe when protected behind vouch!
-            ++ [ "0.0.0.0/24" ];
+            ++ [ "0.0.0.0/0" "::/0" ];
         };
       };
     };