diff --git a/roles/cron/cron_drupal7/tasks/job.yml b/roles/cron/cron_drupal7/tasks/job.yml index f8e8d608..d72306f6 100644 --- a/roles/cron/cron_drupal7/tasks/job.yml +++ b/roles/cron/cron_drupal7/tasks/job.yml @@ -27,6 +27,13 @@ state: present when: drupal.cron_mailto is defined and drupal.cron_mailto | length > 0 +- name: Setup specific MAILTO for cron jobs if defined + community.general.cronvar: + name: MAILTO + value: "{{ entry.mailto | default(omit) }}" + state: present + when: entry.mailto is defined and entry.mailto | length > 0 + - name: Setup Drupal cron tasks on app server. ansible.builtin.cron: name: "{{ project_name }}_{{ site.folder }}_{{ build_type }}_{{ entry.job }}" @@ -35,10 +42,13 @@ day: "{{ entry.day | default(omit) }}" weekday: "{{ entry.weekday | default(omit) }}" month: "{{ entry.month | default(omit) }}" - env: - name: MAILTO - value: "{{ entry.mailto | default(drupal.cron_mailto | default('')) }}" - job: "{{ _cron_job_command }}" + job: | + {% if entry.mailto is defined and entry.mailto | length > 0 %} + MAILTO={{ entry.mailto }} + {% elif drupal.cron_mailto is defined and drupal.cron_mailto | length > 0 %} + MAILTO={{ drupal.cron_mailto }} + {% endif %} + {{ cronjob_command }} state: present disabled: "{{ entry.disabled | default(omit) }}" delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}" diff --git a/roles/cron/cron_drupal8/tasks/job.yml b/roles/cron/cron_drupal8/tasks/job.yml index fdfd4f05..59a436f5 100644 --- a/roles/cron/cron_drupal8/tasks/job.yml +++ b/roles/cron/cron_drupal8/tasks/job.yml @@ -28,6 +28,13 @@ state: present when: drupal.cron_mailto is defined and drupal.cron_mailto | length > 0 +- name: Setup specific MAILTO for cron jobs if defined + community.general.cronvar: + name: MAILTO + value: "{{ entry.mailto | default(omit) }}" + state: present + when: entry.mailto is defined and entry.mailto | length > 0 + - name: Setup Drupal cron tasks on app server. ansible.builtin.cron: name: "{{ project_name }}_{{ site.folder }}_{{ build_type }}_{{ entry.job }}" @@ -36,10 +43,13 @@ day: "{{ entry.day | default(omit) }}" weekday: "{{ entry.weekday | default(omit) }}" month: "{{ entry.month | default(omit) }}" - env: - name: MAILTO - value: "{{ entry.mailto | default(drupal.cron_mailto | default('')) }}" - job: "{{ _cron_job_command }}" + job: | + {% if entry.mailto is defined and entry.mailto | length > 0 %} + MAILTO={{ entry.mailto }} + {% elif drupal.cron_mailto is defined and drupal.cron_mailto | length > 0 %} + MAILTO={{ drupal.cron_mailto }} + {% endif %} + {{ cronjob_command }} state: present disabled: "{{ entry.disabled | default(omit) }}" delegate_to: "{{ 'localhost' if drupal.defer else inventory_hostname }}"