cms: Omit "root" from cron MAILTO, like for other services. Use Jinja filters instead of str methods. Use new "cron" key ("context" is passed to php-fpm templates).

Author: jpmckinney

pillar/coalition.sls

@@ -23,10 +23,10 @@ phpfpm:
       configuration: default
       context:
         user: coalition
-        cron_contact:
-          - sysadmin@open-contracting.org
-          - root
-        cron_ignore:
-          - a-fake-plugin.php
         listen_user: www-data
         socket: /var/run/php/php-fpm-coalition.sock
+      cron:
+        contact:
+          - sysadmin@open-contracting.org
+        ignore:
+          - a-fake-plugin.php

pillar/corporate.sls

@@ -30,15 +30,15 @@ phpfpm:
       configuration: default
       context:
         user: corporate
-        cron_contact:
-          - sysadmin@open-contracting.org
-          - support+ocp@theideabureau.co
-          - root
         listen_user: www-data
         socket: /var/run/php/php-fpm-corporate.sock
         env:
           # Increased to resolve WordPress menu issue.
           php_value[max_input_vars]: 2000
+      cron:
+        contact:
+          - sysadmin@open-contracting.org
+          - support+ocp@theideabureau.co
 
 ssh:
   corporate:

salt/cms/init.sls

@@ -34,14 +34,11 @@ allow {{ userdir }} access:
     - require:
       - user: {{ user }}_user_exists
 
-{{ set_cron_env(user, 'MAILTO', ','.join(entry.context.cron_contact | default(['root']) ), 'cms' ) }}
+{{ set_cron_env(user, 'MAILTO', entry.cron.contact|join(','), 'cms' ) }}
 
 # Assumes that all PHP-FPM sites on the CMS server are WordPress.
-{% if entry.context.cron_ignore is defined %}
-/usr/local/bin/wp cron event run --quiet --due-now --path={{ userdir }}/public_html 2>&1 | grep -v '{{ '\|'.join(entry.context.cron_ignore) }}':
-{% else %}
-/usr/local/bin/wp cron event run --quiet --due-now --path={{ userdir }}/public_html:
-{% endif %}
+
+/usr/local/bin/wp cron event run --quiet --due-now --path={{ userdir }}/public_html{% if 'ignore' in entry.cron %} 2>&1 | grep -v '{{ entry.cron.ignore|join('\|') }}'{% endif %}:
   cron.present:
     - identifier: WORDPRESS_SITE_CRON
     - user: {{ user }}