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

Added HTTPS_METHOD=nohttps to disable SSL site #590

Merged
merged 4 commits into from
Jan 13, 2017

Conversation

kamermans
Copy link
Contributor

This feature complements HTTPS_METHOD=nohttp, which disables the HTTP site. For containers with HTTPS_METHOD=nohttps set, the template sets is_https to false, which treats everything as if there was no matching certificate.

This solves issue #573, in which a user needs to disable the HTTPS site for a specific container with a subdomain that happens to match the SSL cert of another container.

A test has also been added to cover this directive.

@kachkaev
Copy link

@lange for now you can use this trick: CERT_NAME= (suggested by @wader). I struggled with the same problem just now and this worked for me like a charm!

@kamermans
Copy link
Contributor Author

@jwilder This build is failing because Travis-CI is running a newer version of Docker than the one specified in your .travis.yml. We will need to do one of the following:

  1. Add --force-yes to the apt-get command to force Travis to downgrade Docker to the version specified (currently 1.12.1-0~trusty)
  2. Change the required Docker version to a version that is available on Travis-CI without downgrading
  3. Be less specific and just accept whatever version of Docker is available in the testing environment

I think it would be best to do 1 and 2, where we figure out the latest version in Travis, pin that one in .travis.yml and add the --force-yes flag to prevent this from happening in the future.

Copy link
Collaborator

@jwilder jwilder left a comment

Choose a reason for hiding this comment

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

This looks good. Can you rebase since #649 has been merged?

@kamermans
Copy link
Contributor Author

Sure, I'll rebase and push today.

@jwilder jwilder merged commit 2c5d4ee into nginx-proxy:master Jan 13, 2017
@jwilder
Copy link
Collaborator

jwilder commented Jan 13, 2017

Thanks @kamermans!

thomasleveil added a commit to thomasleveil/nginx-proxy that referenced this pull request Jan 14, 2017
thomasleveil added a commit to thomasleveil/nginx-proxy that referenced this pull request Feb 6, 2017
thomasleveil added a commit to thomasleveil/nginx-proxy that referenced this pull request Feb 14, 2017
thomasleveil added a commit to thomasleveil/nginx-proxy that referenced this pull request Feb 16, 2017
@kamermans kamermans deleted the feature_nohttps branch November 9, 2017 04:37
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.

None yet

3 participants