ansible-playbooks/general#85 Linting

defaults/main.yml

-jailroot: '/jails'
+jailroot: /jails
 
 drush_cron_core:
   active: true
-  month: '*'
-  day: '*'
-  weekday: '*'
-  hour: '*'
-  minute: '0,30'
+  month: *
+  day: *
+  weekday: *
+  hour: *
+  minute: 0,30
 drush_cron_translation:
   active: true
-  month: '*'
-  day: '*'
-  weekday: '0'
+  month: *
+  day: *
+  weekday: 0
   hour:
-    refresh: '4'
-    update: '4'
+    refresh: 4
+    update: 4
   minute:
-    refresh: '10'
-    update: '40'
+    refresh: 10
+    update: 40

tasks/config-8.yml

@@ -15,9 +15,10 @@
   - set_fact:
       drupalRoot='{{ webRoot }}{{ drupal.root|default("") }}'
       drupalRootJail='/var/www{{ drupal.root|default("") }}'
-  tags: 'always'
+  tags:
+    - always
 
-- name: "Create alias include file"
+- name: Create alias include file
   template:
     src='etc_drush_host_subkey_aliases_drushrc.php.jinja2'
     dest='/etc/drush/{{ inventory_hostname }}{{ drushSubkey }}.aliases.drushrc.php'
@@ -26,7 +27,7 @@
     mode='664'
   when: drupal.create_drush_aliases|default(true)
 
-- name: "Create excluded alias include file"
+- name: Create excluded alias include file
   template:
     src='etc_drush_host_aliases_drushrc.php.jinja2'
     dest='/etc/drush/{{ inventory_hostname }}.aliases.drushrc.php'
@@ -35,7 +36,7 @@
     mode='664'
   when: drupal.create_drush_aliases|default(true) and drupal.drush_subkey is defined and drupal.drush_subkey != ''
 
-- name: "Create live alias include file"
+- name: Create live alias include file
   template:
     src='etc_drush_live_aliases_drushrc.php.jinja2'
     dest='/etc/drush/{{ drupal.drush_live }}{{ drushSubkey }}.aliases.drushrc.php'
@@ -44,7 +45,7 @@
     mode='664'
   when: drupal.drush_live is defined
 
-- name: "Prepare drush etc directory in jail"
+- name: Prepare drush etc directory in jail
   file:
     dest='{{ jailroot }}/{{ drupal.jail.name }}/etc/drush'
     owner='root'
@@ -53,7 +54,7 @@
     mode='775'
   when: drupal.jail is defined
 
-- name: "Create alias include file in jail"
+- name: Create alias include file in jail
   template:
     src='etc_drush_jail_aliases_drushrc.php.jinja2'
     dest='{{ jailroot }}/{{ drupal.jail.name }}/etc/drush/aliases.drushrc.php'
@@ -62,7 +63,7 @@
     mode='664'
   when: drupal.jail is defined
 
-- name: "Ensure Drupal Root Directory"
+- name: Ensure Drupal Root Directory
   file:
     dest='{{ drupalRoot }}/sites'
     owner='{{ apacheUser }}'
@@ -70,8 +71,9 @@
     state='directory'
     mode='775'
 
-- set_fact: excluded=false
-- name: "Create alias file"
+- set_fact:
+    excluded: no
+- name: Create alias file
   template:
     src='aliases_drushrc.php.jinja2'
     dest='{{ drupalRoot }}/sites/{{ drushSubkey }}.aliases.drushrc.php'
@@ -80,8 +82,9 @@
     mode='440'
   when: drupal.create_drush_aliases|default(true)
 
-- set_fact: excluded=true
-- name: "Create alias file for excluded domains"
+- set_fact:
+    excluded: yes
+- name: Create alias file for excluded domains
   template:
     src='aliases_drushrc.php.jinja2'
     dest='{{ drupalRoot }}/sites/.aliases.drushrc.php'
@@ -90,7 +93,7 @@
     mode='440'
   when: drupal.create_drush_aliases|default(true) and drupal.drush_subkey is defined and drupal.drush_subkey != ''
 
-- name: "Create live alias file"
+- name: Create live alias file
   template:
     src='aliases_drushrc_live.php.jinja2'
     dest='{{ drupalRoot }}/sites/.live{{ drushSubkey }}.aliases.drushrc.php'
@@ -99,20 +102,22 @@
     mode='440'
   when: drupal.create_drush_aliases|default(true) and drupal.drush_live is defined
 
-- name: "Fetch Alias Files"
+- name: Fetch Alias Files
   fetch:
     src='{{ drupalRoot }}/sites/{{ drushSubkey }}.aliases.drushrc.php'
     dest='/tmp/{{ inventory_hostname }}{{ drushSubkey }}.aliases.drushrc.php'
     flat=yes
-  tags: 'DrushUpdateAliases'
+  tags:
+    - DrushUpdateAliases
 
-- name: "Move Alias Files"
+- name: Move Alias Files
   local_action: copy
     src='/tmp/{{ inventory_hostname }}{{ drushSubkey }}.aliases.drushrc.php'
     dest='/etc/drush/'
-  tags: 'DrushUpdateAliases'
+  tags:
+    - DrushUpdateAliases
 
-- name: "Install cron for core-cron"
+- name: Install cron for core-cron
   cron:
     name='Run Drush Cron on @{{ inventory_hostname }}{{ drushSubkey }}'
     month='{{ drush_cron_core.month|default(omit) }}'
@@ -123,9 +128,10 @@
     job='{{ composer_home_path }}/vendor/bin/drush -y @{{ inventory_hostname }}{{ drushSubkey }} core-cron >/dev/null 2>&1'
     disabled='{{ crons_disabled|default(false) }}'
   when: drush_cron_core.active
-  tags: 'cron'
+  tags:
+    - cron
 
-- name: "Install cron for translation refresh"
+- name: Install cron for translation refresh
   cron:
     name='Run Drush Translation Refresh on @{{ inventory_hostname }}{{ drushSubkey }}'
     month='{{ drush_cron_translation.month|default(omit) }}'
@@ -136,9 +142,10 @@
     job='{{ composer_home_path }}/vendor/bin/drush -y @{{ inventory_hostname }}{{ drushSubkey }} l10n-update-refresh >/dev/null 2>&1'
     disabled='{{ crons_disabled|default(false) }}'
   when: drush_cron_translation.active
-  tags: 'cron'
+  tags:
+    - cron
 
-- name: "Install cron for translation update"
+- name: Install cron for translation update
   cron:
     name='Run Drush Translation Update on @{{ inventory_hostname }}{{ drushSubkey }}'
     month='{{ drush_cron_translation.month|default(omit) }}'
@@ -149,4 +156,5 @@
     job='{{ composer_home_path }}/vendor/bin/drush -y @{{ inventory_hostname }}{{ drushSubkey }} l10n-update >/dev/null 2>&1'
     disabled='{{ crons_disabled|default(false) }}'
   when: drush_cron_translation.active
-  tags: 'cron'
+  tags:
+    - cron

tasks/config-9.yml

@@ -15,51 +15,53 @@
   - set_fact:
       drushAlias='@{{ inventory_hostname }}{{ drushSubkey }}'
     when: drush_version_main|default('8') == '8'
-  tags: 'always'
+  tags:
+    - always
 
-- name: "Ensure Drush Directories in Project Root"
+- name: Ensure Drush Directories in Project Root
   file:
     dest: '{{ webRoot }}/drush/sites'
-    owner: 'root'
-    group: 'root'
-    state: 'directory'
-    mode: '775'
+    owner: root
+    group: root
+    state: directory
+    mode: 775
 
-- name: "Configure Drush"
+- name: Configure Drush
   template:
-    src: 'drush-9.yml.jinja2'
+    src: drush-9.yml.jinja2
     dest: '{{ webRoot }}/drush/drush.yml'
-    owner: 'root'
-    group: 'root'
-    mode: '664'
+    owner: root
+    group: root
+    mode: 664
   when: drupal.create_drush_aliases|default(true)
 
-- name: "Configure Drush"
+- name: Configure Drush
   template:
-    src: 'drush-9.site.yml.jinja2'
+    src: drush-9.site.yml.jinja2
     dest: '{{ webRoot }}/drush/sites/{{ drupal.id }}.site.yml'
-    owner: 'root'
-    group: 'root'
-    mode: '664'
+    owner: root
+    group: root
+    mode: 664
   when: drupal.create_drush_aliases|default(true)
 
-- name: "Install cron for core-cron"
+- name: Install cron for core-cron
   cron:
-    name: 'Run Drush Cron on {{ drushAlias }}'
+    name: Run Drush Cron on {{ drushAlias }}
     month: '{{ drush_cron_core.month|default(omit) }}'
     day: '{{ drush_cron_core.day|default(omit) }}'
     weekday: '{{ drush_cron_core.weekday|default(omit) }}'
     hour: '{{ drush_cron_core.hour|default(omit) }}'
     minute: '{{ drush_cron_core.minute|default(omit) }}'
-    job: 'cd {{ webRoot }} && /usr/local/bin/drush -y {{ drushAlias }} core-cron >/dev/null 2>&1'
+    job: cd {{ webRoot }} && /usr/local/bin/drush -y {{ drushAlias }} core-cron >/dev/null 2>&1
     disabled: '{{ crons_disabled|default(false) }}'
   when: drush_cron_core.active and not drupal.docker|default(false)
-  tags: 'cron'
+  tags:
+    - cron
 
-- name: "Remove old crontabs"
+- name: Remove old crontabs
   cron:
     name: '{{ item }} @{{ inventory_hostname }}.{{ drushSubkey }}'
-    state: 'absent'
+    state: absent
   with_items:
-    - 'Run Drush Translation Refresh on'
-    - 'Run Drush Translation Update on'
+    - Run Drush Translation Refresh on
+    - Run Drush Translation Update on

tasks/main.yml

 ---
 # file: roles/drush/tasks/main.yml
 
-- name: "Drush Role"
-  set_fact: role_drush_started=true
-  tags: 'always'
+- name: Drush Role
+  set_fact:
+    role_drush_started: yes
+  tags:
+    - always
 
 - block:
 
-  - include_tasks: 'config-{{ drush_version_main|default("8") }}.yml'
+  - include_tasks: config-{{ drush_version_main|default("8") }}.yml
     with_items: '{{ drupal_settings|default([]) }}'
     loop_control:
       loop_var: drupal
     when: drupal.create_drush_aliases|default(true) and (limit_site is not defined or limit_site == 'False' or drupal.id is not defined or limit_site == drupal.id)
 
-  when: '"drush" not in excluded_roles'
+  when: not excluded_roles or "drush" not in excluded_roles

templates/aliases_drushrc.php.jinja2

 <?php
 
-$root = is_dir('{{ drupalRoot }}') ? '{{ drupalRoot }}' : '{{ drupalRootJail }}';
+$root = is_dir('{{ drupalRoot }}') ? '{{ drupalRoot }}' : {{ drupalRootJail }};
 $aliases = array(
 {% for domain in drupal.domains %}
 {% if domain.exclude_from_drush_alias|default(false) == excluded %}

templates/drush-9.site.yml.jinja2

 {% for domain in drupal.domains %}
 {{ domain.shortname|default("default") }}:
-  root: '{{ webRoot }}{{ drupal.root|default("") }}/'
-  uri: '{{ domain.domain }}'
+  root: {{ webRoot }}{{ drupal.root|default("") }}/
+  uri: {{ domain.domain }}
 {% endfor %}

templates/drush-9.yml.jinja2

 drush:
   paths:
     config:
-      - '${env.home}/.drush/config/drush.yml'
+      - ${env.home}/.drush/config/drush.yml
     include:
-      - './drush/contrib'
-    cache-directory: '{{ webRoot }}/drush/cache'
+      - ./drush/contrib
+    cache-directory: {{ webRoot }}/drush/cache
 options:
-  uri: '{{ drupal.domains[0].protocol|default("https") }}://{{ drupal.domains[0].domain }}'
+  uri: {{ drupal.domains[0].protocol|default("https") }}://{{ drupal.domains[0].domain }}
 command:
   core:
     rsync:
       options:
-        mode: 'rlDzq'
+        mode: rlDzq
   sql:
     sync:
       options:
-        structure-tables-key: 'common'
-        skip-tables: 'common'
+        structure-tables-key: common
+        skip-tables: common
     dump:
       options:
-        structure-tables-key: 'common'
-        skip-tables: 'common'
+        structure-tables-key: common
+        skip-tables: common
 sql:
   structure-tables:
     common:
-      - 'cache'
-      - 'cache_*'
-      - 'history'
-      - 'search_*'
-      - 'sessions'
-      - 'watchdog'
+      - cache
+      - cache_*
+      - history
+      - search_*
+      - sessions
+      - watchdog
   skip-tables:
     common:
-      - 'migration_*'
+      - migration_*