Drush refactor pr devel

roles/_init/tasks/drupal7.yml

@@ -1,7 +1,7 @@
 ---
 - name: Define Drush path.
   set_fact:
-    drush_bin: "{{ drush_bin | default('{{ bin_directory }}/drush') }}"
+    drush_bin: "{{ drush_bin | default('{{ bin_directory }}/drush.phar') }}"
 
 - name: Ensure we have Drush binary.
   import_role:

roles/maintenance_mode/maintenance_mode-drupal-core/tasks/main.yml

@@ -1,5 +1,5 @@
 ---
-- include_tasks: "{{ maintenance_mode.operation }}.yml"
+- ansible.builtin.include_tasks: "{{ maintenance_mode.operation }}.yml"
   with_items: "{{ drupal.sites }}"
   loop_control:
     loop_var: site

roles/maintenance_mode/maintenance_mode-drupal-core/tasks/offline.yml

@@ -1,8 +1,8 @@
 ---
-# @todo this needs refactoring for multisite.
 - name: Enable maintenance mode.
-  command:
-    cmd: "{{ drush_bin }} -l {{ site.folder }} state:set system.maintenance_mode 1 --input-format=integer"
+  ansible.builtin.command:
+    cmd: "cd {{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }} && {{ drush_bin }} -l {{ site.folder }} state:set system.maintenance_mode 1 --input-format=integer"
+  args:
     chdir: "{{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
   become_user: "{{ www_user }}"
@@ -11,8 +11,9 @@
     - project_type == 'drupal8'
 
 - name: Enable maintenance mode D7.
-  shell:
+  ansible.builtin.command:
     cmd: "{{ drush_bin }} -l {{ site.folder }} vset maintenance_mode 1"
+  args:
     chdir: "{{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
   become_user: "{{ www_user }}"

roles/maintenance_mode/maintenance_mode-drupal-core/tasks/online.yml

@@ -1,16 +1,18 @@
 ---
 - name: Disable maintenance mode.
-  command:
-    cmd: "{{ drush_bin }} -l {{ site.folder }} state:set system.maintenance_mode 0 --input-format=integer"
+  ansible.builtin.command:
+    cmd: "cd {{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }} && {{ drush_bin }} -l {{ site.folder }} state:set system.maintenance_mode 0 --input-format=integer"
+  args:
     chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
   become_user: "{{ www_user }}"
   when:
     - project_type == 'drupal8'
 
 - name: Disable maintenance mode D7.
-  shell:
+  ansible.builtin.command:
     cmd: "{{ drush_bin }} -l {{ site.folder }} vset maintenance_mode 0"
+  args:
     chdir: "{{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }}"
   become: "{{ 'no' if www_user == deploy_user else 'yes' }}"
   become_user: "{{ www_user }}"