Merge branch 'master' into 3118-docker-fixes

[arvados.git] / services / api / script / rails

diff --git a/services/api/script/rails b/services/api/script/rails
index 88627f559de4d507b3fac87c53c4aab111a235ec..04550e826c8422f1fab3c1ba56b634e1a0f18fbc 100755 (executable)
--- a/services/api/script/rails
+++ b/services/api/script/rails
@@ -21,15 +21,11 @@ module Rails
                 :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]]
+                :SSLCertName => [["CN", "#{WEBrick::Utils::getservername} #{Time.now().to_s}"]]
             })
         end
     end
-end 
+end
 ######### /SSL