Replace add_listen_directive with nginx_version
#1330
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
approved these changes
May 8, 2019
alexjfisher
changed the title
add_listen_directive with nginx_version
|
If this looks half way reasonable, I'll see about adding an extra test or two. |
bastelfreak
approved these changes
May 8, 2019
Nginx 1.16 has recently been released. Instead of updating the README to recommend users set the `add_listen_directive` parameter, this parameter has been replaced by an `nginx_version` parameter that defaults to the fact (if available). If the fact isn't available, it defaults to a very conservative `1.6.0` (the version that ships in Debian 8). Future enhancements could make the non-fact default be OS specific.
alexjfisher
commented
May 8, 2019
| @@ -24,6 +24,14 @@ | |||
| # node default { | |||
| # include nginx | |||
| # } | |||
| # | |||
| # @param nginx_version | |||
| # The version of nginx installed (or being installed). | |||
There was a problem hiding this comment.
language shameless borrowed from one of theforeman/puppet parameters ;)
alexjfisher
changed the title
add_listen_directive with nginx_versionadd_listen_directive with nginx_version
bastelfreak
reviewed
May 9, 2019
| # The version of nginx installed (or being installed). | ||
| # Unfortunately, different versions of nginx may need configuring | ||
| # differently. The default is derived from the version of nginx | ||
| # already installed. If the fact is unavailable, it defaults to '1.6.0'. |
There was a problem hiding this comment.
No, that wasn't a typo. See commit message or #1330 (comment) I wanted to pick a number < 1.15.0 and beyond that it didn't really matter what. Debian 8 is a supported OS that ships with 1.6.x, so that seemed as good as any other to go with.
Maybe in a separate PR you might want to implement some of
Future enhancements could make the non-fact default be OS specific.
bastelfreak
reviewed
May 9, 2019
| @@ -185,7 +193,7 @@ | |||
| Hash $nginx_upstreams = {}, | |||
| Nginx::UpstreamDefaults $nginx_upstreams_defaults = {}, | |||
| Boolean $purge_passenger_repo = true, | |||
| Boolean $add_listen_directive = $nginx::params::add_listen_directive, | |||
| String[1] $nginx_version = pick(fact('nginx_version'), '1.6.0'), | |||
Rubueno
pushed a commit
to Rubueno/puppet-nginx
that referenced
this pull request
Oct 19, 2020
Replace `add_listen_directive` with `nginx_version`
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.
Nginx 1.16 has recently been released. Instead of updating the README
to recommend users set the
add_listen_directiveparameter, thisparameter has been replaced by an
nginx_versionparameter thatdefaults to the fact (if available). If the fact isn't available, it
defaults to a very conservative
1.6.0(the version that ships in Debian8). Future enhancements could make the non-fact default be OS specific.