--- Exec[sslcert generate zookeeper_zuul_keystore.p12].orig
+++ Exec[sslcert generate zookeeper_zuul_keystore.p12]
@@
- command => /usr/bin/openssl pkcs12 -export -certfile /etc/zookeeper/zuul-tls/zuul_full_chain.pem -in /etc/zookeeper/zuul-tls/zuul__zookeeper.chained.pem -inkey /etc/zookeeper/zuul-tls/zuul__zookeeper-key.pem -out /etc/zookeeper/zuul-tls/zookeeper_zuul.keystore.p12 -password 'pass:snakeoil'
+ command => /usr/bin/openssl pkcs12 -export -in /etc/ssl/localcerts/zookeeper_zuul_keystore.crt -inkey /etc/ssl/private/zookeeper_zuul_keystore.key -out /etc/zookeeper/zuul-tls/zookeeper_zuul.keystore.p12 -password 'pass:snakeoil'
@@
- unless => /usr/bin/test "$(/usr/bin/openssl x509 -in /etc/zookeeper/zuul-tls/zuul__zookeeper.chained.pem)" == "$(/usr/bin/openssl pkcs12 -password 'pass:snakeoil' -in /etc/zookeeper/zuul-tls/zookeeper_zuul.keystore.p12 -clcerts -nokeys | openssl x509)"
+ unless => /usr/bin/test "$(/usr/bin/openssl x509 -in /etc/ssl/localcerts/zookeeper_zuul_keystore.crt)" == "$(/usr/bin/openssl pkcs12 -password 'pass:snakeoil' -in /etc/zookeeper/zuul-tls/zookeeper_zuul.keystore.p12 -clcerts -nokeys | openssl x509)"
Sslcert::X509_to_pkcs12[zookeeper_zuul_keystore]
- Parameters differences:
--- Sslcert::X509_to_pkcs12[zookeeper_zuul_keystore].orig
+++ Sslcert::X509_to_pkcs12[zookeeper_zuul_keystore]
- require => Concat[/etc/zookeeper/zuul-tls/zuul_full_chain.pem]
- certfile => /etc/zookeeper/zuul-tls/zuul_full_chain.pem
@@
- private_key => /etc/zookeeper/zuul-tls/zuul__zookeeper-key.pem
+ private_key => /etc/ssl/private/zookeeper_zuul_keystore.key
@@
- public_key => /etc/zookeeper/zuul-tls/zuul__zookeeper.chained.pem
+ public_key => /etc/ssl/localcerts/zookeeper_zuul_keystore.crt