diff --git a/roles/_meta/deploy-drupal8/tasks/main.yml b/roles/_meta/deploy-drupal8/tasks/main.yml index 3e66875b..c8a9223b 100644 --- a/roles/_meta/deploy-drupal8/tasks/main.yml +++ b/roles/_meta/deploy-drupal8/tasks/main.yml @@ -3,41 +3,41 @@ # - single site # - multisites with a single database -- import_role: +- ansible.builtin.import_role: name: _init -- import_role: +- ansible.builtin.import_role: name: deploy_code -- import_role: +- ansible.builtin.import_role: name: composer -- import_role: +- ansible.builtin.import_role: name: npm -- import_role: +- ansible.builtin.import_role: name: maintenance_mode vars: maintenance_mode: operation: offline -- import_role: +- ansible.builtin.import_role: name: database_backup -- import_role: +- ansible.builtin.import_role: name: config_generate -- import_role: +- ansible.builtin.import_role: name: cache_clear/cache_clear-opcache -- import_role: +- ansible.builtin.import_role: name: database_apply -- import_role: +- ansible.builtin.import_role: name: sanitize/admin_creds -- import_role: +- ansible.builtin.import_role: name: live_symlink -- import_role: +- ansible.builtin.import_role: name: cache_clear/cache_clear-drupal8 -- import_role: +- ansible.builtin.import_role: name: maintenance_mode vars: maintenance_mode: operation: online -- import_role: +- ansible.builtin.import_role: name: cron/cron_database_backup -- import_role: +- ansible.builtin.import_role: name: cron/cron_drupal8 -- import_role: +- ansible.builtin.import_role: name: _exit diff --git a/roles/cache_clear/cache_clear-drupal8/tasks/main.yml b/roles/cache_clear/cache_clear-drupal8/tasks/main.yml index a0f960da..063bfe8d 100644 --- a/roles/cache_clear/cache_clear-drupal8/tasks/main.yml +++ b/roles/cache_clear/cache_clear-drupal8/tasks/main.yml @@ -11,7 +11,7 @@ when: - deploy_code.mount_type is defined - deploy_code.mount_type == "squashfs" - - deploy_operation == 'cleanup' + - deploy_operation == "cleanup" - name: Clear Drupal cache. ansible.builtin.command: @@ -53,4 +53,4 @@ - drupal.truncate_cache_table - deploy_code.mount_type is defined - deploy_code.mount_type == "squashfs" - - deploy_operation == 'cleanup' + - deploy_operation == "cleanup" diff --git a/roles/config_generate/tasks/main.yml b/roles/config_generate/tasks/main.yml index 2af08e87..adc35b06 100644 --- a/roles/config_generate/tasks/main.yml +++ b/roles/config_generate/tasks/main.yml @@ -2,7 +2,7 @@ - name: Generate project specific configuration. ansible.builtin.include_role: name: "config_generate/config_generate-{{ project_type }}" - when: deploy_operation == 'deploy' + when: deploy_operation == "deploy" - name: Generate additional templates. ansible.builtin.template: @@ -13,7 +13,7 @@ loop_var: template when: - config_generate.templates | length - - deploy_operation == 'deploy' + - deploy_operation == "deploy" - name: Create additional symlinks. ansible.builtin.file: @@ -25,4 +25,4 @@ loop_var: link when: - config_generate.symlinks | length - - deploy_operation == 'deploy' \ No newline at end of file + - deploy_operation == "deploy" \ No newline at end of file diff --git a/roles/cron/cron_database_backup/tasks/main.yml b/roles/cron/cron_database_backup/tasks/main.yml index ab8bc0a1..4cd4676c 100644 --- a/roles/cron/cron_database_backup/tasks/main.yml +++ b/roles/cron/cron_database_backup/tasks/main.yml @@ -6,4 +6,4 @@ with_items: "{{ database_backup.engines }}" loop_control: loop_var: engine - when: deploy_operation == 'deploy' \ No newline at end of file + when: deploy_operation == "deploy" \ No newline at end of file diff --git a/roles/cron/cron_drupal8/tasks/cron.yml b/roles/cron/cron_drupal8/tasks/cron.yml index 1ed40cc3..de153574 100644 --- a/roles/cron/cron_drupal8/tasks/cron.yml +++ b/roles/cron/cron_drupal8/tasks/cron.yml @@ -6,4 +6,4 @@ loop_control: loop_var: entry when: - - deploy_operation == 'deploy' + - (deploy_operation == "deploy") or (deploy_operation == "revert") diff --git a/roles/cron/cron_drupal8/tasks/job.yml b/roles/cron/cron_drupal8/tasks/job.yml index b89a0b05..7fa23c3e 100644 --- a/roles/cron/cron_drupal8/tasks/job.yml +++ b/roles/cron/cron_drupal8/tasks/job.yml @@ -2,6 +2,12 @@ - name: Define cron job command. ansible.builtin.set_fact: _cron_job_command: "cd {{ deploy_path }}/{{ webroot }}/sites/{{ site.folder }} && {{ drupal.drush_location }} {{ entry.job }}" + when: deploy_operation == "deploy" + +- name: Revert cron job command. + ansible.builtin.set_fact: + _cron_job_command: "cd {{ previous_deploy_path }}/{{ webroot }}/sites/{{ site.folder }} && {{ drupal.drush_location }} {{ entry.job }}" + when: deploy_operation == "revert" - name: Define cron job command if deferred (ASG). ansible.builtin.set_fact: diff --git a/roles/database_apply/tasks/main.yml b/roles/database_apply/tasks/main.yml index 89138a98..ae1ad8ee 100644 --- a/roles/database_apply/tasks/main.yml +++ b/roles/database_apply/tasks/main.yml @@ -2,5 +2,5 @@ - name: Apply database updates. include_role: name: "database_apply/database_apply-{{ project_type }}" - when: deploy_operation == 'deploy' + when: deploy_operation == "deploy" run_once: true diff --git a/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/offline.yml b/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/offline.yml index 78314024..d70f87d0 100644 --- a/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/offline.yml +++ b/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/offline.yml @@ -9,6 +9,7 @@ when: - previous_build_number > 0 - project_type == 'drupal8' + - deploy_operation == "deploy" # skip on cleanup and revert, no need # For some reason D7 drush doesn't respect 'chdir' with command, using shell instead. - name: Enable maintenance mode D7. @@ -20,3 +21,4 @@ when: - previous_build_number > 0 - project_type == 'drupal7' + - deploy_operation == "deploy" diff --git a/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/online.yml b/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/online.yml index 47a925f6..02646ff6 100644 --- a/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/online.yml +++ b/roles/maintenance_mode/maintenance_mode-drupal-core/tasks/online.yml @@ -21,6 +21,7 @@ - project_type == "drupal8" - deploy_code.mount_type is defined - deploy_code.mount_type == "squashfs" + - deploy_operation == "deploy" # For some reason D7 drush doesn't respect 'chdir' with command, using shell instead. - name: Disable maintenance mode D7. @@ -43,3 +44,4 @@ - project_type == "drupal7" - deploy_code.mount_type is defined - deploy_code.mount_type == "squashfs" + - deploy_operation == "deploy" diff --git a/roles/sanitize/admin_creds/tasks/main.yml b/roles/sanitize/admin_creds/tasks/main.yml index 880844ba..bc6f511d 100644 --- a/roles/sanitize/admin_creds/tasks/main.yml +++ b/roles/sanitize/admin_creds/tasks/main.yml @@ -2,5 +2,5 @@ - name: Revert admin credentials. include_role: name: "sanitize/admin_creds/admin_creds-{{ project_type }}" - when: deploy_operation == 'deploy' + when: deploy_operation == "deploy" run_once: true