diff --git a/roles/_meta/deploy-mautic/tasks/main.yml b/roles/_meta/deploy-mautic/tasks/main.yml index ab4a38d2..4ec69f31 100644 --- a/roles/_meta/deploy-mautic/tasks/main.yml +++ b/roles/_meta/deploy-mautic/tasks/main.yml @@ -1,37 +1,37 @@ --- # Default Mautic role. -- import_role: +- ansible.builtin.import_role: name: _init -- import_role: +- ansible.builtin.import_role: name: deploy_code -# - import_role: -# name: composer -# - import_role: +- ansible.builtin.import_role: + name: composer +# - 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: database_apply -- import_role: +- ansible.builtin.import_role: name: live_symlink -- import_role: +- ansible.builtin.import_role: name: cache_clear/cache_clear-opcache -- import_role: +- ansible.builtin.import_role: name: cache_clear/cache_clear-mautic -# - 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_mautic -- import_role: +- ansible.builtin.import_role: name: _exit diff --git a/roles/cron/cron_mautic/tasks/main.yml b/roles/cron/cron_mautic/tasks/main.yml index f0b6071b..403536dd 100644 --- a/roles/cron/cron_mautic/tasks/main.yml +++ b/roles/cron/cron_mautic/tasks/main.yml @@ -1,12 +1,15 @@ --- +- name: Set console path. + ansible.builtin.set_fact: + symfony_console_bin: "{{ symfony_console_bin | default('env php ' + deploy_path + '/bin/console') }}" - name: Setup Mautic cron tasks. cron: name: "{{ project_name }}_{{ build_type }}_{{ entry.job }}" minute: "{{ entry.minute }}" hour: "{{ entry.hour | default(omit) }}" - job: "env php {{ live_symlink_dest }}/{{ webroot }}/app/console {{ entry.job }}" + job: "env php {{ symfony_console_bin }} {{ entry.job }}" with_items: "{{ cron_mautic.entries }}" loop_control: loop_var: entry - when: deploy_operation == 'deploy' \ No newline at end of file + when: deploy_operation == 'deploy' diff --git a/roles/live_symlink/defaults/main.yml b/roles/live_symlink/defaults/main.yml index 51618671..8bf22492 100644 --- a/roles/live_symlink/defaults/main.yml +++ b/roles/live_symlink/defaults/main.yml @@ -3,11 +3,11 @@ deploy_user: 'deploy' live_symlink: # Either update (for successful builds) or revert. operation: update - # Specify any additional symlink to create, with src (target) and dest (link). + # Specify any additional directory symlink to create, with src (target) and dest (link). # src: can be either absolute or relative to the dest (eg. '/var/my_data', '/home/deploy/simplesaml', '../../../myconfig') # dest: can only be relative to the root of your repository (eg. 'www/themes/myassets', 'var/cache') # force: set to true to create the symlinks in two cases: the source file does not exist but will appear later; the destination exists and is a file. - # - src: '/home/{{ deploy_user }}//{{ project_name }}_{{ build_type }}/simplesaml' + # - src: '/home/{{ deploy_user }}/shared/{{ project_name }}_{{ build_type }}/simplesaml' # dest: 'vendor/simplesamlphp/simplesamlphp/config' # force: true # - src: '/var/simplesaml/etc' diff --git a/roles/live_symlink/tasks/main.yml b/roles/live_symlink/tasks/main.yml index d85e4e7f..63225e16 100644 --- a/roles/live_symlink/tasks/main.yml +++ b/roles/live_symlink/tasks/main.yml @@ -32,16 +32,27 @@ - live_symlink.templates | length - deploy_operation == 'deploy' -- name: Create additional symlinks. - ansible.builtin.file: - src: "{{ link.src }}" - dest: "{{ deploy_path }}/{{ link.dest }}" - state: link - follow: false - force: "{{ link.force | default(true) }}" - with_items: "{{ live_symlink.symlinks }}" - loop_control: - loop_var: link +- name: Handle additional symlinks. when: - live_symlink.symlinks | length - - deploy_operation == 'deploy' \ No newline at end of file + - deploy_operation == 'deploy' + block: + - name: Ensure additional symlink sources exist. + ansible.builtin.file: + path: "{{ link.src }}" + state: directory + mode: '0755' + with_items: "{{ live_symlink.symlinks }}" + loop_control: + loop_var: link + + - name: Create additional symlinks. + ansible.builtin.file: + src: "{{ link.src }}" + dest: "{{ deploy_path }}/{{ link.dest }}" + state: link + follow: false + force: "{{ link.force | default(true) }}" + with_items: "{{ live_symlink.symlinks }}" + loop_control: + loop_var: link