From b5ca1ce80f2e5b80349fb016683bc5932f16b59b Mon Sep 17 00:00:00 2001
From: Felix Stupp <felix.stupp@outlook.com>
Date: Sun, 7 Jun 2020 18:19:22 +0200
Subject: [PATCH] server/nextcloud: Renamed var nextcloud_user_directory to
 user_directory

---
 roles/server/nextcloud/defaults/main.yml | 10 +++++-----
 roles/server/nextcloud/meta/main.yml     |  2 +-
 roles/server/nextcloud/tasks/install.yml |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/roles/server/nextcloud/defaults/main.yml b/roles/server/nextcloud/defaults/main.yml
index 98bc099..772caf4 100644
--- a/roles/server/nextcloud/defaults/main.yml
+++ b/roles/server/nextcloud/defaults/main.yml
@@ -10,12 +10,12 @@ nextcloud_release_remote: "https://download.nextcloud.com/server/releases/latest
 nextcloud_release_remote_checksum: "{{ nextcloud_release_remote }}.sha256"
 nextcloud_release_remote_signature: "{{ nextcloud_release_remote }}.asc"
 
-nextcloud_user_directory: "{{ global_webservers_directory }}/{{ domain }}"
-nextcloud_installation_directory: "{{ nextcloud_user_directory }}/nextcloud" # directory name of inside downloaded tar zip
-nextcloud_data_directory: "{{ nextcloud_user_directory }}/data"
+user_directory: "{{ global_webservers_directory }}/{{ domain }}"
+nextcloud_installation_directory: "{{ user_directory }}/nextcloud" # directory name of inside downloaded tar zip
+nextcloud_data_directory: "{{ user_directory }}/data"
 
-nextcloud_keyring: "{{ nextcloud_user_directory }}/nextcloud.gpg"
-nextcloud_release_file: "{{ nextcloud_user_directory }}/nextcloud.tar.bz2"
+nextcloud_keyring: "{{ user_directory }}/nextcloud.gpg"
+nextcloud_release_file: "{{ user_directory }}/nextcloud.tar.bz2"
 nextcloud_release_signature: "{{ nextcloud_release_file }}.asc"
 nextcloud_config: "{{ nextcloud_installation_directory }}/config/config.php"
 
diff --git a/roles/server/nextcloud/meta/main.yml b/roles/server/nextcloud/meta/main.yml
index 396eddd..e4f307f 100644
--- a/roles/server/nextcloud/meta/main.yml
+++ b/roles/server/nextcloud/meta/main.yml
@@ -5,7 +5,7 @@ allow_duplicates: yes
 dependencies:
   - role: misc/system_user
     # system_user
-    user_directory: "{{ nextcloud_user_directory }}"
+    # user_directory
     user_directory_group: "{{ nginx_system_user }}"
   - role: misc/backup_files
     # domain
diff --git a/roles/server/nextcloud/tasks/install.yml b/roles/server/nextcloud/tasks/install.yml
index f862381..e998370 100644
--- a/roles/server/nextcloud/tasks/install.yml
+++ b/roles/server/nextcloud/tasks/install.yml
@@ -26,7 +26,7 @@
     {{ nextcloud_gpg_fingerprint | quote }}
     {{ nextcloud_keyring | quote }}
   args:
-    chdir: "{{ nextcloud_user_directory }}"
+    chdir: "{{ user_directory }}"
   register: receive_public_key
   changed_when: receive_public_key.rc != 2
   failed_when: receive_public_key.rc != 0 and receive_public_key != 2
@@ -40,14 +40,14 @@
     --keyring "{{ nextcloud_keyring }}"
     --verify "{{ nextcloud_release_signature }}"
   args:
-    chdir: "{{ nextcloud_user_directory }}"
+    chdir: "{{ user_directory }}"
 
 - name: Unpack Nextcloud release
   become_user: "{{ system_user }}"
   unarchive:
     src: "{{ nextcloud_release_file }}"
     remote_src: yes
-    dest: "{{ nextcloud_user_directory }}"
+    dest: "{{ user_directory }}"
     owner: "{{ system_user }}"
     group: "{{ system_user }}"