Issue #2012: Update Drupal and Varnish roles.

geerlingguy · Feb 18, 2020 · 1f02b53 · 1f02b53
1 parent 8788fe0
commit 1f02b53
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 7 deletions.
diff --git a/provisioning/requirements.yml b/provisioning/requirements.yml
@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.2.0
 - src: geerlingguy.drupal
-  version: 3.0.0
+  version: 3.0.1
 - src: geerlingguy.drupal-console
   version: 1.1.1
 - src: geerlingguy.drush
@@ -78,4 +78,4 @@
 - src: geerlingguy.solr
   version: 5.0.0
 - src: geerlingguy.varnish
-  version: 3.0.1
+  version: 3.0.2
diff --git a/provisioning/roles/geerlingguy.drupal/.ansible-lint b/provisioning/roles/geerlingguy.drupal/.ansible-lint
@@ -1,4 +1,3 @@
 skip_list:
   - '204'
-  - '602'
   - '503'
diff --git a/provisioning/roles/geerlingguy.drupal/.github/FUNDING.yml b/provisioning/roles/geerlingguy.drupal/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml b/provisioning/roles/geerlingguy.drupal/molecule/default/playbook.yml
@@ -3,6 +3,9 @@
   hosts: all
   become: true
 
+  environment:
+    COMPOSER_MEMORY_LIMIT: '-1'
+
   vars_files:
     - test-vars.yml
 

diff --git a/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml b/provisioning/roles/geerlingguy.drupal/tasks/build-composer-project.yml
@@ -14,6 +14,7 @@
   become: false
   environment:
     COMPOSER_PROCESS_TIMEOUT: 1200
+    COMPOSER_MEMORY_LIMIT: '-1'
 
 - name: Ensure drupal_composer_install_dir directory has proper permissions.
   file:

diff --git a/provisioning/roles/geerlingguy.firewall/.github/FUNDING.yml b/provisioning/roles/geerlingguy.firewall/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.varnish/.github/FUNDING.yml b/provisioning/roles/geerlingguy.varnish/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+---
+github: geerlingguy
+patreon: geerlingguy
diff --git a/provisioning/roles/geerlingguy.varnish/tasks/main.yml b/provisioning/roles/geerlingguy.varnish/tasks/main.yml
@@ -80,17 +80,17 @@
     enabled: true
   with_items: "{{ varnish_enabled_services | default([]) }}"
   when: >
-    varnish_enabled_services and
-    (ansible_os_family != 'Debian' and ansible_distribution_release != "xenial")
+    varnish_enabled_services and (ansible_os_family != 'Debian' or
+    (ansible_os_family != 'Debian' and ansible_distribution_release != "xenial"))
 
 # See: https://github.com/ansible/ansible/issues/22303
-- name: Ensure Varnish services are started enabled on startup (Xenial specific)
+- name: Ensure Varnish services are started and enabled on startup (Xenial specific)
   service:
     name: "{{ item }}"
     state: started
     enabled: true
     use: "service"
   with_items: "{{ varnish_enabled_services | default([]) }}"
   when:
-    - varnish_enabled_services
+    - varnish_enabled_services | length > 0
     - (ansible_os_family == 'Debian' and ansible_distribution_release == "xenial")