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

tasks/config-8.yml

@@ -2,159 +2,159 @@
 # file: roles/drush/tasks/config-8.yml
 
 - block:
-  - set_fact:
-      webRoot='/var/www{{ drupal.webRoot|default("") }}'
-      apacheUser='www-data'
-      drushSubkey='{{ drupal.drush_subkey|default("") }}'
-    when: drupal.jail is not defined
-  - set_fact:
-      webRoot='{{ jailroot }}/{{ drupal.jail.name }}/var/www'
-      apacheUser='{{ drupal.jail.name }}'
-      drushSubkey='.{{ drupal.jail.name }}'
-    when: drupal.jail is defined
-  - set_fact:
-      drupalRoot='{{ webRoot }}{{ drupal.root|default("") }}'
-      drupalRootJail='/var/www{{ drupal.root|default("") }}'
+    - set_fact:
+        webRoot: /var/www{{ drupal.webRoot|default("") }}
+        apacheUser: www-data
+        drushSubkey: '{{ drupal.drush_subkey|default("") }}'
+      when: drupal.jail is not defined
+    - set_fact:
+        webRoot: '{{ jailroot }}/{{ drupal.jail.name }}/var/www'
+        apacheUser: '{{ drupal.jail.name }}'
+        drushSubkey: .{{ drupal.jail.name }}
+      when: drupal.jail is defined
+    - set_fact:
+        drupalRoot: '{{ webRoot }}{{ drupal.root|default("") }}'
+        drupalRootJail: /var/www{{ drupal.root|default("") }}
   tags:
     - always
 
 - name: Create alias include file
   template:
-    src='etc_drush_host_subkey_aliases_drushrc.php.jinja2'
-    dest='/etc/drush/{{ inventory_hostname }}{{ drushSubkey }}.aliases.drushrc.php'
-    owner='root'
-    group='root'
-    mode='664'
+    src: etc_drush_host_subkey_aliases_drushrc.php.jinja2
+    dest: /etc/drush/{{ inventory_hostname }}{{ drushSubkey }}.aliases.drushrc.php
+    owner: root
+    group: root
+    mode: 0664
   when: drupal.create_drush_aliases|default(true)
 
 - name: Create excluded alias include file
   template:
-    src='etc_drush_host_aliases_drushrc.php.jinja2'
-    dest='/etc/drush/{{ inventory_hostname }}.aliases.drushrc.php'
-    owner='root'
-    group='root'
-    mode='664'
+    src: etc_drush_host_aliases_drushrc.php.jinja2
+    dest: /etc/drush/{{ inventory_hostname }}.aliases.drushrc.php
+    owner: root
+    group: root
+    mode: 0664
   when: drupal.create_drush_aliases|default(true) and drupal.drush_subkey is defined and drupal.drush_subkey != ''
 
 - 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'
-    owner='root'
-    group='root'
-    mode='664'
+    src: etc_drush_live_aliases_drushrc.php.jinja2
+    dest: /etc/drush/{{ drupal.drush_live }}{{ drushSubkey }}.aliases.drushrc.php
+    owner: root
+    group: root
+    mode: 0664
   when: drupal.drush_live is defined
 
 - name: Prepare drush etc directory in jail
   file:
-    dest='{{ jailroot }}/{{ drupal.jail.name }}/etc/drush'
-    owner='root'
-    group='root'
-    state='directory'
-    mode='775'
+    dest: '{{ jailroot }}/{{ drupal.jail.name }}/etc/drush'
+    owner: root
+    group: root
+    state: directory
+    mode: 0775
   when: drupal.jail is defined
 
 - 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'
-    owner='root'
-    group='root'
-    mode='664'
+    src: etc_drush_jail_aliases_drushrc.php.jinja2
+    dest: '{{ jailroot }}/{{ drupal.jail.name }}/etc/drush/aliases.drushrc.php'
+    owner: root
+    group: root
+    mode: 0664
   when: drupal.jail is defined
 
 - name: Ensure Drupal Root Directory
   file:
-    dest='{{ drupalRoot }}/sites'
-    owner='{{ apacheUser }}'
-    group='{{ apacheUser }}'
-    state='directory'
-    mode='775'
+    dest: '{{ drupalRoot }}/sites'
+    owner: '{{ apacheUser }}'
+    group: '{{ apacheUser }}'
+    state: directory
+    mode: 0775
 
 - set_fact:
     excluded: no
 - name: Create alias file
   template:
-    src='aliases_drushrc.php.jinja2'
-    dest='{{ drupalRoot }}/sites/{{ drushSubkey }}.aliases.drushrc.php'
-    owner='{{ apacheUser }}'
-    group='{{ apacheUser }}'
-    mode='440'
+    src: aliases_drushrc.php.jinja2
+    dest: '{{ drupalRoot }}/sites/{{ drushSubkey }}.aliases.drushrc.php'
+    owner: '{{ apacheUser }}'
+    group: '{{ apacheUser }}'
+    mode: 0440
   when: drupal.create_drush_aliases|default(true)
 
 - set_fact:
     excluded: yes
 - name: Create alias file for excluded domains
   template:
-    src='aliases_drushrc.php.jinja2'
-    dest='{{ drupalRoot }}/sites/.aliases.drushrc.php'
-    owner='{{ apacheUser }}'
-    group='{{ apacheUser }}'
-    mode='440'
+    src: aliases_drushrc.php.jinja2
+    dest: '{{ drupalRoot }}/sites/.aliases.drushrc.php'
+    owner: '{{ apacheUser }}'
+    group: '{{ apacheUser }}'
+    mode: 0440
   when: drupal.create_drush_aliases|default(true) and drupal.drush_subkey is defined and drupal.drush_subkey != ''
 
 - name: Create live alias file
   template:
-    src='aliases_drushrc_live.php.jinja2'
-    dest='{{ drupalRoot }}/sites/.live{{ drushSubkey }}.aliases.drushrc.php'
-    owner='{{ apacheUser }}'
-    group='{{ apacheUser }}'
-    mode='440'
+    src: aliases_drushrc_live.php.jinja2
+    dest: '{{ drupalRoot }}/sites/.live{{ drushSubkey }}.aliases.drushrc.php'
+    owner: '{{ apacheUser }}'
+    group: '{{ apacheUser }}'
+    mode: 0440
   when: drupal.create_drush_aliases|default(true) and drupal.drush_live is defined
 
 - name: Fetch Alias Files
   fetch:
-    src='{{ drupalRoot }}/sites/{{ drushSubkey }}.aliases.drushrc.php'
-    dest='/tmp/{{ inventory_hostname }}{{ drushSubkey }}.aliases.drushrc.php'
-    flat=yes
+    src: '{{ drupalRoot }}/sites/{{ drushSubkey }}.aliases.drushrc.php'
+    dest: /tmp/{{ inventory_hostname }}{{ drushSubkey }}.aliases.drushrc.php
+    flat: yes
   tags:
     - DrushUpdateAliases
 
 - name: Move Alias Files
   local_action: copy
-    src='/tmp/{{ inventory_hostname }}{{ drushSubkey }}.aliases.drushrc.php'
-    dest='/etc/drush/'
+    src: /tmp/{{ inventory_hostname }}{{ drushSubkey }}.aliases.drushrc.php
+    dest: /etc/drush/
   tags:
     - DrushUpdateAliases
 
 - name: Install cron for core-cron
   cron:
-    name='Run Drush Cron on @{{ inventory_hostname }}{{ drushSubkey }}'
-    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='{{ composer_home_path }}/vendor/bin/drush -y @{{ inventory_hostname }}{{ drushSubkey }} core-cron >/dev/null 2>&1'
-    disabled='{{ crons_disabled|default(false) }}'
+    name: Run Drush Cron on @{{ inventory_hostname }}{{ drushSubkey }}
+    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: '{{ 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
 
 - name: Install cron for translation refresh
   cron:
-    name='Run Drush Translation Refresh on @{{ inventory_hostname }}{{ drushSubkey }}'
-    month='{{ drush_cron_translation.month|default(omit) }}'
-    day='{{ drush_cron_translation.day|default(omit) }}'
-    weekday='{{ drush_cron_translation.weekday|default(omit) }}'
-    hour='{{ drush_cron_translation.hour.refresh }}'
-    minute='{{ drush_cron_translation.minute.refresh }}'
-    job='{{ composer_home_path }}/vendor/bin/drush -y @{{ inventory_hostname }}{{ drushSubkey }} l10n-update-refresh >/dev/null 2>&1'
-    disabled='{{ crons_disabled|default(false) }}'
+    name: Run Drush Translation Refresh on @{{ inventory_hostname }}{{ drushSubkey }}
+    month: '{{ drush_cron_translation.month|default(omit) }}'
+    day: '{{ drush_cron_translation.day|default(omit) }}'
+    weekday: '{{ drush_cron_translation.weekday|default(omit) }}'
+    hour: '{{ drush_cron_translation.hour.refresh }}'
+    minute: '{{ drush_cron_translation.minute.refresh }}'
+    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
 
 - name: Install cron for translation update
   cron:
-    name='Run Drush Translation Update on @{{ inventory_hostname }}{{ drushSubkey }}'
-    month='{{ drush_cron_translation.month|default(omit) }}'
-    day='{{ drush_cron_translation.day|default(omit) }}'
-    weekday='{{ drush_cron_translation.weekday|default(omit) }}'
-    hour='{{ drush_cron_translation.hour["update"] }}'
-    minute='{{ drush_cron_translation.minute["update"] }}'
-    job='{{ composer_home_path }}/vendor/bin/drush -y @{{ inventory_hostname }}{{ drushSubkey }} l10n-update >/dev/null 2>&1'
-    disabled='{{ crons_disabled|default(false) }}'
+    name: Run Drush Translation Update on @{{ inventory_hostname }}{{ drushSubkey }}
+    month: '{{ drush_cron_translation.month|default(omit) }}'
+    day: '{{ drush_cron_translation.day|default(omit) }}'
+    weekday: '{{ drush_cron_translation.weekday|default(omit) }}'
+    hour: '{{ drush_cron_translation.hour["update"] }}'
+    minute: '{{ drush_cron_translation.minute["update"] }}'
+    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

tasks/config-9.yml

@@ -2,19 +2,19 @@
 # file: roles/drush/tasks/config-9.yml
 
 - block:
-  - set_fact:
-      webRoot='/var/www{{ drupal.webRoot|default("") }}'
-      drushSubkey='{{ drupal.drush_subkey|default("") }}'
-    when: drupal.jail is not defined
-  - set_fact:
-      webRoot='{{ jailroot }}/{{ drupal.jail.name }}/var/www'
-      drushSubkey='{{ drupal.jail.name }}'
-    when: drupal.jail is defined
-  - set_fact:
-      drushAlias='@{{ drupal.id }}'
-  - set_fact:
-      drushAlias='@{{ inventory_hostname }}{{ drushSubkey }}'
-    when: drush_version_main|default('8') == '8'
+    - set_fact:
+        webRoot: /var/www{{ drupal.webRoot|default("") }}
+        drushSubkey: '{{ drupal.drush_subkey|default("") }}'
+      when: drupal.jail is not defined
+    - set_fact:
+        webRoot: '{{ jailroot }}/{{ drupal.jail.name }}/var/www'
+        drushSubkey: '{{ drupal.jail.name }}'
+      when: drupal.jail is defined
+    - set_fact:
+        drushAlias: '@{{ drupal.id }}'
+    - set_fact:
+        drushAlias: '@{{ inventory_hostname }}{{ drushSubkey }}'
+      when: drush_version_main|default('8') == '8'
   tags:
     - always