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

Don't check private key/certificate if REST API and web interface on same port #3231

Merged
merged 1 commit into from Dec 22, 2016

Conversation

Projects
None yet
2 participants
@joschi
Contributor

joschi commented Dec 21, 2016

While this PR doesn't resolve all problems of the referenced issue, it will enable users to run the Graylog REST API and the web interface on the same port with HTTPS if rest_enable_tls and web_enable_tls are set to true.

All other corner cases should be addressed by revamping the whole HTTP listener configuration in the next Graylog major release.

Closes #2810

@joschi joschi added this to the 2.2.0 milestone Dec 21, 2016

@joschi joschi force-pushed the issue-2810 branch from 0c7a17d to 74adc5b Dec 21, 2016

@bernd

bernd approved these changes Dec 22, 2016

LGTM 👍

@bernd bernd merged commit 7851520 into master Dec 22, 2016

4 checks passed

ci-web-linter Jenkins build graylog-pr-linter-check 1194 has succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
licence/cla Contributor License Agreement is signed.
Details

@bernd bernd deleted the issue-2810 branch Dec 22, 2016

@bernd bernd removed the ready-for-review label Dec 22, 2016

@bernd bernd self-assigned this Dec 22, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment