From 4e5c956f784f5f359795d82cf815475bfa9aa2ac Mon Sep 17 00:00:00 2001
From: sora-ext <sora.ext@helcel.net>
Date: Wed, 3 Jun 2026 17:17:02 +0200
Subject: [PATCH] Update modules/server/containers/apps/nextcloud.nix

---
 modules/server/containers/apps/nextcloud.nix | 26 +++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/modules/server/containers/apps/nextcloud.nix b/modules/server/containers/apps/nextcloud.nix
index 75ee75b..352afc9 100644
--- a/modules/server/containers/apps/nextcloud.nix
+++ b/modules/server/containers/apps/nextcloud.nix
@@ -6,14 +6,9 @@ in {
   sops = true;
   db = true;
   paths = [{
-    path="${serverCfg.dataPath}/nextcloud/www";
+    path="${serverCfg.path.config}/nextcloud";
     owner = "33:33";
     mode = "0755";
-  }{
-    path="${serverCfg.dataPath}/nextcloud/data";
-    owner = "33:33";
-    mode = "0755";
-    backup = true;
   }];
 
   containers = {
@@ -28,13 +23,14 @@ in {
         POSTGRES_USER = "nextcloud_user";
         POSTGRES_DB = "nextcloud_db";
         AUTHENTIK_POSTGRESQL__SSLMODE = "disable";
-        "NEXTCLOUD_TRUSTED_DOMAINS " = "${containerCfg.subdomain}.${serverCfg.domain} nextcloud-server";
-        "SMTP_HOST" = serverCfg.mailServer;
-        "SMTP_NAME" = "mail_user";
-        "SMTP_PASSWORD" = "mail_password";
-        "MAIL_FROM_ADDRESS" = "${containerCfg.subdomain}@${serverCfg.domain}";
-        "MAIL_DOMAIN" = serverCfg.mailDomain;
-        "TRUSTED_PROXIES" = "10.10.0.0/16 192.168.0.0/16";
+        NEXTCLOUD_TRUSTED_DOMAINS = "${containerCfg.subdomain}.${serverCfg.domain} nextcloud-server";
+        SMTP_HOST = serverCfg.mail.server;
+        SMTP_NAME = "mail_user";
+        SMTP_PASSWORD = "mail_password";
+        MAIL_FROM_ADDRESS = "${containerCfg.subdomain}@${serverCfg.domain}";
+        MAIL_DOMAIN = serverCfg.mail.domain;
+        TRUSTED_PROXIES = "10.10.0.0/16 192.168.0.0/16";
+        NEXTCLOUD_DATA_DIR = "/var/www/html/data";
       };
       extraLabels = {
         "traefik.http.routers.${containerCfg.subdomain}.middlewares" = "sts_headers,${containerCfg.subdomain}-caldav";
@@ -50,8 +46,8 @@ in {
       overrides = {
         ports = if containerCfg.port!=null then [ "${toString containerCfg.port}:80" ] else [];
         volumes = [
-          "${serverCfg.dataPath}/nextcloud/www:/var/www/html"
-          "${serverCfg.dataPath}/nextcloud/data:/var/www/html/data"
+          "${serverCfg.path.config}/nextcloud:/var/www/html"
+          "${serverCfg.path.cloud}:/var/www/html/data"
         ];
       };
     };