Adding resolver entries to streamhost.erb #1407
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
igalic
suggested changes
Aug 27, 2020
|
I have updated the PR description with details as to what this fixes. |
igalic
approved these changes
Aug 27, 2020
|
we should first merge #1398 |
|
or alternatively, this one #1408 |
alexjfisher
reviewed
Aug 29, 2020
alexjfisher
requested changes
Aug 29, 2020
|
Would you be able to add a test to spec/defines/resource_stream_spec.rb? |
alexjfisher
reviewed
Aug 29, 2020
templates/streamhost/streamhost.erb
Outdated
| @@ -18,7 +18,7 @@ server { | |||
| listen [<%= @ipv6_listen_ip %>]:<%= @ipv6_listen_port %> <% if @ipv6_listen_options %><%= @ipv6_listen_options %><% end %>; | |||
| <%- end -%> | |||
| <%- end -%> | |||
| <%- if Array(@resolver).count > 0 -%> | |||
| <%- unless @resolver.empty -%> | |||
| resolver <% Array(@resolver).each do |res| %> <%= res %><% end %>; | |||
There was a problem hiding this comment.
casting is redundant here too.
alexjfisher
reviewed
Aug 30, 2020
templates/streamhost/streamhost.erb
Outdated
| @@ -18,6 +18,9 @@ server { | |||
| listen [<%= @ipv6_listen_ip %>]:<%= @ipv6_listen_port %> <% if @ipv6_listen_options %><%= @ipv6_listen_options %><% end %>; | |||
| <%- end -%> | |||
| <%- end -%> | |||
| <%- unless @resolver.empty -%> | |||
There was a problem hiding this comment.
Sorry! There was a slight typo in what I told you.
Suggested change
| <%- unless @resolver.empty -%> | |
| <%- unless @resolver.empty? -%> |
There was a problem hiding this comment.
and that's why the tests are failing (and also why tests are great to have!) :)
ekohl
reviewed
Aug 30, 2020
spec/defines/resource_stream_spec.rb
Outdated
Comment on lines
107
to
108
| value: ['8.8.8.8', '8.8.4.4'], | ||
| match: %r{\s+resolver\s+8.8.8.8 8.8.4.4;} |
There was a problem hiding this comment.
I'm always a fan of using RFC5735 IPs.
| Name | Range |
|---|---|
| TEST-NET-1 | 192.0.2.0/24 |
| TEST-NET-2 | 198.51.100.0/24 |
| TEST-NET-3 | 203.0.113.0/24 |
There was a problem hiding this comment.
i can't believe no one's tried to abolish and sell these yet
…ts]-[SMK] [Correcting typo]-[SMK] [Removing redundant casting as requested]-[SMK] Co-authored-by: Alexander Fisher <alex@linfratech.co.uk> [Removing additional casting]-[SMK] [Adding tests for resolvers]-[SMK] [Correcting typo in the Template testing array is empty and changing IPs to RFC5735]-[SMK]
alexjfisher
approved these changes
Aug 30, 2020
|
@smkillen Thanks! |
|
No problem, thanks for the input and for accepting ;-)
…On Sun, 30 Aug 2020 at 17:41, Alexander Fisher ***@***.***> wrote:
@smkillen <https://github.com/smkillen> Thanks!
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#1407 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AD22QRY3KKDAL2QU4FOOEJTSDJ6KTANCNFSM4QNBIDAA>
.
|
Rubueno
pushed a commit
to Rubueno/puppet-nginx
that referenced
this pull request
Oct 19, 2020
Adding resolver entries to streamhost.erb
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.
Pull Request (PR) description
When declaring nginx::resource::streamhost, there is the ability to add a "resolver" option, but this is not actually honoured in the configuration, a section to test the existence of that Variable and define it in the configuration erb file is needed.
should create a file in /etc/nginx/conf.stream.d/XXX-test.conf
which contains
but currently does not, this code ensures this entry is present.
This Pull Request (PR) fixes the following issues
When declaring the parameter resolver as per
for a streamhost, nothing is actually configured.