From 68e8d0de5493d1a96c19c02d3f2c24b724aff155 Mon Sep 17 00:00:00 2001
From: Kyattsukuro <nikl.free44@gmail.com>
Date: Sun, 27 Sep 2026 15:46:41 +0200
Subject: [PATCH] untested: updated ansible with networkmounts

---
 defaults/main.yml              | 11 ++++++++++-
 tasks/main.yml                 | 26 +++++++++-----------------
 templates/importconfig.json.j2 |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 395be08..f9d2c7f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -7,7 +7,16 @@ nextcloud_defaults:
   db_password: ""
   secret: ""
   secret_salt: ""
-  mail: {}
+
+  networkmount:
+    host: ""
+    host_path: ""
+    args: ""
+  mail:
+    host: ""
+    address: ""
+    password: ""
+
   oidc:
     issuer: ""
     client_id: ""
diff --git a/tasks/main.yml b/tasks/main.yml
index 73ad836..c0ca1d7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -19,23 +19,15 @@
     dest: "{{ path }}/config/nextcloud/importconfig.json"
   register: _importconfig
 
-- block:
-  - name: recreate nextcloud so the configfile gets updated
-    community.docker.docker_compose_v2:
-      project_src: "{{ path }}"
-      project_name: "{{ role_name }}"
-      state: present
-      recreate: always
-      services: "nextcloud"
-      wait: true
-
-  - name: import config
-    community.docker.docker_container_exec:
-      container: "{{ nextcloud_container }}"
-      chdir: "/var/www/html/"
-      user: "www-data"
-      command: "php occ config:import /tmp/importconfig.json"
-  when: "_importconfig.changed or 'installed: false' in nextcloud_status_check.stdout"
+- import_role:
+    name: storage_mount
+  vars:
+    storagebox_override:
+      host: "{{ nextcloud.networkmount.host }}"
+      host_path: "{{ nextcloud.networkmount.host_path }}"
+      args: "{{ nextcloud.networkmount.args }}"
+      dest_path: "{{ nextcloud.data_path }}"
+  when: nextcloud.networkmount.host | length > 1
 
 - name: ensure containers are running
   community.docker.docker_compose_v2:
diff --git a/templates/importconfig.json.j2 b/templates/importconfig.json.j2
index 166c129..b554d18 100644
--- a/templates/importconfig.json.j2
+++ b/templates/importconfig.json.j2
@@ -72,7 +72,7 @@
         "opcache.revalidate_freq": 60,
         "default_phone_region": "DE",
         "memories.gis_type": 1,
-        "mail_domain": "{{ mail.domain }}",
+        "mail_domain": "{{ mail.address.split('@')[-1] }}",
         "mail_from_address": "noreply",
         "mail_smtpmode": "smtp",
         "mail_smtphost": "{{ mail.host }}",