From 588c4d583671f45977a125cbf2d2ef872d2ab419 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 2 May 2025 15:56:21 -0400
Subject: [PATCH] [prefect.caddy] Use the anubis ports for services that have
 it enabled

---
 .../x86_64-linux/prefect/services/caddy.nix   | 48 ++++++++++++++-----
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/systems/x86_64-linux/prefect/services/caddy.nix b/systems/x86_64-linux/prefect/services/caddy.nix
index a96d2bcb..767512f5 100644
--- a/systems/x86_64-linux/prefect/services/caddy.nix
+++ b/systems/x86_64-linux/prefect/services/caddy.nix
@@ -15,11 +15,11 @@ in
     enable = true;
     package = pkgs.caddy.withPlugins {
       plugins = [
-        "github.com/caddy-dns/desec@v0.0.0-20240526070323-822a6a2014b2"
+        "github.com/caddy-dns/desec@v1.0.1"
         "github.com/greenpau/caddy-security@v1.1.31"
         "github.com/tailscale/caddy-tailscale@v0.0.0-20250207163903-69a970c84556"
       ];
-      hash = "sha256-rvPZ/Lomx40tvlqqhUBIG9wCHJorN2FGus7gtO7ob/0=";
+      hash = "sha256-lsceZXoTPJCDjl84OQTZUTBRuVAxo8KMWjTXzCFwA6U=";
     };
     email = "pyrox@pyrox.dev";
     virtualHosts = {
@@ -68,8 +68,15 @@ in
       };
 
       # Authentik
-      "${pns.authentik.extUrl}:443" = reverseProxyToMarvin pns.authentik.port false;
-      "${pns.authentik.extUrl}:80" = reverseProxyToMarvin pns.authentik.port false;
+      "${pns.authentik.extUrl}:443" = {
+        serverAliases = [ "${pns.authentik.extUrl}:80" ];
+        extraConfig = ''
+            reverse_proxy http://${marvin}:${toString pns.authentik.anubis} {
+          		header_up X-Real-Ip {remote_host}
+              header_up X-Http-Version {http.request.proto}
+            }
+        '';
+      };
       "http://${pns.authentik.extUrl}:389" = reverseProxyToMarvin 389 false;
       "${pns.authentik.extUrl}:636" = reverseProxyToMarvin 636 false;
 
@@ -86,8 +93,9 @@ in
             -X-Powered-By
             -Last-Modified
           }
-          reverse_proxy ${marvin}:${toString pns.vaultwarden.port} {
+          reverse_proxy ${marvin}:${toString pns.vaultwarden.anubis} {
             header_up X-Real-IP {remote_host}
+            header_up X-Http-Version {http.request.proto}
           }
         '';
       };
@@ -169,42 +177,60 @@ in
       # Forgejo
       ${pns.git.extUrl} = {
         extraConfig = ''
-          reverse_proxy http://${marvin}:${toString pns.git.port}
+          reverse_proxy http://${marvin}:${toString pns.git.anubis} {
+            header_up X-Real-Ip {remote_host}
+            header_up X-Http-Version {http.request.proto}
+          }
         '';
       };
 
       # Grafana
       ${pns.grafana.extUrl} = {
         extraConfig = ''
-          reverse_proxy http://${marvin}:${toString pns.grafana.port}
+          reverse_proxy http://${marvin}:${toString pns.grafana.anubis} {
+            header_up X-Real-Ip {remote_host}
+            header_up X-Http-Version {http.request.proto}
+          }
         '';
       };
 
       # Miniflux
       ${pns.miniflux.extUrl} = {
         extraConfig = ''
-          reverse_proxy http://${marvin}:${toString pns.miniflux.port}
+          reverse_proxy http://${marvin}:${toString pns.miniflux.anubis} {
+            header_up X-Real-Ip {remote_host}
+            header_up X-Http-Version {http.request.proto}
+          }
         '';
       };
 
       # Nextcloud
       ${pns.nextcloud.extUrl} = {
         extraConfig = ''
-          reverse_proxy http://${marvin}:${toString pns.nextcloud.port}
+          reverse_proxy http://${marvin}:${toString pns.nextcloud.anubis} {
+            header_up X-Real-Ip {remote_host}
+            header_up X-Http-Version {http.request.proto}
+          }
         '';
       };
 
       # Nextcloud-Office(Collabora)
       ${pns.nextcloud-office.extUrl} = {
         extraConfig = ''
-          reverse_proxy http://${marvin}:${toString pns.nextcloud-office.port}
+          reverse_proxy http://${marvin}:${toString pns.nextcloud-office.anubis} {
+            header_up X-Real-Ip {remote_host}
+            header_up X-Http-Version {http.request.proto}
+          }
         '';
       };
 
       # Planka
       ${pns.planka.extUrl} = {
         extraConfig = ''
-          reverse_proxy http://${marvin}:${toString pns.planka.port}
+          reverse_proxy http://${marvin}:${toString pns.planka.anubis} {
+            header_up X-Real-Ip {remote_host}
+            header_up X-Http-Version {http.request.proto}
+          }
         '';
       };
 
-- 
2.54.0