summaryrefslogtreecommitdiffstats
path: root/salt
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2023-04-30 18:53:40 +0200
committerGeorg Pfuetzenreuter2023-04-30 18:53:40 +0200
commit65af33d4fb071ab08d2869e1b7468480d398ccb4 (patch)
tree2cf9617cf9891eaefefba266665f0970194f65bf /salt
parent8d9af70941de7c4856a7187b58af10c673c33815 (diff)
parent4053be45d21d977cc674d7a1ea8c4c44022d716d (diff)
downloadsalt-65af33d4fb071ab08d2869e1b7468480d398ccb4.tar.gz
salt-65af33d4fb071ab08d2869e1b7468480d398ccb4.tar.bz2
salt-65af33d4fb071ab08d2869e1b7468480d398ccb4.zip
Merge pull request 'Repair BookStack quoting' (#52) from bookstack-quoting into production
Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/52
Diffstat (limited to 'salt')
-rw-r--r--salt/profile/bookstack/init.sls4
1 files changed, 2 insertions, 2 deletions
diff --git a/salt/profile/bookstack/init.sls b/salt/profile/bookstack/init.sls
index 05f07b6..bc63a03 100644
--- a/salt/profile/bookstack/init.sls
+++ b/salt/profile/bookstack/init.sls
@@ -24,10 +24,10 @@ bookstack_permissions:
- key_values:
{%- macro condconf(option) %}
{%- if option in mypillar -%}
- {%- if mypillar[option] is string and mypillar[option].startswith('$') or mypillar[option] is number %}
+ {%- if ( mypillar[option] is string and mypillar[option].startswith('$') ) or mypillar[option] is number %}
{%- set value = mypillar[option] %}
{%- else %}
- {%- set value = "'" ~ mypillar[option] ~ "'" | quote %}
+ {%- set value = "\"'" ~ mypillar[option] ~ "\"'" %}
{%- endif %}
{{ option | upper }}: {{ value }}
{%- endif -%}