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.

Sign up for GitHub

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

Jump to bottom

Support passing JRuby keystore info in ssl_bind DSL #837

Merged
merged 2 commits into from Jan 28, 2016
Merged

Support passing JRuby keystore info in ssl_bind DSL #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c28b48f
Support passing JRuby keystore info in ssl_bind DSL
YurySolovyov Dec 1, 2015
048a590
Add additional JRuby keys explanation to config example
YurySolovyov Dec 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion examples/config.rb
View file
Open in desktop
Expand Up @@ -79,7 +79,13 @@
# Instead of "bind 'ssl://127.0.0.1:9292?key=path_to_key&cert=path_to_cert'" you
# can also use the "ssl_bind" option.
#
# ssl_bind '127.0.0.1', '9292', { key: path_to_key, cert: path_to_cert }
# ssl_bind '127.0.0.1', '9292', {
# key: path_to_key,
# cert: path_to_cert
# }
# for JRuby additional keys are required:
# keystore: path_to_keystore,
# keystore_pass: password

# Code to run before doing a restart. This code should
# close log files, database connections, etc.
Expand Down
7 changes: 6 additions & 1 deletion lib/puma/dsl.rb
View file
Open in desktop
Expand Up @@ -140,7 +140,12 @@ def threads(min, max)
end

def ssl_bind(host, port, opts)
@options[:binds] << "ssl://#{host}:#{port}?cert=#{opts[:cert]}&key=#{opts[:key]}"
if defined?(JRUBY_VERSION)
keystore_additions = "keystore=#{opts[:keystore]}&keystore-pass=#{opts[:keystore_pass]}"
@options[:binds] << "ssl://#{host}:#{port}?cert=#{opts[:cert]}&key=#{opts[:key]}&#{keystore_additions}"
else
@options[:binds] << "ssl://#{host}:#{port}?cert=#{opts[:cert]}&key=#{opts[:key]}"
end
end

# Use +path+ as the file to store the server info state. This is
Expand Down