| commit | b157c1c5a0f07692911e61039738d6919ffef200 | [log] [tgz] |
|---|---|---|
| author | Filip Pytloun <filip@pytloun.cz> | Tue Jan 17 12:26:18 2017 +0100 |
| committer | GitHub <noreply@github.com> | Tue Jan 17 12:26:18 2017 +0100 |
| tree | de584b1913d20f0f569e8ab1993a884ff17df345 | |
| parent | c1cebde75cfa2bab9236e99e18331aaed20b3434 [diff] | |
| parent | 6a4e11aafcece144e121a8cede469341efa056d4 [diff] |
Merge pull request #25 from smolaon/master added config for proxy on salt minion
diff --git a/salt/files/minion.conf b/salt/files/minion.conf index 0f9ec33..05b096e 100644 --- a/salt/files/minion.conf +++ b/salt/files/minion.conf
@@ -59,6 +59,11 @@ log_level: {{ minion.log.level }} +{%- if minion.proxy is defined %} +proxy_host: {{ minion.proxy.host }} +proxy_port: {{ minion.proxy.port }} +{%- endif %} + {%- if minion.sentry is defined %} sentry_handler: {% for server in minion.sentry.servers %}