summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-03-17 22:58:10 -0400
committerMicah Anderson <micah@riseup.net>2013-03-17 22:58:10 -0400
commit6609b3ed4125d1e46ba16b5bc7d7957bcbee6a42 (patch)
tree36bc505b2e54a20ebb32b75327fc047cdbe95d6a
parentad62cfdad04c8f8ed9d6454f716c92e850ac53ba (diff)
fix webapp/couchdb stunnel certificate authority
-rw-r--r--puppet/modules/site_couchdb/manifests/stunnel.pp7
-rw-r--r--puppet/modules/site_webapp/manifests/couchdb_stunnel.pp7
2 files changed, 8 insertions, 6 deletions
diff --git a/puppet/modules/site_couchdb/manifests/stunnel.pp b/puppet/modules/site_couchdb/manifests/stunnel.pp
index b4635951..1afe25a4 100644
--- a/puppet/modules/site_couchdb/manifests/stunnel.pp
+++ b/puppet/modules/site_couchdb/manifests/stunnel.pp
@@ -4,9 +4,10 @@ class site_couchdb::stunnel ($key, $cert, $ca) {
include site_stunnel
$cert_name = 'leap_couchdb'
- $ca_path = "${x509::variables::certs}/leap_client_ca.crt"
+ $ca_name = 'leap_ca'
+ $ca_path = "${x509::variables::local_CAs}/${ca_name}.crt"
$cert_path = "${x509::variables::certs}/${cert_name}.crt"
- $key_path = "${x509::variables::keys}/${cert_name}.key"
+ $key_path = "${x509::variables::keys}/${cert_name}.key"
x509::key {
$cert_name:
@@ -21,7 +22,7 @@ class site_couchdb::stunnel ($key, $cert, $ca) {
}
x509::ca {
- $cert_name:
+ $ca_name:
content => $ca,
notify => Service['stunnel'];
}
diff --git a/puppet/modules/site_webapp/manifests/couchdb_stunnel.pp b/puppet/modules/site_webapp/manifests/couchdb_stunnel.pp
index e6657e13..325b18ee 100644
--- a/puppet/modules/site_webapp/manifests/couchdb_stunnel.pp
+++ b/puppet/modules/site_webapp/manifests/couchdb_stunnel.pp
@@ -4,9 +4,10 @@ class site_webapp::couchdb_stunnel ($key, $cert, $ca) {
include site_stunnel
$cert_name = 'leap_couchdb'
- $ca_path = "${x509::variables::certs}/leap_client_ca.crt"
+ $ca_name = 'leap_ca'
+ $ca_path = "${x509::variables::local_CAs}/${ca_name}.crt"
$cert_path = "${x509::variables::certs}/${cert_name}.crt"
- $key_path = "${x509::variables::keys}/${cert_name}.key"
+ $key_path = "${x509::variables::keys}/${cert_name}.key"
x509::key {
$cert_name:
@@ -21,7 +22,7 @@ class site_webapp::couchdb_stunnel ($key, $cert, $ca) {
}
x509::ca {
- $cert_name:
+ $ca_name:
content => $ca,
notify => Service['stunnel'];
}