From 5fb08b9c85a047a8d4eafd6178f2f1c61a4f1378 Mon Sep 17 00:00:00 2001
From: SebastianStork <sebastian.stork@pm.me>
Date: Sat, 31 Aug 2024 13:01:44 +0200
Subject: [PATCH] Adjust nextcloud data dir structure

---
 hosts/stratus/containers/nextcloud/default.nix   | 3 +--
 hosts/stratus/containers/nextcloud/nextcloud.nix | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hosts/stratus/containers/nextcloud/default.nix b/hosts/stratus/containers/nextcloud/default.nix
index afcee8b..615d66c 100644
--- a/hosts/stratus/containers/nextcloud/default.nix
+++ b/hosts/stratus/containers/nextcloud/default.nix
@@ -7,8 +7,8 @@
   };
 
   systemd.tmpfiles.rules = [
+    "d /var/lib/tailscale-nextcloud - - -"
     "d /data/nextcloud - - -"
-    "d /data/postgresql - - -"
   ];
 
   containers.nextcloud = {
@@ -18,7 +18,6 @@
       "/run/secrets/nextcloud".isReadOnly = false;
       "/run/secrets/tailscale-auth-key" = { };
       "/data/nextcloud".isReadOnly = false;
-      "/data/postgresql".isReadOnly = false;
       "/var/lib/tailscale" = {
         hostPath = "/var/lib/tailscale-nextcloud";
         isReadOnly = false;
diff --git a/hosts/stratus/containers/nextcloud/nextcloud.nix b/hosts/stratus/containers/nextcloud/nextcloud.nix
index 131d2b8..5caabc1 100644
--- a/hosts/stratus/containers/nextcloud/nextcloud.nix
+++ b/hosts/stratus/containers/nextcloud/nextcloud.nix
@@ -6,15 +6,16 @@
 {
   systemd.tmpfiles.rules = [
     "z /run/secrets/nextcloud/admin-password 400 nextcloud nextcloud -"
-    "z /data/postgresql 700 postgres postgres -"
+    "d /data/nextcloud/home 750 nextcloud nextcloud -"
+    "d /data/nextcloud/postgresql 700 postgres postgres -"
   ];
 
-  services.postgresql.dataDir = "/data/postgresql";
+  services.postgresql.dataDir = "/data/nextcloud/postgresql";
 
   services.nextcloud = {
     enable = true;
     package = pkgs.nextcloud29;
-    home = "/data/nextcloud";
+    home = "/data/nextcloud/home";
     hostName = config.networking.fqdn;
 
     database.createLocally = true;