diff options
| author | varac <varacanero@zeromail.org> | 2013-09-06 17:37:03 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-09-13 14:43:25 +0200 |
| commit | fcbf7c0b4df14149269b646b5ac8e66acd63647e (patch) | |
| tree | 6ff07f2f0aa685a166b58f0e1f07035bbc85c7b8 | |
| parent | d6682ddd8566292571daf6004265f3b38f054cd8 (diff) | |
use define instead of class for site_stunnel::setup (#3817)
so it can be called multiple times
| -rw-r--r-- | puppet/modules/site_couchdb/manifests/stunnel.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/site_mx/manifests/couchdb.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/site_stunnel/manifests/setup.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/manifests/couchdb.pp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/puppet/modules/site_couchdb/manifests/stunnel.pp b/puppet/modules/site_couchdb/manifests/stunnel.pp index d982013e..481da279 100644 --- a/puppet/modules/site_couchdb/manifests/stunnel.pp +++ b/puppet/modules/site_couchdb/manifests/stunnel.pp @@ -27,7 +27,7 @@ class site_couchdb::stunnel ($key, $cert, $ca) { # basic setup: ensure cert, key, ca files are in place, and some generic # stunnel things are done - class { 'site_stunnel::setup': + site_stunnel::setup { 'couchdb_couchdb': cert_name => $cert_name, key => $key, cert => $cert, diff --git a/puppet/modules/site_mx/manifests/couchdb.pp b/puppet/modules/site_mx/manifests/couchdb.pp index f842ceab..85db7327 100644 --- a/puppet/modules/site_mx/manifests/couchdb.pp +++ b/puppet/modules/site_mx/manifests/couchdb.pp @@ -15,7 +15,7 @@ class site_mx::couchdb { $cert_path = "${x509::variables::certs}/${cert_name}.crt" $key_path = "${x509::variables::keys}/${cert_name}.key" - class { 'site_stunnel::setup': + site_stunnel::setup {'mx_couchdb': cert_name => $cert_name, key => $key, cert => $cert, diff --git a/puppet/modules/site_stunnel/manifests/setup.pp b/puppet/modules/site_stunnel/manifests/setup.pp index 92eeb425..7fd18d47 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_name, $ca) { +define 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 ac01a5bc..4bafc7f3 100644 --- a/puppet/modules/site_webapp/manifests/couchdb.pp +++ b/puppet/modules/site_webapp/manifests/couchdb.pp @@ -60,7 +60,7 @@ class site_webapp::couchdb { mode => '0744'; } - class { 'site_stunnel::setup': + site_stunnel::setup { 'webapp_couchdb': cert_name => $cert_name, key => $key, cert => $cert, |