Merge branch 'master' of ssh://git-ssh.notandy.de:2222/ansible/roles/nextcloud

tasks/base.yml

@@ -27,7 +27,26 @@
 - name: setup nextcloud
   become_user: www-data
   become: true
-  command: "/usr/bin/php occ maintenance:install -n --database 'mysql' --database-name '{{ nextcloud.db.name }}'  --database-user '{{ nextcloud.db.user }}' --database-pass '{{ nextcloud.db.pw }}' --admin-user '{{ nextcloud.admin.name }}' --admin-pass '{{ nextcloud.admin.pw }}' --data-dir '{{ nextcloud.datadir }}'"
+  command:
+    argv:
+      - /usr/bin/php
+      - occ
+      - maintenance:install
+      - -n
+      - --database
+      - mysql
+      - --database-name
+      - '{{ nextcloud.db.name }}'
+      - --database-user
+      - '{{ nextcloud.db.user }}'
+      - --database-pass
+      - '{{ nextcloud.db.pw }}'
+      - --admin-user
+      - '{{ nextcloud.admin.name }}'
+      - --admin-pass
+      - '{{ nextcloud.admin.pw }}'
+      - --data-dir
+      - '{{ nextcloud.datadir }}'
   args:
     chdir: /var/www/nextcloud
     creates: /var/www/nextcloud/config/config.php
@@ -35,14 +54,29 @@
 - name: set nextcloud trusted domains
   become_user: www-data
   become: true
-  command: '/usr/bin/php occ config:system:set trusted_domains 1 --value "{{ nextcloud.externalurl }}"'
+  command: # noqa no-changed-when
+    argv:
+      - /usr/bin/php
+      - occ
+      - config:system:set
+      - trusted_domains
+      - 1
+      - --value
+      - "{{ nextcloud.externalurl }}"
   args:
     chdir: /var/www/nextcloud
 
 - name: set other nextcloud config values
   become_user: www-data
   become: true
-  command: '/usr/bin/php occ config:system:set "{{ item.key }}" --value "{{ item.value }}"'
+  command: # noqa no-changed-when
+    argv:
+      - /usr/bin/php
+      - occ
+      - config:system:set
+      - "{{ item.key }}"
+      - --value
+      - "{{ item.value }}"
   args:
     chdir: /var/www/nextcloud
   with_items:
@@ -63,6 +97,9 @@
   template:
     src: nginx.j2
     dest: /etc/nginx/sites-available/nextcloud
+    owner: root
+    group: root
+    mode: 0644
   notify:
   - restart nginx
 

tasks/groupfolders.yml

@@ -11,7 +11,8 @@
         chdir: /var/www/nextcloud
       register: existing_group_folders
 
-    - set_fact:
+    - name: store existing group folders
+      set_fact:
         group_folders: "{{ existing_group_folders.stdout | from_json }}"
 
     # Create group folders that did not exist yet
@@ -33,7 +34,8 @@
         chdir: /var/www/nextcloud
       register: existing_group_folders
 
-    - set_fact:
+    - name: store existing group folders
+      set_fact:
         group_folders: "{{ existing_group_folders.stdout | from_json }}"
 
     # Set quota for folders where it does not match