Merge pull request #1261 from holta/master

Clean roles/nextcloud/tasks/main.yml

roles/nextcloud/tasks/main.yml

@@ -58,7 +58,7 @@
     state: present
   when: is_debuntu
 
-- name: In php7.2, php dropped mcrypt (debuntu but not ubuntu-18)
+- name: Install php{{ php_version }}-mcrypt (debuntu but not ubuntu-18) NOTE: php7.2 dropped mcrypt
   package:
     name: "php{{ php_version }}-mcrypt"
     state: present
@@ -82,19 +82,12 @@
     state: present
   when: is_redhat
 
-- name: Copy it to permanent location /opt (OS's other than Fedora 18)
+- name: Unpack {{ nextcloud_src_file }} to permanent location /opt/nextcloud
   unarchive:
     src: "{{ downloads_dir }}/{{ nextcloud_src_file }}"
     dest: "{{ nextcloud_prefix }}"
-#   creates: "{{ nextcloud_prefix }}/nextcloud/version.php"
-  when: not is_F18 and nextcloud_force_install
-
-# Ansible 1.4.1 does not have "creates" (but hopefully has "when")
-- name: Copy it to permanent location /opt (Fedora 18)
-  unarchive:
-    src: "{{ downloads_dir }}/{{ nextcloud_src_file }}"
-    dest: "{{ nextcloud_prefix }}"
-  when: is_F18 and nextcloud_force_install
+    #creates: "{{ nextcloud_prefix }}/nextcloud/version.php"
+  when: nextcloud_force_install
 
 - name: In CentOS, the following config dir is symlink to /etc/nextcloud
   file:
@@ -129,12 +122,12 @@
   with_items:
     - "{{ nextcloud_data_dir }}"
 
-- name: Create a MySQL database for Nextcloud
+- name: Create MySQL database {{ nextcloud_dbname }} for Nextcloud
   mysql_db:
     name: "{{ nextcloud_dbname }}"
   when: mysql_enabled and nextcloud_enabled
 
-- name: Create a user to access the Nextcloud database
+- name: Create username/password for Nextcloud database
   mysql_user:
     name: "{{ nextcloud_dbuser }}"
     host: "{{ item }}"
@@ -148,7 +141,7 @@
   when: mysql_enabled and nextcloud_enabled
 
 
-- name: Restart Apache, so it picks up the new aliases
+- name: Restart Apache, to enable/disable http://box/nextcloud
   service:
     name: "{{ apache_service }}"
     state: restarted