From dd73a87e19d53f8511b5dde697b4c1c1de0af6c3 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Tue, 15 Jul 2025 16:34:25 +0200 Subject: [PATCH] Moved nextcloud client configuration --- roles/desk-nextcloud/tasks/main.yml | 8 ++++---- roles/desk-nextcloud/vars/main.yml | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/roles/desk-nextcloud/tasks/main.yml b/roles/desk-nextcloud/tasks/main.yml index 9da7349b..f45fea68 100644 --- a/roles/desk-nextcloud/tasks/main.yml +++ b/roles/desk-nextcloud/tasks/main.yml @@ -5,8 +5,8 @@ - name: Link homefolders to cloud ansible.builtin.file: - src: "{{cloud_directory}}{{item}}" - dest: "{{user_home_directory}}{{item}}" + src: "{{nextcloud_cloud_directory}}{{item}}" + dest: "{{nextcloud_user_home_directory}}{{item}}" owner: "{{users.client.username}}" group: "{{users.client.username}}" state: link @@ -27,8 +27,8 @@ - name: Link dump folder ansible.builtin.file: - src: "{{cloud_directory}}InstantUpload" - dest: "{{user_home_directory}}Dump" + src: "{{nextcloud_cloud_directory}}InstantUpload" + dest: "{{nextcloud_user_home_directory}}Dump" owner: "{{users.client.username}}" group: "{{users.client.username}}" state: link \ No newline at end of file diff --git a/roles/desk-nextcloud/vars/main.yml b/roles/desk-nextcloud/vars/main.yml index 685f9b02..3ec51eac 100644 --- a/roles/desk-nextcloud/vars/main.yml +++ b/roles/desk-nextcloud/vars/main.yml @@ -1,3 +1,4 @@ -user_home_directory: /home/{{users.client.username}}/ -cloud_directory: '{{user_home_directory}}Clouds/{{cloud_fqdn}}/{{users.client.username}}/' -application_id: desk-nextcloud +application_id: desk-nextcloud +nextcloud_user_home_directory: "/home/{{users.client.username}}/" +nextcloud_cloud_fqdn: "{{ applications | get_app_conf(application_id, 'cloud_fqdn') }}" +nextcloud_cloud_directory: '{{nextcloud_user_home_directory}}Clouds/{{nextcloud_cloud_fqdn}}/{{users.client.username}}/'