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

Make default pki directory configurable #46129

Closed
wants to merge 2 commits into from

Conversation

bdrung
Copy link
Contributor

@bdrung bdrung commented Feb 21, 2018

The files in /etc/salt/pki are not configuration files in the sense of the FHS ("local file used to control the operation of a program"). Debian wants to change the default location to /var/lib/salt/pki (to properly follow FHS and to allow setting StateDirectory in the salt master systemd configuration).

Therefore introduce a STATE_DIR syspaths variable which defaults to CONFIG_DIR, but can be individually customized.

fixes #3396
Bug-Debian: https://bugs.debian.org/698898

@bdrung bdrung requested a review from a team as a code owner February 21, 2018 13:10
@garethgreenaway
Copy link
Contributor

Seems the develop might be a better place for this PR. The naming is also confusing as we have Salt states and a default location for Salt states, you use of state (I believe) is different?

@bdrung
Copy link
Contributor Author

bdrung commented Feb 28, 2018

I proposed this pull requests for 2017.7 because I have applied this patch to the Debian package. Is the 2018.3 branch open for this kind of pull requests?

You are right. The name chosen name is confusing. I changed it to VARIABLE_STATE_DIR to prevent confusing it with salt-states.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
The files in /etc/salt/pki are not configuration files in the sense
of the FHS ("local file used to control the operation of a program").
Debian wants to change the default location to /var/lib/salt/pki (to
properly follow FHS and to allow setting StateDirectory in the salt
master systemd configuration).

Therefore introduce a VARIABLE_STATE_DIR syspaths variable which
defaults to CONFIG_DIR, but can be individually customized.

fixes saltstack#3396
Bug-Debian: https://bugs.debian.org/698898
@rallytime
Copy link
Contributor

@bdrung We don't like making these kinds of changes to config file like this in dot releases. If you could move this to develop, that would be great. Adding this to the Fluorine release notes as a new feature would be great, too, when you move it over.

@bdrung
Copy link
Contributor Author

bdrung commented Mar 1, 2018

I'll rebase the merge proposal on develop.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants