From f20c4979d0f0c030c3b083ba6b4b3ce795ff2fff Mon Sep 17 00:00:00 2001
From: Menno van Leeuwen <menno@vleeuwen.me>
Date: Fri, 14 Mar 2025 01:21:35 +0100
Subject: [PATCH] feat: move Nextcloud admin user and password environment
 variables to the correct service in docker-compose configuration

---
 .../tasks/servers/services/nextcloud/docker-compose.yml.j2    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/ansible/tasks/servers/services/nextcloud/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/nextcloud/docker-compose.yml.j2
index 81dbf0e..03f3b09 100644
--- a/config/ansible/tasks/servers/services/nextcloud/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/nextcloud/docker-compose.yml.j2
@@ -10,8 +10,6 @@ services:
       - MYSQL_PASSWORD={{ lookup('community.general.onepassword', 'x5jporz6fguqsm4dmwrb6juua4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='MYSQL_PASSWORD') }}
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
-      - NEXTCLOUD_ADMIN_USER={{ lookup('community.general.onepassword', 'x5jporz6fguqsm4dmwrb6juua4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='NEXTCLOUD_ADMIN_USER') }}
-      - NEXTCLOUD_ADMIN_PASSWORD={{ lookup('community.general.onepassword', 'x5jporz6fguqsm4dmwrb6juua4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='NEXTCLOUD_ADMIN_PASSWORD') }}
 
   nextcloud:
     image: nextcloud
@@ -27,6 +25,8 @@ services:
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
       - MYSQL_HOST=db
+      - NEXTCLOUD_ADMIN_USER={{ lookup('community.general.onepassword', 'x5jporz6fguqsm4dmwrb6juua4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='NEXTCLOUD_ADMIN_USER') }}
+      - NEXTCLOUD_ADMIN_PASSWORD={{ lookup('community.general.onepassword', 'x5jporz6fguqsm4dmwrb6juua4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='NEXTCLOUD_ADMIN_PASSWORD') }}
     networks:
       - caddy_network