Include ssl settings in rewrite_www server. #548
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
|
@joehillen this looks good. Could you please rebase? I've also added a comment that will address the test failure you experienced. Thanks! |
| @@ -2,6 +2,9 @@ | |||
| server { | |||
| listen <%= @listen_ip %>:<%= @ssl_port %> ssl; | |||
| server_name www.<%= @server_name[0].gsub(/^www\./, '') %>; | |||
|
|
|||
| <%= scope.function_template(["nginx/vhost/vhost_ssl_settings.erb"]) %> | |||
There was a problem hiding this comment.
Can you put this below the return 301 line? That should fix the test failure.
|
@3flex rebased and tests pass. |
3flex
added a commit
that referenced
this pull request
May 7, 2015
Include ssl settings in rewrite_www server.
slm0n87
pushed a commit
to slm0n87/puppet-nginx
that referenced
this pull request
Mar 7, 2019
Include ssl settings in rewrite_www server.
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.
fixes #542