From 1c0dd0761219e4b3ec5757c4afe5dc6b3aeb7836 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Fri, 27 Sep 2024 15:46:44 +0300
Subject: [PATCH] re-enable immich

---
 data.nix                            |  1 +
 hosts/fwminex/configuration.nix     |  2 +-
 modules/services/immich/default.nix | 10 ++++------
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/data.nix b/data.nix
index 84c0ab1..e89e65d 100644
--- a/data.nix
+++ b/data.nix
@@ -195,6 +195,7 @@ rec {
       @                               NS     ns2.jakstys.lt.
       @                                A     ${vno1}
       www                              A     ${vno1}
+      photos                           A     ${vno1}
       ns1                              A     ${vno1}
       ns2                              A     ${fra1b}
       vpn                              A     ${vno1}
diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix
index 3077cfa..0a2a34b 100644
--- a/hosts/fwminex/configuration.nix
+++ b/hosts/fwminex/configuration.nix
@@ -442,7 +442,7 @@ in
       };
 
       immich = {
-        enable = false;
+        enable = true;
         paths = {
           "M-Camera" = "/home/motiejus/annex2/M-Active";
           "Pictures" = "/home/motiejus/annex2/Pictures";
diff --git a/modules/services/immich/default.nix b/modules/services/immich/default.nix
index 58ab60a..34e5402 100644
--- a/modules/services/immich/default.nix
+++ b/modules/services/immich/default.nix
@@ -24,12 +24,10 @@ in
       package = pkgs.pkgs-unstable.immich;
     };
 
-    mj.services.friendlyport.ports = [
-      {
-        subnets = [ myData.subnets.tailscale.cidr ];
-        tcp = [ myData.ports.immich-server ];
-      }
-    ];
+    services.caddy.virtualHosts."photos.jakstys.lt:80".extraConfig = ''
+      @denied not remote_ip ${myData.subnets.tailscale.cidr}
+      reverse_proxy 127.0.0.1:${toString myData.ports.immich-server}
+    '';
 
     #systemd = {
     #  #tmpfiles.rules = [ "d /var/cache/immich/userdata 0700 immich immich -" ];