diff options
| author | varac <varacanero@zeromail.org> | 2013-03-19 15:14:35 +0100 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-02 10:21:05 -0400 |
| commit | 4669a64cb8e63a67825a35513b51b4e1f2a4ec5d (patch) | |
| tree | e999b93c1be8cfb440958366439dcc41990cd806 /puppet/modules/site_stunnel | |
| parent | 4b2aa1020d07d0ab25f907fbc6c76a3d78a6a84e (diff) | |
moving generic stunnel config from site_webapp to site_stunnel now working
Diffstat (limited to 'puppet/modules/site_stunnel')
| -rw-r--r-- | puppet/modules/site_stunnel/manifests/clients.pp | 31 | ||||
| -rw-r--r-- | puppet/modules/site_stunnel/manifests/setup.pp | 6 |
2 files changed, 12 insertions, 25 deletions
diff --git a/puppet/modules/site_stunnel/manifests/clients.pp b/puppet/modules/site_stunnel/manifests/clients.pp index 28ed6d3c..9f8aeaff 100644 --- a/puppet/modules/site_stunnel/manifests/clients.pp +++ b/puppet/modules/site_stunnel/manifests/clients.pp @@ -10,23 +10,16 @@ define site_stunnel::clients ( $rndfile = '/var/lib/stunnel4/.rnd', $debuglevel = '4' ) { - $couchdb_stunnel_client_defaults = { - 'cafile' => $ca_path, - 'key' => $key_path, - 'cert' => $cert_path, - } - - - stunnel::service { $name: - accept => "127.0.0.1:${accept_port}", - connect => "${connect}:6984", - client => $client, - cafile => $cafile, - key => $key, - cert => $cert, - verify => $verify, - pid => "/var/run/stunnel4/${pid}.pid", - rndfile => $rndfile, - debuglevel => $debuglevel - } + stunnel::service { $name: + accept => "127.0.0.1:${accept_port}", + connect => "${connect}:6984", + client => $client, + cafile => $cafile, + key => $key, + cert => $cert, + verify => $verify, + pid => "/var/run/stunnel4/${pid}.pid", + rndfile => $rndfile, + debuglevel => $debuglevel } +} diff --git a/puppet/modules/site_stunnel/manifests/setup.pp b/puppet/modules/site_stunnel/manifests/setup.pp index a6384a6e..7ec2378f 100644 --- a/puppet/modules/site_stunnel/manifests/setup.pp +++ b/puppet/modules/site_stunnel/manifests/setup.pp @@ -1,13 +1,7 @@ class site_stunnel::setup ($cert_name, $key, $cert, $ca) { - include x509::variables include site_stunnel - $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" - x509::key { $cert_name: content => $key, |