diff --git a/roles/cache_clear/cache_clear-drupal7/tasks/main.yml b/roles/cache_clear/cache_clear-drupal7/tasks/main.yml index b68e1979..20dd06f1 100644 --- a/roles/cache_clear/cache_clear-drupal7/tasks/main.yml +++ b/roles/cache_clear/cache_clear-drupal7/tasks/main.yml @@ -1,4 +1,18 @@ --- +- name: Override paths for squashfs build cleanup step. + block: + - name: Override path to drush binary. + set_fact: + drush_bin: "{{ drush_live_bin }}" + + - name: Override deploy_path. + set_fact: + deploy_path: "{{ live_symlink_dest }}" + when: + - deploy_code.mount_type is defined + - deploy_code.mount_type == "squashfs" + - deploy_operation == "cleanup" + - name: Clear Drupal 7 cache. command: cmd: "{{ drush_bin }} -l {{ site_drupal.folder }} -y cc all" @@ -9,3 +23,9 @@ loop_control: loop_var: site_drupal run_once: true + register: _drush_output + +- name: Show drush output. + ansible.builtin.debug: + msg: "{{ _drush_output }}" + when: drupal.drush_verbose_output diff --git a/roles/sync/drupal_sync_tasks/database_apply/database_apply-drupal7/tasks/main.yml b/roles/sync/drupal_sync_tasks/database_apply/database_apply-drupal7/tasks/main.yml index eeaa2d73..4d9f131f 100644 --- a/roles/sync/drupal_sync_tasks/database_apply/database_apply-drupal7/tasks/main.yml +++ b/roles/sync/drupal_sync_tasks/database_apply/database_apply-drupal7/tasks/main.yml @@ -2,7 +2,7 @@ # For some reason D7 drush doesn't respect 'chdir' with command, using shell instead. - name: Apply Drupal database updates. ansible.builtin.shell: - cmd: "{{ drush_bin }} -l {{ site.folder }} -y updb" + cmd: "{{ drush_live_bin }} -l {{ site.folder }} -y updb" chdir: "{{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }}" with_items: "{{ drupal.sites }}" loop_control: