diff --git a/roles/cron/cron_drupal7/tasks/job.yml b/roles/cron/cron_drupal7/tasks/job.yml index 2f48c904..2e45bf0f 100644 --- a/roles/cron/cron_drupal7/tasks/job.yml +++ b/roles/cron/cron_drupal7/tasks/job.yml @@ -18,6 +18,12 @@ when: - drupal.defer is not defined or not drupal.defer +- name: Add dev null redirection (for non-deferred). + ansible.builtin.set_fact: + _cron_job_command: "{{ _cron_job_command }} > /dev/null" + when: + - drupal.defer is not defined or not drupal.defer + - name: Define cron job command for differing deploy users. ansible.builtin.set_fact: _cron_job_command: "{{ _cron_job_command }} --extra-vars '{\"become\":true,\"become_user\":\"{{ www_user }}\"}'" @@ -31,6 +37,8 @@ path: /var/spool/cron/crontabs/{{ deploy_user }} regexp: '^MAILTO=' state: absent + delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}" + become: true - name: Set global MAILTO entry if it exists ansible.builtin.lineinfile: @@ -39,6 +47,7 @@ insertafter: '^#' state: present when: drupal.cron_mailto is defined + become: true delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}" #- name: Remove existing MAILTO entry (if any) diff --git a/roles/cron/cron_drupal8/tasks/job.yml b/roles/cron/cron_drupal8/tasks/job.yml index a88ed9c6..99cb446f 100644 --- a/roles/cron/cron_drupal8/tasks/job.yml +++ b/roles/cron/cron_drupal8/tasks/job.yml @@ -31,6 +31,8 @@ path: /var/spool/cron/crontabs/{{ deploy_user }} regexp: '^MAILTO=' state: absent + delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}" + become: true - name: Set global MAILTO entry if it exists ansible.builtin.lineinfile: @@ -40,6 +42,21 @@ state: present when: drupal.cron_mailto is defined delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}" + become: true + +#- name: Remove existing MAILTO entry (if any) +# community.general.cronvar: +# name: MAILTO +# state: absent +# delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}" + +#- name: Set global MAILTO for cron jobs (if defined) +# community.general.cronvar: +# name: MAILTO +# value: "{{ drupal.cron_mailto | default(omit) }}" +# state: present +# when: drupal.cron_mailto is defined and drupal.cron_mailto | length > 0 +# delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}" #- name: Remove existing MAILTO entry (if any) # community.general.cronvar: