From 8d597cff7bb1947bfb566727718cd9863dd52bec Mon Sep 17 00:00:00 2001
From: Menno van Leeuwen <menno@vleeuwen.me>
Date: Fri, 14 Mar 2025 10:46:11 +0100
Subject: [PATCH] feat: add Collabora service configuration to Nextcloud setup
 and update environment variables

---
 .../services/nextcloud/docker-compose.yml.j2   | 18 +++++++++++++++---
 .../servers/services/nextcloud/nextcloud.yml   |  2 ++
 2 files changed, 17 insertions(+), 3 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 5c058e2..9ce22c6 100644
--- a/config/ansible/tasks/servers/services/nextcloud/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/nextcloud/docker-compose.yml.j2
@@ -23,7 +23,6 @@ services:
     volumes:
       - {{nextcloud_data_dir}}/nextcloud-data:/var/www/html
     environment:
-      - NEXTCLOUD_TRUSTED_DOMAINS="cloud.mvl.sh cloud.vleeuwen.me"
       - MYSQL_PASSWORD={{ lookup('community.general.onepassword', 'x5jporz6fguqsm4dmwrb6juua4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='MYSQL_PASSWORD') }}
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
@@ -36,8 +35,21 @@ services:
       - OBJECTSTORE_S3_SSL=true
       - OBJECTSTORE_S3_USEPATH_STYLE=true
       - OBJECTSTORE_S3_AUTOCREATE=true
-      - 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_ADMIN_USER={{ lookup('community.general.onepassword', 'x5jporz6fguqsm4dmwrb6juua4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='username') }}
+      - NEXTCLOUD_ADMIN_PASSWORD={{ lookup('community.general.onepassword', 'x5jporz6fguqsm4dmwrb6juua4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='password') }}
+    networks:
+      - caddy_network
+      - nextcloud
+
+  code:
+    image: collabora/code:latest
+    restart: always
+    environment:
+      - username={{collabora_user}}
+      - password={{collabora_pass}}
+      - server_name=collabora.mvl.sh
+    ports:
+      - 9980:9980    
     networks:
       - caddy_network
       - nextcloud
diff --git a/config/ansible/tasks/servers/services/nextcloud/nextcloud.yml b/config/ansible/tasks/servers/services/nextcloud/nextcloud.yml
index 1a56828..559a82d 100644
--- a/config/ansible/tasks/servers/services/nextcloud/nextcloud.yml
+++ b/config/ansible/tasks/servers/services/nextcloud/nextcloud.yml
@@ -5,6 +5,8 @@
       ansible.builtin.set_fact:
         nextcloud_service_dir: "{{ ansible_env.HOME }}/services/nextcloud"
         nextcloud_data_dir: "/mnt/services/nextcloud"
+        collabora_user: "{{ lookup('community.general.onepassword', 'x5jporz6fguqsm4dmwrb6juua4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='COLLABORA_USERNAME') }}"
+        collabora_pass: "{{ lookup('community.general.onepassword', 'x5jporz6fguqsm4dmwrb6juua4', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='COLLABORA_PASSWORD') }}"
         hetzner_access_key: "{{ lookup('community.general.onepassword', 'mfk2qgnaplgtk6xmfc3r6w6neq', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='AWS_ACCESS_KEY_ID') }}"
         hetzner_secret_key: "{{ lookup('community.general.onepassword', 'mfk2qgnaplgtk6xmfc3r6w6neq', vault='j7nmhqlsjmp2r6umly5t75hzb4', field='AWS_SECRET_ACCESS_KEY') }}"