diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-04 15:31:04 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-04 15:31:04 -0400 |
| commit | c4397077adb35cf5ec05976e2918bacdd3960703 (patch) | |
| tree | 026ee5dae506136a45a14540fa1876924f64d0df | |
| parent | 5c44ec03fb9940d2801e6c7765084725656d1ce9 (diff) | |
pass $ca_name to stunnel::setup - this eliminates a dynamic scoped variable lookup, and warning
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/stunnel.pp | 1 | ||||
| -rw-r--r-- | puppet/modules/site_stunnel/manifests/setup.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/manifests/couchdb.pp | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/puppet/modules/site_couchdb/manifests/stunnel.pp b/puppet/modules/site_couchdb/manifests/stunnel.pp index ebd01e4e..d982013e 100644 --- a/puppet/modules/site_couchdb/manifests/stunnel.pp +++ b/puppet/modules/site_couchdb/manifests/stunnel.pp @@ -31,6 +31,7 @@ class site_couchdb::stunnel ($key, $cert, $ca) { cert_name => $cert_name, key => $key, cert => $cert, + ca_name => $ca_name, ca => $ca } diff --git a/puppet/modules/site_stunnel/manifests/setup.pp b/puppet/modules/site_stunnel/manifests/setup.pp index 7ec2378f..92eeb425 100644 --- a/puppet/modules/site_stunnel/manifests/setup.pp +++ b/puppet/modules/site_stunnel/manifests/setup.pp @@ -1,4 +1,4 @@ -class site_stunnel::setup ($cert_name, $key, $cert, $ca) { +class site_stunnel::setup ($cert_name, $key, $cert, $ca_name, $ca) { include site_stunnel diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp index e956fd54..8dfe6e12 100644 --- a/puppet/modules/site_webapp/manifests/couchdb.pp +++ b/puppet/modules/site_webapp/manifests/couchdb.pp @@ -48,6 +48,7 @@ class site_webapp::couchdb { cert_name => $cert_name, key => $key, cert => $cert, + ca_name => $ca_name ca => $ca } |