server/nextcloud: Renamed var nextcloud_user_directory to user_directory

dehydrated
Felix Stupp 4 years ago
parent 8e22085ba7
commit b5ca1ce80f
Signed by: zocker
GPG Key ID: 93E1BD26F6B02FB7

@ -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_checksum: "{{ nextcloud_release_remote }}.sha256"
nextcloud_release_remote_signature: "{{ nextcloud_release_remote }}.asc" nextcloud_release_remote_signature: "{{ nextcloud_release_remote }}.asc"
nextcloud_user_directory: "{{ global_webservers_directory }}/{{ domain }}" user_directory: "{{ global_webservers_directory }}/{{ domain }}"
nextcloud_installation_directory: "{{ nextcloud_user_directory }}/nextcloud" # directory name of inside downloaded tar zip nextcloud_installation_directory: "{{ user_directory }}/nextcloud" # directory name of inside downloaded tar zip
nextcloud_data_directory: "{{ nextcloud_user_directory }}/data" nextcloud_data_directory: "{{ user_directory }}/data"
nextcloud_keyring: "{{ nextcloud_user_directory }}/nextcloud.gpg" nextcloud_keyring: "{{ user_directory }}/nextcloud.gpg"
nextcloud_release_file: "{{ nextcloud_user_directory }}/nextcloud.tar.bz2" nextcloud_release_file: "{{ user_directory }}/nextcloud.tar.bz2"
nextcloud_release_signature: "{{ nextcloud_release_file }}.asc" nextcloud_release_signature: "{{ nextcloud_release_file }}.asc"
nextcloud_config: "{{ nextcloud_installation_directory }}/config/config.php" nextcloud_config: "{{ nextcloud_installation_directory }}/config/config.php"

@ -5,7 +5,7 @@ allow_duplicates: yes
dependencies: dependencies:
- role: misc/system_user - role: misc/system_user
# system_user # system_user
user_directory: "{{ nextcloud_user_directory }}" # user_directory
user_directory_group: "{{ nginx_system_user }}" user_directory_group: "{{ nginx_system_user }}"
- role: misc/backup_files - role: misc/backup_files
# domain # domain

@ -26,7 +26,7 @@
{{ nextcloud_gpg_fingerprint | quote }} {{ nextcloud_gpg_fingerprint | quote }}
{{ nextcloud_keyring | quote }} {{ nextcloud_keyring | quote }}
args: args:
chdir: "{{ nextcloud_user_directory }}" chdir: "{{ user_directory }}"
register: receive_public_key register: receive_public_key
changed_when: receive_public_key.rc != 2 changed_when: receive_public_key.rc != 2
failed_when: receive_public_key.rc != 0 and receive_public_key != 2 failed_when: receive_public_key.rc != 0 and receive_public_key != 2
@ -40,14 +40,14 @@
--keyring "{{ nextcloud_keyring }}" --keyring "{{ nextcloud_keyring }}"
--verify "{{ nextcloud_release_signature }}" --verify "{{ nextcloud_release_signature }}"
args: args:
chdir: "{{ nextcloud_user_directory }}" chdir: "{{ user_directory }}"
- name: Unpack Nextcloud release - name: Unpack Nextcloud release
become_user: "{{ system_user }}" become_user: "{{ system_user }}"
unarchive: unarchive:
src: "{{ nextcloud_release_file }}" src: "{{ nextcloud_release_file }}"
remote_src: yes remote_src: yes
dest: "{{ nextcloud_user_directory }}" dest: "{{ user_directory }}"
owner: "{{ system_user }}" owner: "{{ system_user }}"
group: "{{ system_user }}" group: "{{ system_user }}"

Loading…
Cancel
Save