diff options
| author | Azul <azul@leap.se> | 2013-01-31 20:35:20 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-01-31 20:35:20 +0100 |
| commit | eae48e6d7ac052991560510b06e7c7ab78a201fe (patch) | |
| tree | 0f6430301ee079bf04703eb643d2c2ffb2ba9ef7 | |
| parent | 1bef299f60d742abb3a1b1db7fb6e6021f11ece2 (diff) | |
config key is not ca_cert_path anymore - client_ca_cert
| -rw-r--r-- | certs/app/models/client_certificate.rb | 4 | ||||
| -rw-r--r-- | config/defaults.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/certs/app/models/client_certificate.rb b/certs/app/models/client_certificate.rb index b2b8c0d..9cde820 100644 --- a/certs/app/models/client_certificate.rb +++ b/certs/app/models/client_certificate.rb @@ -43,8 +43,8 @@ class ClientCertificate def self.root_ca @root_ca ||= begin - crt = File.read(APP_CONFIG[:ca_cert_path]) - key = File.read(APP_CONFIG[:ca_key_path]) + crt = File.read(APP_CONFIG[:client_ca_cert]) + key = File.read(APP_CONFIG[:client_ca_key]) openssl_cert = OpenSSL::X509::Certificate.new(crt) cert = CertificateAuthority::Certificate.from_openssl(openssl_cert) cert.key_material.private_key = OpenSSL::PKey::RSA.new(key, APP_CONFIG[:ca_key_password]) diff --git a/config/defaults.yml b/config/defaults.yml index f5a7c07..cb8a627 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -1,7 +1,7 @@ dev_ca: &dev_ca - ca_key_path: "./certs/test/files/ca.key" + client_ca_key: "./certs/test/files/ca.key" + client_ca_cert: "./certs/test/files/ca.crt" ca_key_password: nil - ca_cert_path: "./certs/test/files/ca.crt" cert_options: &cert_options client_cert_lifespan: 2 |