diff options
| author | varac <varacanero@zeromail.org> | 2013-09-17 16:43:20 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2013-09-17 16:43:20 +0200 |
| commit | 5f87fcd074480cdc448e23cb78386377cc19e90b (patch) | |
| tree | 5dc28b574d01d5cb07f06640d142abf8da99dac0 /puppet/modules/site_webapp | |
| parent | 70284fd0e786ad838fbbd40c816f6c0d01cc1629 (diff) | |
| parent | 3e5e685200e9b5c3ac8567100e552929ea55d8e8 (diff) | |
Merge branch 'feature/3817_3836_3837_Duplicate_declarations' into develop
Diffstat (limited to 'puppet/modules/site_webapp')
| -rw-r--r-- | puppet/modules/site_webapp/manifests/couchdb.pp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp index ac01a5bc..f9a4eb6b 100644 --- a/puppet/modules/site_webapp/manifests/couchdb.pp +++ b/puppet/modules/site_webapp/manifests/couchdb.pp @@ -60,13 +60,7 @@ class site_webapp::couchdb { mode => '0744'; } - class { 'site_stunnel::setup': - cert_name => $cert_name, - key => $key, - cert => $cert, - ca_name => $ca_name, - ca => $ca - } + include site_stunnel exec { 'migrate_design_documents': cwd => '/srv/leap/webapp', |