Update geerlingguy.drupal role to latest version.

Author: geerlingguy

provisioning/requirements.yml

@@ -18,7 +18,7 @@
 - src: geerlingguy.daemonize
   version: 1.2.0
 - src: geerlingguy.drupal
-  version: 2.5.4
+  version: 2.6.0
 - src: geerlingguy.drupal-console
   version: 1.1.1
 - src: geerlingguy.drush

provisioning/roles/geerlingguy.drupal/.ansible-lint

@@ -1,2 +1,4 @@
 skip_list:
   - '204'
+  - '602'
+  - '503'

provisioning/roles/geerlingguy.drupal/README.md

@@ -54,10 +54,15 @@ Set this to `true` and `drupal_build_composer*` to `false` if you would like to
     drupal_build_composer: false
     drupal_composer_path: "/path/to/drupal.composer.json"
     drupal_composer_install_dir: "/var/www/drupal"
+    drupal_composer_no_dev: true
     drupal_composer_dependencies:
       - "drupal/devel:^1.2"
 
-Set `drupal_build_makefile` to `false` and this to `true` if you are using a Composer-based site deployment strategy.
+Set `drupal_build_makefile` to `false` and this to `true` if you are using a Composer-based site deployment strategy. The other options should be relatively straightforward.
+
+    drupal_composer_bin_dir: "vendor/bin"
+
+If you set the `bin-dir` in your project's `composer.json` file to a value other than `vendor/bin`, override this variable with the same directory path.
 
 ### Create a new project using `drupal-project` (Composer)
 
@@ -71,6 +76,10 @@ Set this to `true` and `drupal_build_makefile`, `drupal_build_composer` to `fals
 
     drupal_core_path: "{{ drupal_deploy_dir }}/web"
     drupal_core_owner: "{{ ansible_ssh_user | default(ansible_env.SUDO_USER, true) | default(ansible_env.USER, true) | default(ansible_user_id) }}"
+    drupal_core_owner_become: false
+
+The path to Drupal's root, along with the ownership properties. If you are not running Ansible as the user that should have ownership over the core path, specify the desired system user in `drupal_core_owner` and set `drupal_core_owner_become: true`.
+
     drupal_db_user: drupal
     drupal_db_password: drupal
     drupal_db_name: drupal

provisioning/roles/geerlingguy.drupal/defaults/main.yml

@@ -15,11 +15,15 @@ drupal_build_makefile: false
 drush_makefile_path: "/path/to/drupal.make.yml"
 drush_make_options: "--no-gitinfofile"
 
+# You can configure the `bin-dir` in your project's composer.json `config` key.
+drupal_composer_bin_dir: "vendor/bin"
+
 # Set 'drupal_build_makefile' to 'false' and this to 'true' if you are using a
 # Composer-based site deployment strategy.
 drupal_build_composer: false
 drupal_composer_path: "/path/to/drupal.composer.json"
 drupal_composer_install_dir: "{{ drupal_deploy_dir }}"
+drupal_composer_no_dev: true
 drupal_composer_dependencies:
   - "drupal/devel:^1.2"
 
@@ -33,6 +37,7 @@ drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction
 # Required Drupal settings.
 drupal_core_path: "{{ drupal_deploy_dir }}/web"
 drupal_core_owner: "{{ ansible_ssh_user | default(ansible_env.SUDO_USER, true) | default(ansible_env.USER, true) | default(ansible_user_id) }}"
+drupal_core_owner_become: false
 drupal_db_user: drupal
 drupal_db_password: drupal
 drupal_db_name: drupal

provisioning/roles/geerlingguy.drupal/tasks/deploy.yml

@@ -18,7 +18,8 @@
     accept_hostkey: "{{ drupal_deploy_accept_hostkey }}"
   register: drupal_deploy_repo_updated
   notify: clear opcache
-  become: false
+  become: "{{ drupal_core_owner_become }}"
+  become_user: "{{ drupal_core_owner }}"
 
 - name: Check if a composer.json file is present.
   stat: "path={{ drupal_deploy_dir }}/composer.json"
@@ -28,7 +29,9 @@
   composer:
     command: install
     working_dir: "{{ drupal_deploy_dir }}"
+    no_dev: "{{ drupal_composer_no_dev }}"
   when:
     - drupal_deploy_composer_file.stat.exists
     - drupal_deploy_composer_install
-  become: false
+  become: "{{ drupal_core_owner_become }}"
+  become_user: "{{ drupal_core_owner }}"

provisioning/roles/geerlingguy.drupal/tasks/install-site.yml

@@ -23,7 +23,7 @@
     {{ drush_path }} site-install {{ drupal_install_profile | default('standard') }} -y
     --root={{ drupal_core_path }}
     --site-name="{{ drupal_site_name }}"
-    --account-name={{ drupal_account_name }}
+    --account-name="{{ drupal_account_name }}"
     --account-pass={{ drupal_account_pass }}
     --db-url={{ drupal_db_backend }}://{{ drupal_db_user }}:{{ drupal_db_password }}@{{ drupal_db_host }}/{{ drupal_db_name }}
     {{ drupal_site_install_extra_args | join(" ") }}

provisioning/roles/geerlingguy.drupal/tasks/main.yml

@@ -42,13 +42,13 @@
 
 # Set Drush variables.
 - name: Check if a project specific Drush binary exists.
-  stat: "path={{ drupal_composer_install_dir }}/vendor/bin/drush"
+  stat: "path={{ drupal_composer_install_dir }}/{{ drupal_composer_bin_dir }}/drush"
   register: drush_vendor_bin
   ignore_errors: true
 
 - name: Use project specific Drush if available.
   set_fact:
-    drush_path: "{{ drupal_composer_install_dir }}/vendor/bin/drush"
+    drush_path: "{{ drupal_composer_install_dir }}/{{ drupal_composer_bin_dir }}/drush"
   when: drush_vendor_bin.stat.exists
 
 # Install site if configured.