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

Fix Windows repo settings using values from 2015.8 documentation #205

Merged
merged 3 commits into from
Mar 4, 2016

Conversation

myii
Copy link
Member

@myii myii commented Mar 4, 2016

Overview

Current Windows repo settings do not work for a 2015.8 master. Checked the documentation at:

Found that a number of settings have been renamed -- those changes need to be transferred to this formula.


Commit: 7474d42

Method

Existing settings converted using the documentation:

  1. win_repo_dir_ng => winrepo_dir_ng
  2. win_gitrepos_ng => winrepo_remotes_ng

Testing

  1. Tested: winrepo_dir_ng
  2. Untested: winrepo_remotes_ng

Question re: error in documentation

Found a problem in the docs that needs to be fixed:

https://docs.saltstack.com/en/latest/ref/configuration/master.html#winrepo-dir:

winrepo_dir: /srv/salt/win/repo

https://docs.saltstack.com/en/latest/ref/configuration/master.html#winrepo-dir-ng:

winrepo_dir: /srv/salt/win/repo-ng
  1. The second example needs to be corrected from winrepo_dir to winrepo_dir_ng
  2. For such a minor change, would it be better to use a PR, an issue, or some other method?

Commit: c4e116e

Method

The documentation explains that there are settings required for pre-2015.8 minions. So copied the existing pre-2015.8 section "Windows Software Repo settings - Pre 2015.8" and converted using the new values from the documentation:

  1. win_repo => winrepo_dir
  2. win_repo_mastercachefile => winrepo_cachefile
  3. /srv/salt/win/repo/winrepo.p => winrepo.p
  4. win_gitrepos => winrepo_remotes

Testing

  1. Tested: winrepo_dir
  2. Untested: winrepo_cachefile
  3. Untested: winrepo.p
  4. Untested: winrepo_remotes

Commit: 7f36259

Method

Find & replace (for this section only):

  1. {% => {%-

Testing

All blank lines are no longer rendered.


Settings still be transferred from the documentation

There are still some new settings mentioned in the documentation that could be transferred to this formula:

  1. https://docs.saltstack.com/en/latest/ref/configuration/master.html#winrepo-provider
  2. https://docs.saltstack.com/en/latest/ref/configuration/master.html#winrepo-branch
  3. https://docs.saltstack.com/en/latest/ref/configuration/master.html#winrepo-ssl-verify
  4. https://docs.saltstack.com/en/latest/ref/configuration/master.html#winrepo-user
  5. https://docs.saltstack.com/en/latest/ref/configuration/master.html#winrepo-password
  6. https://docs.saltstack.com/en/latest/ref/configuration/master.html#winrepo-insecure-auth
  7. https://docs.saltstack.com/en/latest/ref/configuration/master.html#winrepo-pubkey
  8. https://docs.saltstack.com/en/latest/ref/configuration/master.html#winrepo-privkey
  9. https://docs.saltstack.com/en/latest/ref/configuration/master.html#winrepo-passphrase

Shall I start a new issue for these?

@gravyboat
Copy link
Contributor

This is a good catch, thanks. Regarding the documentation problem, just fork the main salt repo and make a PR against the docs for dev/the associated release that fixes it. For the other stuff that could be added, you can either create an issue, or just make a PR if you want to add them.

gravyboat added a commit that referenced this pull request Mar 4, 2016
Fix Windows repo settings using values from 2015.8 documentation
@gravyboat gravyboat merged commit 7abdf21 into saltstack-formulas:master Mar 4, 2016
@myii myii deleted the PR_FixWindowsRepoSettings branch March 4, 2016 19:47
@myii
Copy link
Member Author

myii commented Mar 4, 2016

No problem, glad to be of service.

As for the remaining settings, I'll have to open it up as an issue for now because currently don't have the available time to do it justice. If I find that I need these settings while supporting Windows minions, then I'll probably get around to it then, if it's still required.

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.

2 participants