From 98de668e52492eebd5eb1d918ab4c34cf5d5db32 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Fri, 23 Feb 2024 00:43:16 -0500
Subject: [PATCH] fix(arion): set correct ip for nextcloud

---
 devices/cluster/modules/caddy.nix            |  4 +--
 devices/nas/modules/arion/immich/.env        |  7 ------
 devices/nas/modules/arion/immich/compose.nix | 26 ++++++++++++++++----
 flake.lock                                   |  8 +++---
 4 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/devices/cluster/modules/caddy.nix b/devices/cluster/modules/caddy.nix
index 3f37667..183e63f 100644
--- a/devices/cluster/modules/caddy.nix
+++ b/devices/cluster/modules/caddy.nix
@@ -57,7 +57,7 @@ in {
           resauth.reverseProxy = "${dockerIP}:3100";
 
           # Nextcloud & Co
-          office.reverseProxy = "http://${dockerIP}:8055";
+          office.reverseProxy = "http://${servivi}:8055";
           nextcloud = {
             subDomainName = "cloud";
             extraConfig = ''
@@ -66,7 +66,7 @@ in {
               redir /.well-known/webfinger /index.php/.well-known/webfinger 301
               redir /.well-known/nodeinfo /index.php/.well-known/nodeinfo 301
             '';
-            reverseProxy = "${dockerIP}:8042";
+            reverseProxy = "${servivi}:8042";
           };
 
           forgejo = {
diff --git a/devices/nas/modules/arion/immich/.env b/devices/nas/modules/arion/immich/.env
index b6d0b73..0b0431e 100644
--- a/devices/nas/modules/arion/immich/.env
+++ b/devices/nas/modules/arion/immich/.env
@@ -1,10 +1,3 @@
-DB_HOSTNAME=immich_postgres
-DB_USERNAME=postgres
-DB_PASSWORD=postgres
-DB_DATABASE_NAME=immich
-
-REDIS_HOSTNAME=immich_redis
-
 PUBLIC_LOGIN_PAGE_MESSAGE=
 
 IMMICH_WEB_URL=http://immich-web:3000
diff --git a/devices/nas/modules/arion/immich/compose.nix b/devices/nas/modules/arion/immich/compose.nix
index af8a310..1af5597 100644
--- a/devices/nas/modules/arion/immich/compose.nix
+++ b/devices/nas/modules/arion/immich/compose.nix
@@ -1,4 +1,5 @@
 {config, ...}: let
+  inherit (config.sops) secrets;
   inherit (config.arion) rwDataDir;
 
   rwPath = rwDataDir + "/immich";
@@ -9,7 +10,10 @@ in {
     "immich_server" = {
       image = ./images/server.nix;
       command = ["start.sh" "immich"];
-      env_file = ["${./.env}"];
+      env_file = [
+        "${./.env}"
+        secrets.immich.path
+      ];
 
       volumes = [
         "${UPLOAD_LOCATION}:/usr/src/app/upload:rw"
@@ -27,7 +31,10 @@ in {
     "immich_microservices" = {
       image = ./images/server.nix;
       command = ["start.sh" "microservices"];
-      env_file = ["${./.env}"];
+      env_file = [
+        "${./.env}"
+        secrets.immich.path
+      ];
 
       volumes = [
         "${UPLOAD_LOCATION}:/usr/src/app/upload:rw"
@@ -40,7 +47,10 @@ in {
     "immich_machine_learning" = {
       image = ./images/machine-learning.nix;
       restart = "always";
-      env_file = ["${./.env}"];
+      env_file = [
+        "${./.env}"
+        secrets.immich.path
+      ];
 
       volumes = [
         "${rwPath}/cache:/cache"
@@ -51,13 +61,19 @@ in {
       image = ./images/redis.nix;
       restart = "always";
       tmpfs = ["/data"];
-      env_file = ["${./.env}"];
+      env_file = [
+        "${./.env}"
+        secrets.immich.path
+      ];
     };
 
     "immich_postgres" = {
       image = ./images/postgres.nix;
       restart = "always";
-      env_file = ["${./.env}"];
+      env_file = [
+        "${./.env}"
+        secrets.immich.path
+      ];
 
       volumes = [
         "${rwPath}/db:/var/lib/postgresql/data"
diff --git a/flake.lock b/flake.lock
index 2c870f4..e14d6e5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1342,11 +1342,11 @@
         "sops-nix": "sops-nix"
       },
       "locked": {
-        "lastModified": 1708664449,
-        "narHash": "sha256-rotTXLKXndrSrIQ11cZjHXuj+dqJkANAxCRzvsFpXBs=",
+        "lastModified": 1708666849,
+        "narHash": "sha256-+NhnK9Hu9x4cd0g7Basyl3C5leuV0deKHsLBwGB+Yl8=",
         "ref": "refs/heads/main",
-        "rev": "adc3aa2adff3a259b96f070e2abfdb33f2364bf9",
-        "revCount": 42,
+        "rev": "cd38fa99b54c6a359610cfc246b4464b5df34dff",
+        "revCount": 43,
         "type": "git",
         "url": "ssh://git@git.nelim.org/matt1432/nixos-secrets"
       },