diff --git a/roles/_meta/deploy-mautic/tasks/main.yml b/roles/_meta/deploy-mautic/tasks/main.yml index 4ec69f31..0bf4723f 100644 --- a/roles/_meta/deploy-mautic/tasks/main.yml +++ b/roles/_meta/deploy-mautic/tasks/main.yml @@ -23,7 +23,7 @@ - ansible.builtin.import_role: name: cache_clear/cache_clear-opcache - ansible.builtin.import_role: - name: cache_clear/cache_clear-mautic + name: cache_clear/cache_clear-symfony # - ansible.builtin.import_role: # name: maintenance_mode # vars: diff --git a/roles/cache_clear/cache_clear-mautic/README.md b/roles/cache_clear/cache_clear-mautic/README.md deleted file mode 100644 index 16360291..00000000 --- a/roles/cache_clear/cache_clear-mautic/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Drupal 8 -Clear caches for Drupal 8. - - - - - diff --git a/roles/cache_clear/cache_clear-mautic/tasks/main.yml b/roles/cache_clear/cache_clear-mautic/tasks/main.yml deleted file mode 100644 index 56884d16..00000000 --- a/roles/cache_clear/cache_clear-mautic/tasks/main.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- name: set console path - set_fact: - mautic_console_bin: "env php {{ deploy_path }}/{{ webroot }}/app/console" - -- name: Clear cache. - command: - cmd: "{{ mautic_console_bin }} cache:clear --no-interaction --env=prod --no-warmup" - become: "{{ 'no' if www_user == deploy_user else 'yes' }}" - become_user: "{{ www_user }}" diff --git a/roles/database_apply/database_apply-mautic/tasks/main.yml b/roles/database_apply/database_apply-mautic/tasks/main.yml index ec806f33..66e52472 100644 --- a/roles/database_apply/database_apply-mautic/tasks/main.yml +++ b/roles/database_apply/database_apply-mautic/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: set console path - set_fact: - mautic_console_bin: "env php {{ deploy_path }}/{{ webroot }}/app/console" +- name: Set console path. + ansible.builtin.set_fact: + symfony_console_bin: "{{ symfony_console_bin | default('env php ' + deploy_path + '/bin/console') }}" - name: Fix file permissions for local.php. file: @@ -16,19 +16,19 @@ - name: Install Mautic. command: - cmd: "{{ mautic_console_bin }} mautic:install:data --no-interaction --force" + cmd: "{{ symfony_console_bin }} mautic:install:data --no-interaction --force" become: "{{ 'no' if www_user == deploy_user else 'yes' }}" become_user: "{{ www_user }}" when: previous_build_number == 0 or (mautic.force_install is defined and mautic.force_install) - name: Clear cache. command: - cmd: "{{ mautic_console_bin }} cache:clear --no-interaction --env=prod --no-warmup" + cmd: "{{ symfony_console_bin }} cache:clear --no-interaction --env=prod --no-warmup" become: "{{ 'no' if www_user == deploy_user else 'yes' }}" become_user: "{{ www_user }}" - name: Apply Mautic database updates. command: - cmd: "{{ mautic_console_bin }} doctrine:migrations:migrate --no-interaction --env=prod" + cmd: "{{ symfony_console_bin }} doctrine:migrations:migrate --no-interaction --env=prod" become: "{{ 'no' if www_user == deploy_user else 'yes' }}" become_user: "{{ www_user }}"