projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed tests
[arvados.git]
/
services
/
api
/
script
/
rails
diff --git
a/services/api/script/rails
b/services/api/script/rails
index 7c4ec52dfc8d73edea1a1274a55de13dbe0d055b..2167b0431882ef9eeef5acd733dc3b03312c6f34 100755
(executable)
--- a/
services/api/script/rails
+++ b/
services/api/script/rails
@@
-13,7
+13,7
@@
module Rails
class Server < ::Rack::Server
def default_options
super.merge({
class Server < ::Rack::Server
def default_options
super.merge({
- :Port => 300
0
,
+ :Port => 300
1
,
:environment => (ENV['RAILS_ENV'] || "development").dup,
:daemonize => false,
:debugger => false,
:environment => (ENV['RAILS_ENV'] || "development").dup,
:daemonize => false,
:debugger => false,
@@
-21,10
+21,6
@@
module Rails
:config => File.expand_path("config.ru"),
:SSLEnable => true,
:SSLVerifyClient => OpenSSL::SSL::VERIFY_NONE,
:config => File.expand_path("config.ru"),
:SSLEnable => true,
:SSLVerifyClient => OpenSSL::SSL::VERIFY_NONE,
- :SSLPrivateKey => OpenSSL::PKey::RSA.new(
- File.open("config/api.clinicalfuture.com.key.pem").read),
- :SSLCertificate => OpenSSL::X509::Certificate.new(
- File.open("config/api.clinicalfuture.com.crt.pem").read),
:SSLCertName => [["CN", WEBrick::Utils::getservername]]
})
end
:SSLCertName => [["CN", WEBrick::Utils::getservername]]
})
end