Add support for proxy settings #487
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bastelfreak
reviewed
May 9, 2019
manifests/params.pp
Outdated
| @@ -9,6 +9,7 @@ | |||
| $install_options = [] | |||
| $sources = undef | |||
| $puppet_master = true | |||
| $proxy = '' | |||
There was a problem hiding this comment.
please default to undef and not empty string
bastelfreak
reviewed
May 9, 2019
manifests/config.pp
Outdated
| @@ -62,6 +65,7 @@ | |||
| $root_user = $r10k::params::root_user, | |||
| $root_group = $r10k::params::root_group, | |||
| Stdlib::Absolutepath $puppetconf_path = $r10k::params::puppetconf_path, | |||
| String $proxy = $r10k::params::proxy, | |||
There was a problem hiding this comment.
Suggested change
| String $proxy = $r10k::params::proxy, | |
| Optional[String[1]] $proxy = $r10k::params::proxy, |
Dan33l
reviewed
May 10, 2019
| @@ -21,6 +21,9 @@ | |||
| # Location of symlink that points to configfile. Default: /etc/r10k.yaml | |||
| # * [*forge_settings*] | |||
| # Hash containing settings for downloading modules from the Puppet Forge. | |||
| # * [*proxy*] | |||
| # String containing proxy setting for r10k.yaml. | |||
| # Default: '' | |||
There was a problem hiding this comment.
params.pp says it defaults to undef.
There was a problem hiding this comment.
It does not matter. I will create another pull request, which will refactor a lot of stuff and hopefully we will use data-in-modules and generate a REFERENCE.md.
alexjfisher
reviewed
May 10, 2019
| @@ -21,6 +21,7 @@ | |||
| Hash $forge_settings = $r10k::params::forge_settings, | |||
| Hash $deploy_settings = $r10k::params::deploy_settings, | |||
| $root_user = $r10k::params::root_user, | |||
| Optional[String[1]] $proxy = $r10k::params::proxy, | |||
There was a problem hiding this comment.
Stdlib::HTTPUrl instead of String[1]?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This closes #473. @Rudikza Thank you very much for this enhancement.