From c932881cd70bd64db40245ea1e3df283f3859c78 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Sat, 11 Mar 2023 18:10:07 +0100 Subject: [PATCH] profile.bookstack: quote keys Some keys needed quoting to pass the YAML parser. Signed-off-by: Georg Pfuetzenreuter --- salt/profile/bookstack/init.sls | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/salt/profile/bookstack/init.sls b/salt/profile/bookstack/init.sls index af14a4b..3dc5a36 100644 --- a/salt/profile/bookstack/init.sls +++ b/salt/profile/bookstack/init.sls @@ -24,7 +24,12 @@ bookstack_permissions: - key_values: {%- macro condconf(option) %} {%- if option in mypillar -%} - {{ option | upper }}: {{ mypillar[option] }} + {%- if mypillar[option] is string and mypillar[option].startswith('$') or mypillar[option] is number %} + {%- set value = mypillar[option] %} + {%- else %} + {%- set value = mypillar[option] | quote %} + {%- endif %} + {{ option | upper }}: {{ value }} {%- endif -%} {%- endmacro %} {{ condconf('app_url') }} @@ -55,7 +60,6 @@ bookstack_permissions: {{ condconf('saml2_external_id_attribute') }} {{ condconf('saml2_display_name_attributes') }} {{ condconf('saml2_idp_entityid') }} - {{ condconf('saml2_idp_entityid') }} {{ condconf('saml2_idp_sso') }} {{ condconf('saml2_idp_slo') }} {{ condconf('saml2_idp_x509') }}