Update templates to use better vars

dggreenbaum · Dec 26, 2016 · 3ffb40a · 3ffb40a
1 parent 6004f17
commit 3ffb40a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/templates/ca-chain.cert.pem.j2 b/templates/ca-chain.cert.pem.j2
@@ -1,2 +1,2 @@
-{{ lookup('file', openssl_pki_certs_ca_root_dir+'/ca/'+openssl_pki_intermediate_ca_name+'/certs/'+openssl_pki_intermediate_ca_name+'.cert.pem') }}
-{{ lookup('file', openssl_pki_certs_ca_root_dir+'/ca/certs/ca.cert.pem') }}
+{{ lookup('file', openssl_pki_intermediate_cert) }}
+{{ lookup('file', openssl_pki_ca_cert) }}
diff --git a/templates/intermediate_openssl.cnf.j2 b/templates/intermediate_openssl.cnf.j2
@@ -4,7 +4,7 @@ default_ca = CA_default
 
 [ CA_default ]
 # Directory and file locations.
-dir               = {{ openssl_pki_certs_ca_root_dir }}/ca/{{ openssl_pki_intermediate_ca_name }}
+dir               = {{ openssl_pki_intermediate_ca_path }}
 certs             = $dir/certs
 crl_dir           = $dir/crl
 new_certs_dir     = $dir/newcerts

diff --git a/templates/root_openssl.cnf.j2 b/templates/root_openssl.cnf.j2
@@ -4,7 +4,7 @@ default_ca = CA_default
 
 [ CA_default ]
 # Directory and file locations.
-dir               = {{ openssl_pki_certs_ca_root_dir }}/ca
+dir               = {{ openssl_pki_ca_path }}
 certs             = $dir/certs
 crl_dir           = $dir/crl
 new_certs_dir     = $dir/newcerts