Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the correct ssl port for bookshelf and pedant when it's not default #637

Closed
wants to merge 1 commit into from

Conversation

marcparadise
Copy link
Member

  1. Update erchef's s3_url to properly reflect the ssl port in use
  2. Similarly update pedant's api_url.

Addresses #50

@marcparadise marcparadise changed the title Use the correct non-ssl port for bookshelf and pedant when it's not default Use the correct ssl port for bookshelf and pedant when it's not default Nov 20, 2015
@@ -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)}"%>"},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this will be incorrect for people who have configured their Chef Server to point at AWS?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we use s3_external_url for thecase but I will confirm.

I'll look into both though , to be sure.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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).

@marcparadise marcparadise deleted the mp/chef-server-50 branch February 19, 2016 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants