-
Notifications
You must be signed in to change notification settings - Fork 230
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
Add option to disable SSL in Jetty #52
Add option to disable SSL in Jetty #52
Conversation
This patch introduces the optional parameter $disable_ssl, which defaults to false. If set to true, the settings ssl-host and ssl-port are completely removed from the Jetty section of the PuppetDB config files. This disables serving of HTTPS requests by PuppetDB, which can be useful when SSL handling is offloaded to a reverse proxy server like Apache or Nginx, as suggested in the PuppetDB documentation (see http://docs.puppetlabs.com/puppetdb/1.2/connect_puppet_apply.html#option-a-set-up-an-ssl-proxy-for-puppetdb).
|
@christianberg thanks for contributing ... This will need a rebase however. |
|
Hi Ken, thanks for your feedback! I meant to add tests, but held back because there I'll add tests and update my pull request. Christian On Tue, Apr 9, 2013 at 2:37 PM, Ken Barber notifications@github.com wrote:
|
|
@christianberg this needs a rebase now I've merged in the tests. Looking good though. I'm not sure if travis reinits the tests again on an open PR, try and do a force push and we'll see what happens. |
|
It should merge cleanly with the other branch, but I'll push again to Am Mittwoch, 10. April 2013 schrieb Ken Barber :
|
|
@christianberg nah it won't merge without a rebase, look at the github error "This pull request cannot be automatically merged.". I think its because your PR had the other commits now already committed? |
|
Sorry, I wasn't at my computer when I made that claim. :-) It merged cleanly when I tested it locally yesterday, but I guess that was before I made that trailing comma fix. Tests are green now. |
|
@christianberg there is 1 more thing, can you add the docs for this new param to the README.md as well? |
|
Of course, done! |
…sable_ssl Add option to disable SSL in Jetty
This patch introduces the optional parameter $disable_ssl, which
defaults to false. If set to true, the settings ssl-host and ssl-port
are completely removed from the Jetty section of the PuppetDB config
files.
This disables serving of HTTPS requests by PuppetDB, which can be useful
when SSL handling is offloaded to a reverse proxy server like Apache or
Nginx, as suggested in the PuppetDB documentation (see
http://docs.puppetlabs.com/puppetdb/1.2/connect_puppet_apply.html#option-a-set-up-an-ssl-proxy-for-puppetdb).