Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2026-05-10 14:01:03 +02:00
Code Issues Activity

Merge aa9929b817981e496f2bd152214d1589ff98056b into 5adb9c2075d118c6c48c9bd6e7c8564dfc073a36

Browse Source
This commit is contained in:
Tom Lejeune 2026-02-09 02:13:09 +00:00 committed by GitHub
commit 374374c209
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
salt/files/master.d/f_defaults.conf
View File

@ -1743,7 +1743,22 @@ win_gitrepos:
# Which returner(s) will be used for minion's result:
#return: mysql
{{ get_config('return', '')}}
{%- if 'returner_config' in cfg_master %}
{%- do default_keys.append('returner_config') %}
{%- for key, value in cfg_master['returner_config'].items() %}
{{ key }}: {{ value }}
{%- endfor %}
{%- elif 'returner_config' in cfg_salt %}
{%- for key, value in cfg_salt['returner_config'].items() %}
{{ key }}: {{ value }}
{%- endfor %}
{%- else %}
# mysql.host: 'salt'
# mysql.user: 'salt'
# mysql.pass: 'salt'
# mysql.db: 'salt'
# mysql.port: 3306
{%- endif %}
###### Miscellaneous settings ######
############################################