Merge pull request #8 from lalmeras/fix-user-ini

Reorder perms and conf checks when upgrading

tasks/filesystem.yml

@@ -0,0 +1,13 @@
+---
+# perform fixes on filesystem (selinux, perms,
+# configuration inside nextcloud_web_root)
+
+- name: ensure .user.ini config is present
+  template:
+    src: user.ini.j2
+    dest: '{{ nextcloud_web_root }}/.user.ini'
+  notify:
+    - reload nginx
+    - reload php-fpm
+
+- import_tasks: 'permissions.yml'

tasks/installation.yml

@@ -10,7 +10,7 @@
     remote_src: true
     dest: '{{ nextcloud_web_root }}'
 
-- import_tasks: 'permissions.yml'
+- import_tasks: 'filesystem.yml'
 
 - name: installation - ensure nextcloud installation is finished
   command: 'php {{ nextcloud_web_root }}/occ maintenance:install --database "mysql" --database-name "{{ nextcloud_mysql_db }}"  --database-user "{{ nextcloud_mysql_user }}" --database-pass "{{ nextcloud_mysql_pw }}" --admin-user "{{ nextcloud_admin_user }}" --admin-pass "{{ nextcloud_admin_pw }}" --data-dir "{{ nextcloud_data_root }}"'

tasks/main.yml

@@ -238,22 +238,16 @@
 - import_tasks: 'installation.yml'
   when: new_installation.changed
 
-- name: ensure .user.ini config is present
-  template:
-    src: user.ini.j2
-    dest: '{{ nextcloud_web_root }}/.user.ini'
-  notify:
-    - reload nginx
-    - reload php-fpm
-
-- name: performance tuning - ensure the nextcloud cronjob exists and runs every 15 min         
-  cron:               
-    name: nextcloud           
-    minute: 15                
-    user: nginx               
-    job: 'php -f {{ nextcloud_web_root | quote }}/cron.php'
-
-- import_tasks: 'permissions.yml'
-
 - import_tasks: 'upgrade.yml'
   when: nextcloud_upgrade
+
+# call filesystem checks if not done by previous tasks
+- import_tasks: filesystem.yml
+  when: not new_installation.changed and not new_installation.changed
+
+- name: performance tuning - ensure the nextcloud cronjob exists and runs every 15 min
+  cron:
+    name: nextcloud
+    minute: 15
+    user: nginx
+    job: 'php -f {{ nextcloud_web_root | quote }}/cron.php'

tasks/upgrade.yml

@@ -15,6 +15,8 @@
   register: nextcloud_update_result
   changed_when: false # unsure if upgrade has been done -> inform later
 
+- import_tasks: filesystem.yml
+
 - name: get current nextcloud version, after running updater.phar
   shell: '{{ nextcloud_web_root }}/occ -V'
   become: true