diff options
| author | Georg Pfuetzenreuter | 2023-04-30 20:42:21 +0200 |
|---|---|---|
| committer | Georg Pfuetzenreuter | 2023-04-30 20:42:21 +0200 |
| commit | 5f1793547b91fc0cc93b82feec512b953a6d7f45 (patch) | |
| tree | 197feab7d4f968d0e9db15729fee2b45d816abff | |
| parent | edd16ff3a7fa329510f09f53797eb8b2550edef1 (diff) | |
| parent | 942b71815ed6ae2a59f93140061bc515a4394c82 (diff) | |
| download | salt-5f1793547b91fc0cc93b82feec512b953a6d7f45.tar.gz salt-5f1793547b91fc0cc93b82feec512b953a6d7f45.tar.bz2 salt-5f1793547b91fc0cc93b82feec512b953a6d7f45.zip | |
Merge pull request 'Repair PrivateBin config quoting' (#56) from privatebin-quoting into production
Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/56
| -rw-r--r-- | salt/profile/privatebin/init.sls | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/salt/profile/privatebin/init.sls b/salt/profile/privatebin/init.sls index 7b9c036..80f769d 100644 --- a/salt/profile/privatebin/init.sls +++ b/salt/profile/privatebin/init.sls @@ -24,10 +24,10 @@ privatebin_clean: - sections: {%- macro conf(section, options) %} {%- for option in options.keys() -%} - {%- if mypillar[section][option] is string and mypillar[section][option].startswith('$') or mypillar[section][option] is number %} + {%- if ( mypillar[section][option] is string and mypillar[section][option].startswith('$') ) or mypillar[section][option] is number %} {%- set value = mypillar[section][option] -%} {%- else %} - {%- set value = mypillar[section][option] | quote -%} + {%- set value = "\"'" ~ mypillar[section][option] ~ "'\"" -%} {%- endif %} {{ option }}: {{ value }} {%- endfor -%} |