diff options
| author | Kazuki Yamaguchi <k@rhe.jp> | 2015-11-13 09:36:36 +0900 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2015-11-13 09:36:36 +0900 |
| commit | 9eb9391cf7d632d3a71f026649f7b17bba289849 (patch) | |
| tree | 3ebe58b451652e65bc7cc3843cc49e7f7820f11d /lib/plum | |
| parent | 963925aed0bca245f390dbdffc6c5308b88bc683 (diff) | |
| download | plum-9eb9391cf7d632d3a71f026649f7b17bba289849.tar.gz | |
rack: tls_listener: pass certificate in filename
Diffstat (limited to 'lib/plum')
| -rw-r--r-- | lib/plum/rack/cli.rb | 4 | ||||
| -rw-r--r-- | lib/plum/rack/listener.rb | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/plum/rack/cli.rb b/lib/plum/rack/cli.rb index b145c59..a195db8 100644 --- a/lib/plum/rack/cli.rb +++ b/lib/plum/rack/cli.rb @@ -60,8 +60,8 @@ module Plum config[:listeners] << { listener: TLSListener, hostname: @options[:host] || "0.0.0.0", port: @options[:port] || 8080, - certificate: @options[:cert] && File.read(@options[:cert]), - certificate_key: @options[:cert] && File.read(@options[:key]) } + certificate: @options[:cert], + certificate_key: @options[:cert] && @options[:key] } end end diff --git a/lib/plum/rack/listener.rb b/lib/plum/rack/listener.rb index b479691..6543e7c 100644 --- a/lib/plum/rack/listener.rb +++ b/lib/plum/rack/listener.rb @@ -31,9 +31,11 @@ module Plum class TLSListener < BaseListener def initialize(lc) - cert, key = lc[:certificate], lc[:certificate_key] - unless cert && key - puts "WARNING: using dummy certificate" + if lc[:certificate] && lc[:certificate_key] + cert = File.read(lc[:certificate]) + key = File.read(lc[:certificate_key]) + else + STDERR.puts "WARNING: using dummy certificate" cert, key = dummy_key end |