From aa9929b817981e496f2bd152214d1589ff98056b Mon Sep 17 00:00:00 2001
From: Tom Lejeune <234121729+tom-lejeune-2@users.noreply.github.com>
Date: Mon, 9 Feb 2026 03:59:54 +0200
Subject: [PATCH] Add support for returner config block

---
 salt/files/master.d/f_defaults.conf | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf
index 16aecc7..4465b5c 100644
--- a/salt/files/master.d/f_defaults.conf
+++ b/salt/files/master.d/f_defaults.conf
@@ -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     ######
 ############################################