Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use proxyfile based on salt.syspaths.CONFIG_DIR #52171

Merged
merged 2 commits into from
Apr 12, 2019

Conversation

awerner
Copy link
Contributor

@awerner awerner commented Mar 13, 2019

What does this PR do?

Before, the file created by salt_proxy.configure_proxy was always /etc/salt/proxy. Now salt.syspaths is used to determine the desination path. On a side note, the genarated file was also invalid (usage of = instead of : as delimiter), this was also fixed.

What issues does this PR fix or reference?

This PR fixes #52169

Previous Behavior

  • the proxy config file was always created in /etc/salt/proxy
  • the proxy config file was invalid YAML

New Behavior

  • the proxy config file is created in the system default config directory
  • the proxy config file is created as valid YAML

Tests written?

No

Commits signed with GPG?

No

@Ch3LL Ch3LL added the v2019.2.1 unsupported version label Apr 5, 2019
@dwoz dwoz merged commit b866689 into saltstack:2018.3 Apr 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v2019.2.1 unsupported version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants