It may not always possible or desirable to upload a GPG key to a
keyserver (`keyid`/`keyserver`) or to host it on remote server
(`key_url`). This just leaves storing the key in a state using a
`salt://` URL.
It seems like the states is the wrong place to hold this sort of data,
and would be more suited to being in the pillar.
Adding a `key_text` option to the apt `pkgrepo.managed` module, which
accepts a GPG key in string form, can assist in importing a GPG key from
pillar data.
Previous mentions of the correct default value (it really is sha256)
somehow got lost along the way.
Also, some comments seem to have gotten duplicated instead of updated.
Ensure that any created parent directories are made with `user`/`group`
perms, not as the `archive_user` user. This also allows setting the
group for these dirs instead of defaulting to `root`.
The `archive_user` argument to archive.extracted has been deprecated
since version 2014.7.2, and supplanted by the `user` parameter in
2015.8.0, with a logged warning until Boron. Now that 2016.3.0 is out,
complete the deprecation by:
- no longer silently using `archive_user` in `archive.extracted`,
preferring instead `user` and `group`,
- no longer accepted `archive_user` as an argument.
Also update man page.
Ensure that any created parent directories are made with `user`/`group`
perms, not as the `archive_user` user. This also allows setting the
group for these dirs instead of defaulting to `root`.
The `archive_user` argument to archive.extracted has been deprecated
since version 2014.7.2, and supplanted by the `user` parameter in
2015.8.0, with a logged warning until Boron. Now that 2016.3.0 is out,
complete the deprecation by:
- no longer silently using `archive_user` in `archive.extracted`,
preferring instead `user` and `group`,
- no longer accepted `archive_user` as an argument.
Also update man page.
* Added "none" option for pillar_source_merging_strategy
* added none to merging strategy in dictupdate so we no longer log warnings when it is selected
* Updated documentation
* fix for when pillar_source_merging_strategy is not set
* Fix looking up pillar data when merging is set to "none" and no saltenv was passed
* Fix looking up pillar data when merging is set to "none" and no saltenv was passed retry
* Let's not break when no merging strategy is passed
* Capitalisation
* Update on doc
As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/) ‘Securing subdomains’:
> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.
Test Plan: Manually visited all the links I’ve modified.
