From 06859f5fbbebd28b3be03738eb202ca55d474af8 Mon Sep 17 00:00:00 2001 From: waynegemmell Date: Mon, 11 Mar 2019 16:45:10 +0200 Subject: [PATCH 1/2] Context data wrapped with tojson filter. --- logrotate/jobs.sls | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/logrotate/jobs.sls b/logrotate/jobs.sls index 6b08ce9..12bee8a 100644 --- a/logrotate/jobs.sls +++ b/logrotate/jobs.sls @@ -22,11 +22,11 @@ logrotate-{{ key }}: - template: jinja - context: {% if value is mapping %} - path: {{ value.get('path', [key]) }} - data: {{ value.get('config', []) }} + path: {{ value.get('path', [key]) | tojson }} + data: {{ value.get('config', []) | tojson }} {% else %} - path: [ {{ key }} ] - data: {{ value }} + path: [ {{ key | tojson }} ] + data: {{ value | tojson }} {% endif %} {% endif %} {%- endfor -%} From 235f677bc6572897b72a8b86a35bee6414970123 Mon Sep 17 00:00:00 2001 From: waynegemmell Date: Mon, 11 Mar 2019 20:46:15 +0200 Subject: [PATCH 2/2] Updated to | json for backward compatibility --- logrotate/jobs.sls | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/logrotate/jobs.sls b/logrotate/jobs.sls index 12bee8a..87a2e0f 100644 --- a/logrotate/jobs.sls +++ b/logrotate/jobs.sls @@ -22,11 +22,11 @@ logrotate-{{ key }}: - template: jinja - context: {% if value is mapping %} - path: {{ value.get('path', [key]) | tojson }} - data: {{ value.get('config', []) | tojson }} + path: {{ value.get('path', [key]) | json }} + data: {{ value.get('config', []) | json }} {% else %} - path: [ {{ key | tojson }} ] - data: {{ value | tojson }} + path: [ {{ key | json }} ] + data: {{ value | json }} {% endif %} {% endif %} {%- endfor -%}