Use the correct ssl port for bookshelf and pedant when it's not default #637
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
marcparadise
changed the title
| @@ -206,7 +206,7 @@ | |||
| {chef_objects, [ | |||
| {s3_access_key_id, "<%= node['private_chef']['bookshelf']['access_key_id'] %>"}, | |||
| {s3_secret_key_id, "<%= node['private_chef']['bookshelf']['secret_access_key'] %>"}, | |||
| {s3_url, "<%= node['private_chef']['nginx']['x_forwarded_proto'] %>://<%= @helper.vip_for_uri('bookshelf') %>"}, | |||
| {s3_url, "<%= "#{@s3_proto}://#{@helper.vip_for_uri('bookshelf')}:#{NginxErb.new(node).port_for_proto(@s3_proto)}"%>"}, | |||
There was a problem hiding this comment.
I think this will be incorrect for people who have configured their Chef Server to point at AWS?
There was a problem hiding this comment.
Also, but less likely, it would break in cases where the frontends have been reconfigured to listen on a non-standard port, but the backend is still in the default configuration.
There was a problem hiding this comment.
I think we use s3_external_url for thecase but I will confirm.
I'll look into both though , to be sure.
There was a problem hiding this comment.
I think s3_external_url is the url we use to construct s3 links while s3_url is the url used to talk to s3 (for instance, HEAD requests to confirm files are there).
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.
s3_urlto properly reflect the ssl port in useapi_url.Addresses #50