From ea0149b5d428a2f06601f63cd197af24f276a826 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Mon, 11 Aug 2025 10:41:06 +0200
Subject: [PATCH] Replaced nextcloud-application by nextcloud container name

---
 .../templates/sys-cln-disc-space.sh.j2                 |  2 +-
 roles/web-app-nextcloud/docs/LDAP.md                   |  8 ++++----
 roles/web-app-nextcloud/docs/Update.md                 | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/roles/sys-cln-disc-space/templates/sys-cln-disc-space.sh.j2 b/roles/sys-cln-disc-space/templates/sys-cln-disc-space.sh.j2
index 54a2a311..0d368ced 100644
--- a/roles/sys-cln-disc-space/templates/sys-cln-disc-space.sh.j2
+++ b/roles/sys-cln-disc-space/templates/sys-cln-disc-space.sh.j2
@@ -31,7 +31,7 @@ if [ "$force_freeing" = true ]; then
     echo "cleaning up docker" &&
     docker system prune -f || exit 3
 
-    nextcloud_application_container="nextcloud-application"
+    nextcloud_application_container="{{ applications | get_app_conf(application_id, 'docker.services.nextcloud.name', True) }}"
     if [ "$(docker ps -a -q -f name=$nextcloud_application_container)" ] ; then
       echo "cleaning up docker nextcloud" &&
       docker exec -it -u www-data $nextcloud_application_container /var/www/html/occ files:cleanup || exit 4
diff --git a/roles/web-app-nextcloud/docs/LDAP.md b/roles/web-app-nextcloud/docs/LDAP.md
index 3017acea..33b79309 100644
--- a/roles/web-app-nextcloud/docs/LDAP.md
+++ b/roles/web-app-nextcloud/docs/LDAP.md
@@ -9,7 +9,7 @@ To make LDAP users available for sharing **without requiring initial login**, fo
 Check if the user exists in the configured LDAP directory:
 
 ```bash
-docker exec -u www-data nextcloud-application php occ ldap:search <username>
+docker exec -u www-data nextcloud php occ ldap:search <username>
 ```
 
 If the user is found, proceed to the next step.
@@ -19,13 +19,13 @@ If the user is found, proceed to the next step.
 Manually trigger a sync to register the user in the Nextcloud database:
 
 ```bash
-docker exec -u www-data nextcloud-application php occ ldap:check-user --update <username>
+docker exec -u www-data nextcloud php occ ldap:check-user --update <username>
 ```
 
 **Example:**
 
 ```bash
-docker exec -u www-data nextcloud-application php occ ldap:check-user --update viktoriakaffanke
+docker exec -u www-data nextcloud php occ ldap:check-user --update viktoriakaffanke
 ```
 
 Once executed, the user becomes fully available in the system—for sharing, group membership, and permissions—even without logging in.
@@ -35,7 +35,7 @@ Once executed, the user becomes fully available in the system—for sharing, gro
 To synchronize account data (display name, mail address, group memberships, etc.) for **all users** currently known to Nextcloud:
 
 ```bash
-docker exec -u www-data nextcloud-application php occ user:sync-account-data
+docker exec -u www-data nextcloud php occ user:sync-account-data
 ```
 
 This step is especially useful after modifying LDAP attributes or group memberships, ensuring up-to-date data in the Nextcloud UI and permission system.
\ No newline at end of file
diff --git a/roles/web-app-nextcloud/docs/Update.md b/roles/web-app-nextcloud/docs/Update.md
index e4ae1b7a..21705c27 100644
--- a/roles/web-app-nextcloud/docs/Update.md
+++ b/roles/web-app-nextcloud/docs/Update.md
@@ -2,7 +2,7 @@
 
 To update the Nextcloud container, execute the following commands on the server:
 ```bash
-docker exec -it -u www-data nextcloud-application /var/www/html/occ maintenance:mode --on &&
+docker exec -it -u www-data nextcloud /var/www/html/occ maintenance:mode --on &&
 export COMPOSE_HTTP_TIMEOUT=600 &&
 export DOCKER_CLIENT_TIMEOUT=600 &&
 docker-compose down
@@ -25,14 +25,14 @@ docker-compose exec -it application top
 
 If Nextcloud remains in maintenance mode after the update, try the following:
 ```bash
-docker exec -it -u www-data nextcloud-application /var/www/html/occ maintenance:mode --on
-docker exec -it -u www-data nextcloud-application /var/www/html/occ upgrade
-docker exec -it -u www-data nextcloud-application /var/www/html/occ maintenance:mode --off
+docker exec -it -u www-data nextcloud /var/www/html/occ maintenance:mode --on
+docker exec -it -u www-data nextcloud /var/www/html/occ upgrade
+docker exec -it -u www-data nextcloud /var/www/html/occ maintenance:mode --off
 ```
 
 If the update process fails, execute:
 ```bash
-docker exec -it -u www-data nextcloud-application /var/www/html/occ maintenance:repair --include-expensive
+docker exec -it -u www-data nextcloud /var/www/html/occ maintenance:repair --include-expensive
 ```
 and disable any non-functioning apps.