fix(arion): set correct ip for nextcloud

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 = {

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

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"

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"
       },