diff --git a/roles/cron/cron_drupal7/defaults/main.yml b/roles/cron/cron_drupal7/defaults/main.yml index 8a2e7ea7..51e2741a 100644 --- a/roles/cron/cron_drupal7/defaults/main.yml +++ b/roles/cron/cron_drupal7/defaults/main.yml @@ -19,6 +19,6 @@ drupal: # If defer is set to true, the Ansible target must be declared with defer_target. If using a group, include the index. For example, _ce_www_dev[0] defer_target: "" drush_location: "{{ drush_bin }}" # you might specify another location, e.g. "{{ deploy_path }}/vendor/bin/drush" - cron_error_filter: "> /tmp/cron_output.txt 2>&1; rc=$?; if [ $rc -ne 0 ]; then mail -s \"Cron Error - $(hostname)\" sysadm@codeenigma.com < /tmp/cron_output.txt; elif grep -iE \"error|fail|fatal|critical|exception\" /tmp/cron_output.txt | grep -v -E '(\"rc\": -13|MODULE FAILURE)' | grep -q .; then mail -s \"Cron Error - $(hostname)\" sysadm@codeenigma.com < /tmp/cron_output.txt; fi" - cron_error_email: "{% if entry.cron_error_mailto is defined %}if [ $rc -ne 0 ] || grep -iE \"error|fail|fatal|critical|exception\" /tmp/cron_output.txt | grep -v -E '(\"rc\": -13|MODULE FAILURE)' | grep -q .; then echo 'Command failed' | mail -s 'Cron Error - {{ inventory_hostname }}' {{ entry.cron_error_mailto }}; fi{% endif %}" + cron_error_filter: "> /tmp/cron_output.txt 2>&1; rc=\\$?; if [ \\$rc -ne 0 ] || grep -iE \"error|fail|fatal|critical|exception\" /tmp/cron_output.txt | grep -v -E \"(\\\"rc\\\": -13|MODULE FAILURE)\" | grep -q .; then [ -n \\\"{{ entry.cron_error_mailto }}\\\" ] && mail -s \\\"Cron Error - \\$(hostname)\\\" {{ entry.cron_error_mailto }} < /tmp/cron_output.txt; fi" + cron_error_email: "" python_interpreter: "-e 'ansible_python_interpreter=/home/controller/ce-python/bin/python'" diff --git a/roles/cron/cron_drupal8/defaults/main.yml b/roles/cron/cron_drupal8/defaults/main.yml index 1d1dd61b..a8ce5b9f 100644 --- a/roles/cron/cron_drupal8/defaults/main.yml +++ b/roles/cron/cron_drupal8/defaults/main.yml @@ -22,6 +22,6 @@ drupal: # If defer is set to true, the Ansible target must be declared with defer_target. If using a group, include the index. For example, _ce_www_dev[0] defer_target: "" drush_location: "{{ drush_bin }}" # you might specify another location, e.g. "{{ deploy_path }}/vendor/bin/drush" - cron_error_filter: "> /tmp/cron_output.txt 2>&1; rc=$?; if [ $rc -ne 0 ]; then mail -s \"Cron Error - $(hostname)\" sysadm@codeenigma.com < /tmp/cron_output.txt; elif grep -iE \"error|fail|fatal|critical|exception\" /tmp/cron_output.txt | grep -v -E '(\"rc\": -13|MODULE FAILURE)' | grep -q .; then mail -s \"Cron Error - $(hostname)\" sysadm@codeenigma.com < /tmp/cron_output.txt; fi" - cron_error_email: "{% if entry.cron_error_mailto is defined %}if [ $rc -ne 0 ] || grep -iE \"error|fail|fatal|critical|exception\" /tmp/cron_output.txt | grep -v -E '(\"rc\": -13|MODULE FAILURE)' | grep -q .; then echo 'Command failed' | mail -s 'Cron Error - {{ inventory_hostname }}' {{ entry.cron_error_mailto }}; fi{% endif %}" + cron_error_filter: "> /tmp/cron_output.txt 2>&1; rc=\\$?; if [ \\$rc -ne 0 ] || grep -iE \"error|fail|fatal|critical|exception\" /tmp/cron_output.txt | grep -v -E \"(\\\"rc\\\": -13|MODULE FAILURE)\" | grep -q .; then [ -n \\\"{{ entry.cron_error_mailto }}\\\" ] && mail -s \\\"Cron Error - \\$(hostname)\\\" {{ entry.cron_error_mailto }} < /tmp/cron_output.txt; fi" + cron_error_email: "" python_interpreter: "-e 'ansible_python_interpreter=/home/controller/ce-python/bin/python'"