diff options
| author | Micah Anderson <micah@leap.se> | 2014-04-22 14:13:46 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@leap.se> | 2014-04-22 14:13:46 -0400 |
| commit | 327d5c934e408f90011d7949b89ab01fed88998e (patch) | |
| tree | 77cfefffc8f9ffe160c4413b26dd5ca5cdd6f1e8 /puppet/modules/site_stunnel | |
| parent | ca11482dd7cd4ea8ffa69407ee2fd5b5e1b7981b (diff) | |
| parent | 4295f334ea4f92d7fb47f7121a42633630c368d1 (diff) | |
Merge branch 'develop' (0.5.0)
Conflicts:
.gitignore
Change-Id: I778f3e1f1f4832f5894bc149ead67e9a4becf304
Diffstat (limited to 'puppet/modules/site_stunnel')
| -rw-r--r-- | puppet/modules/site_stunnel/manifests/clients.pp | 9 | ||||
| -rw-r--r-- | puppet/modules/site_stunnel/manifests/setup.pp | 24 |
2 files changed, 8 insertions, 25 deletions
diff --git a/puppet/modules/site_stunnel/manifests/clients.pp b/puppet/modules/site_stunnel/manifests/clients.pp index ed766e1a..837665a3 100644 --- a/puppet/modules/site_stunnel/manifests/clients.pp +++ b/puppet/modules/site_stunnel/manifests/clients.pp @@ -21,6 +21,13 @@ define site_stunnel::clients ( verify => $verify, pid => "/var/run/stunnel4/${pid}.pid", rndfile => $rndfile, - debuglevel => $debuglevel + debuglevel => $debuglevel, + require => [ + Class['Site_config::X509::Key'], + Class['Site_config::X509::Cert'], + Class['Site_config::X509::Ca'] ]; + } + + include site_check_mk::agent::stunnel } diff --git a/puppet/modules/site_stunnel/manifests/setup.pp b/puppet/modules/site_stunnel/manifests/setup.pp deleted file mode 100644 index 92eeb425..00000000 --- a/puppet/modules/site_stunnel/manifests/setup.pp +++ /dev/null @@ -1,24 +0,0 @@ -class site_stunnel::setup ($cert_name, $key, $cert, $ca_name, $ca) { - - include site_stunnel - - x509::key { - $cert_name: - content => $key, - notify => Service['stunnel']; - } - - x509::cert { - $cert_name: - content => $cert, - notify => Service['stunnel']; - } - - x509::ca { - $ca_name: - content => $ca, - notify => Service['stunnel']; - } - -} - |