diff options
| author | elijah <elijah@riseup.net> | 2014-06-20 14:34:53 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2014-06-25 18:17:31 -0700 |
| commit | bc42e9bd3a86bb858ef853cf333242c81874209b (patch) | |
| tree | 023baebd5c1f700b14e8cd586c45741995c70fe4 /puppet/modules/site_mx | |
| parent | a8f6415b0869018fd8d4ac947814529e8e85ace2 (diff) | |
stunnel: make site_mx and site_webapp use new site_stunnel
Diffstat (limited to 'puppet/modules/site_mx')
| -rw-r--r-- | puppet/modules/site_mx/manifests/couchdb.pp | 23 | ||||
| -rw-r--r-- | puppet/modules/site_mx/manifests/init.pp | 2 |
2 files changed, 1 insertions, 24 deletions
diff --git a/puppet/modules/site_mx/manifests/couchdb.pp b/puppet/modules/site_mx/manifests/couchdb.pp deleted file mode 100644 index b1f3bd02..00000000 --- a/puppet/modules/site_mx/manifests/couchdb.pp +++ /dev/null @@ -1,23 +0,0 @@ -class site_mx::couchdb { - - $stunnel = hiera('stunnel') - $couch_client = $stunnel['couch_client'] - $couch_client_connect = $couch_client['connect'] - - include x509::variables - $ca_path = "${x509::variables::local_CAs}/${site_config::params::ca_name}.crt" - $cert_path = "${x509::variables::certs}/${site_config::params::cert_name}.crt" - $key_path = "${x509::variables::keys}/${site_config::params::cert_name}.key" - - include site_stunnel - - $couchdb_stunnel_client_defaults = { - 'connect_port' => $couch_client_connect, - 'client' => true, - 'cafile' => $ca_path, - 'key' => $key_path, - 'cert' => $cert_path, - } - - create_resources(site_stunnel::clients, $couch_client, $couchdb_stunnel_client_defaults) -} diff --git a/puppet/modules/site_mx/manifests/init.pp b/puppet/modules/site_mx/manifests/init.pp index c3d38a46..91014ed6 100644 --- a/puppet/modules/site_mx/manifests/init.pp +++ b/puppet/modules/site_mx/manifests/init.pp @@ -8,12 +8,12 @@ class site_mx { include site_config::x509::client_ca::ca include site_config::x509::client_ca::key + include site_stunnel include site_postfix::mx include site_haproxy include site_shorewall::mx include site_shorewall::service::smtp - include site_mx::couchdb include leap_mx include site_check_mk::agent::mx } |