From 2e93514a4d5ba8d5950366f6d57f16106fe39282 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Apr 2026 17:25:34 +0000 Subject: [PATCH 1/2] Initial plan From d874c97b2f93464b68913f0f80b11f5295d5597a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 15 Apr 2026 17:27:19 +0000 Subject: [PATCH 2/2] Adjust Nextcloud ownership and data directory handling Agent-Logs-Url: https://github.com/naturallaw777/staging_alpha/sessions/c9190fb9-a4ac-42d9-b85d-2b9367c1a901 Co-authored-by: naturallaw777 <99053422+naturallaw777@users.noreply.github.com> --- modules/nextcloud.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/modules/nextcloud.nix b/modules/nextcloud.nix index e7e380f..34baa5d 100755 --- a/modules/nextcloud.nix +++ b/modules/nextcloud.nix @@ -73,7 +73,7 @@ lib.mkIf config.sovran_systemsOS.services.nextcloud { set -euo pipefail INSTALL_DIR="/var/lib/www/nextcloud" - DATA_DIR="/var/lib/www/nextcloud-data" + DATA_DIR="/var/lib/nextcloud" DOMAIN=$(cat /var/lib/domains/nextcloud) DB_NAME="nextclouddb" DB_USER="ncusr" @@ -97,15 +97,17 @@ lib.mkIf config.sovran_systemsOS.services.nextcloud { echo "Download complete." fi - mkdir -p "$DATA_DIR" - - chown -R caddy:root "$INSTALL_DIR" - chown -R caddy:root "$DATA_DIR" + chown -R caddy:php "$INSTALL_DIR" find "$INSTALL_DIR" -type d -exec chmod 750 {} \; find "$INSTALL_DIR" -type f -exec chmod 640 {} \; chmod -R 770 "$INSTALL_DIR/apps" chmod -R 770 "$INSTALL_DIR/config" - chmod -R 770 "$DATA_DIR" + + if [ ! -d "$DATA_DIR" ]; then + mkdir -p "$DATA_DIR" + chown -R caddy:php "$DATA_DIR" + chmod -R 770 "$DATA_DIR" + fi echo "Waiting for PostgreSQL..." for i in $(seq 1 30); do @@ -177,9 +179,9 @@ CREDS ]; systemd.tmpfiles.rules = [ - "d /var/lib/www 0755 caddy root -" - "d /var/lib/www/nextcloud 0750 caddy root -" - "d /var/lib/www/nextcloud-data 0770 caddy root -" + "d /var/lib/www 0755 caddy php -" + "d /var/lib/www/nextcloud 0750 caddy php -" + "d /var/lib/nextcloud 0770 caddy php -" ]; environment.systemPackages = with pkgs; [ unzip ]; @@ -187,4 +189,4 @@ CREDS sovran_systemsOS.domainRequirements = [ { name = "nextcloud"; label = "Nextcloud"; example = "cloud.yourdomain.com"; } ]; -} \ No newline at end of file +}