ansible-playbooks/general#85 Linting

defaults/main.yml

+---
+
 matomo_version: 3.9.1
-matomo_force_reset: False
+matomo_force_reset: no

tasks/install.yml

@@ -2,16 +2,16 @@
 # file: roles/matomo/tasks/install.yml
 
 - block:
-  - set_fact:
-      webRoot: /var/www/matomo/{{ matomo.id }}
-      apacheUser: www-data
-      apacheLogDir: /var/log/apache2
-    when: matomo.jail is not defined
-  - set_fact:
-      webRoot: '{{ jailroot }}/{{ matomo.id }}/var/www/matomo'
-      apacheUser: '{{ matomo.id }}'
-      apacheLogDir: '{{ jailroot }}/{{ matomo.id }}/var/log/apache2'
-    when: matomo.jail is defined
+    - set_fact:
+        webRoot: /var/www/matomo/{{ matomo.id }}
+        apacheUser: www-data
+        apacheLogDir: /var/log/apache2
+      when: matomo.jail is not defined
+    - set_fact:
+        webRoot: '{{ jailroot }}/{{ matomo.id }}/var/www/matomo'
+        apacheUser: '{{ matomo.id }}'
+        apacheLogDir: '{{ jailroot }}/{{ matomo.id }}/var/log/apache2'
+      when: matomo.jail is defined
   tags:
     - always
 
@@ -61,7 +61,7 @@
     track_submodules: yes
     force: yes
     version: '{{ matomo_version }}'
-  become: false
+  become: no
   environment:
     GIT_LFS_SKIP_SMUDGE: 1
   tags:

tasks/main.yml

@@ -8,26 +8,26 @@
     - always
 
 - block:
-  - name: Install Certs
-    include_tasks: ../../letsencrypt/tasks/cert.yml
-    with_items: '{{ matomo_settings|default([]) }}'
-    loop_control:
-      loop_var: domain
-    when: domain.protocol|default("https") == "https" and domain.letsencrypt|default(true)
-    tags:
-      - ApacheConfig
+    - name: Install Certs
+      include_tasks: ../../letsencrypt/tasks/cert.yml
+      with_items: '{{ matomo_settings|default([]) }}'
+      loop_control:
+        loop_var: domain
+      when: domain.protocol|default("https") == "https" and domain.letsencrypt|default(true)
+      tags:
+        - ApacheConfig
 
   when: not excluded_roles or "letsencrypt" not in excluded_roles and groups.proxyserver is not defined
 
 - block:
-  - name: Install matomo
-    include_tasks: install.yml
-    with_items: '{{ matomo_settings|default([]) }}'
-    loop_control:
-      loop_var: matomo
-    when: limit_site is not defined or limit_site == 'no' or matomo.id is not defined or limit_site == matomo.id
-    tags:
-      - ApacheConfig
-      - deploy
+    - name: Install matomo
+      include_tasks: install.yml
+      with_items: '{{ matomo_settings|default([]) }}'
+      loop_control:
+        loop_var: matomo
+      when: limit_site is not defined or limit_site == 'no' or matomo.id is not defined or limit_site == matomo.id
+      tags:
+        - ApacheConfig
+        - deploy
 
   when: not excluded_roles or "matomo" not in excluded_roles