ansible-playbooks/general#85 Linting [skip-ci]

tasks/apache.yml

@@ -3,25 +3,27 @@
 
 - block:
 
-  - name: Apache Configuration File
-    template:
-      src='vhost.conf'
-      dest='/etc/apache2/sites-available/{{ matomo.domain }}{{ apache_conf_ext }}'
-      owner='root'
-      group='root'
-      mode='664'
-    notify:
-      - "Apache | Restart Apache"
+    - name: Apache Configuration File
+      template:
+        src: vhost.conf
+        dest: /etc/apache2/sites-available/{{ matomo.domain }}{{ apache_conf_ext }}
+        owner: root
+        group: root
+        mode: 0664
+      notify:
+        - "Restart Apache"
 
-  - name: Apache enable our new site(s)
-    command: a2ensite {{ matomo.domain }} creates=/etc/apache2/sites-enabled/{{ matomo.domain }}{{ apache_conf_ext }}
-    notify:
-      - "Apache | Restart Apache"
+    - name: Apache enable our new site(s)
+      command: a2ensite {{ matomo.domain }}
+      args:
+        creates: /etc/apache2/sites-enabled/{{ matomo.domain }}{{ apache_conf_ext }}
+      notify:
+        - "Restart Apache"
 
-  - name: Apache install GeoIP
-    apt:
-      pkg: libapache2-mod-geoip
-      state: present
+    - name: Apache install GeoIP
+      apt:
+        pkg: libapache2-mod-geoip
+        state: present
 
   tags:
     - ApacheConfig

tasks/install.yml

@@ -3,14 +3,14 @@
 
 - block:
   - set_fact:
-      webRoot='/var/www/matomo/{{ matomo.id }}'
-      apacheUser='www-data'
-      apacheLogDir='/var/log/apache2'
+      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'
+      webRoot: '{{ jailroot }}/{{ matomo.id }}/var/www/matomo'
+      apacheUser: '{{ matomo.id }}'
+      apacheLogDir: '{{ jailroot }}/{{ matomo.id }}/var/log/apache2'
     when: matomo.jail is defined
   tags:
     - always
@@ -32,11 +32,11 @@
 
 - name: Ensure Root Directories
   file:
-    path='{{ item }}'
-    state='directory'
-    owner='{{ apacheUser }}'
-    group='{{ apacheUser }}'
-    mode='775'
+    path: '{{ item }}'
+    state: directory
+    owner: '{{ apacheUser }}'
+    group: '{{ apacheUser }}'
+    mode: 0775
   with_items:
     - {{ webRoot }}
   tags:
@@ -44,12 +44,12 @@
 
 - name: File Modes and Ownership
   file:
-    path='{{ webRoot }}'
-    owner='{{ apacheUser }}'
-    group='{{ apacheUser }}'
-    mode='g+w'
-    recurse=yes
-    follow=no
+    path: '{{ webRoot }}'
+    owner: '{{ apacheUser }}'
+    group: '{{ apacheUser }}'
+    mode: g+w
+    recurse: yes
+    follow: no
   tags:
     - deploy
 
@@ -69,32 +69,32 @@
 
 - name: Configuration file
   template:
-    src='config.ini.php'
-    dest='{{ webRoot }}/config/config.ini.php'
-    owner='{{ apacheUser }}'
-    group='{{ apacheUser }}'
-    mode='664'
+    src: config.ini.php
+    dest: '{{ webRoot }}/config/config.ini.php'
+    owner: '{{ apacheUser }}'
+    group: '{{ apacheUser }}'
+    mode: 0664
   tags:
     - deploy
 
 - name: Composer
   composer:
-    command='update'
-    working_dir='{{ webRoot }}'
-    no_dev=yes
-    optimize_autoloader=yes
-    prefer_dist=yes
-  ignore_errors: true
+    command: update
+    working_dir: '{{ webRoot }}'
+    no_dev: yes
+    optimize_autoloader: yes
+    prefer_dist: yes
+  ignore_errors: yes
   tags:
     - deploy
 
 - name: Ensure Working Directories
   file:
-    path='{{ item }}'
-    state='directory'
-    owner='{{ apacheUser }}'
-    group='{{ apacheUser }}'
-    mode='775'
+    path: '{{ item }}'
+    state: directory
+    owner: '{{ apacheUser }}'
+    group: '{{ apacheUser }}'
+    mode: 0775
   with_items:
     - {{ webRoot }}/tmp
   tags:
@@ -102,45 +102,45 @@
 
 - name: File Modes and Ownership
   file:
-    path='{{ webRoot }}'
-    owner='{{ apacheUser }}'
-    group='{{ apacheUser }}'
-    mode='a-w'
-    recurse=yes
-    follow=no
+    path: '{{ webRoot }}'
+    owner: '{{ apacheUser }}'
+    group: '{{ apacheUser }}'
+    mode: a-w
+    recurse: yes
+    follow: no
   tags:
     - deploy
 
 - name: File Modes for .git Directory
   file:
-    path='{{ webRoot }}/.git'
-    mode='og+w'
-    recurse=yes
-    follow=no
+    path: '{{ webRoot }}/.git'
+    mode: og+w
+    recurse: yes
+    follow: no
   tags:
     - deploy
 
 - name: File Modes for tmp
   file:
-    path='{{ webRoot }}/tmp'
-    mode='ug+w'
-    recurse=yes
-    follow=no
+    path: '{{ webRoot }}/tmp'
+    mode: ug+w
+    recurse: yes
+    follow: no
   tags:
     - deploy
 
 - name: Ensure Database
   mysql_db:
-    name='matomo_{{ matomo.id }}'
-    login_user='root'
-    login_password='{{ mysql_root_password|default("root") }}'
-    login_host='127.0.0.1'
-    login_port='{{ matomo.db_port|default('3306') }}'
-    state='present'
+    name: matomo_{{ matomo.id }}
+    login_user: root
+    login_password: '{{ mysql_root_password|default("root") }}'
+    login_host: 127.0.0.1
+    login_port: '{{ matomo.db_port|default('3306') }}'
+    state: present
 
 - name: Run Upgrade
   command: '{{ webRoot }}/console core:update --yes --no-interaction'
   become_user: '{{ apacheUser }}'
-  ignore_errors: true
+  ignore_errors: yes
   tags:
     - deploy