diff --git a/roles/cron/cron_drupal8/defaults/main.yml b/roles/cron/cron_drupal8/defaults/main.yml index 636557ca..e012133b 100644 --- a/roles/cron/cron_drupal8/defaults/main.yml +++ b/roles/cron/cron_drupal8/defaults/main.yml @@ -13,6 +13,7 @@ drupal: job: cron # disabled: true # mailto: "{{ drupal.cron_mailto | default('') }}" # Each cron can have it's own mailto and can be configured to use different e-mail addresses. + # file: "/etc/cron.d/{{ project_name }}_{{ build_type }}_job_name" # edit job_name and uncomment to create a file for cron - note, deploy user needs to be able to write to the location cron_mailto: "" # If the sites are being deployed to an ASG, setting defer to true will create the crontab entry on the deploy server rather than all of the app servers. defer: false diff --git a/roles/cron/cron_drupal8/tasks/cron.yml b/roles/cron/cron_drupal8/tasks/cron.yml index de153574..2010d8c1 100644 --- a/roles/cron/cron_drupal8/tasks/cron.yml +++ b/roles/cron/cron_drupal8/tasks/cron.yml @@ -5,5 +5,4 @@ with_items: "{{ site.cron }}" loop_control: loop_var: entry - when: - - (deploy_operation == "deploy") or (deploy_operation == "revert") + when: deploy_operation == "deploy" diff --git a/roles/cron/cron_drupal8/tasks/job.yml b/roles/cron/cron_drupal8/tasks/job.yml index 23c7bd5b..74c97ad7 100644 --- a/roles/cron/cron_drupal8/tasks/job.yml +++ b/roles/cron/cron_drupal8/tasks/job.yml @@ -2,7 +2,6 @@ - name: Define cron job command. ansible.builtin.set_fact: _cron_job_command: "cd {{ live_symlink_dest }}/{{ webroot }}/sites/{{ site.folder }} && {{ drupal.drush_location }} {{ entry.job }} >/dev/null" - when: deploy_operation == "deploy" - name: Define cron job command if deferred (ASG). ansible.builtin.set_fact: @@ -43,4 +42,7 @@ {{ _cron_job_command | trim }} state: present disabled: "{{ entry.disabled | default(omit) }}" + cron_file: "{{ entry.file | default(omit) }}" + user: "{{ www_user }}" delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}" + become: "{{ true if entry.file is defined else false }}"