Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2026-09-23 09:36:18 +02:00
Code Issues Activity

Merge aa9929b817 into 543760ac1c

Browse Source
This commit is contained in:
Tom Lejeune
2026-03-13 17:16:17 +01:00
committed by GitHub
parent 543760ac1c aa9929b817
commit 1f4c5bc55e
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
salt/files/master.d/f_defaults.conf
+16 -1
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 ######
############################################