diff options
author | Micah Anderson <micah@leap.se> | 2014-04-04 10:37:09 -0400 |
---|---|---|
committer | Micah Anderson <micah@leap.se> | 2014-04-04 10:37:09 -0400 |
commit | 6af957a1c20f75a827655a3cd75e40a03cffe7c4 (patch) | |
tree | e5995b0c4b53583fd9d16857f66f81137dccbf73 /puppet/modules/site_couchdb/manifests/stunnel.pp | |
parent | 7451213d5e0772d0d6cba4613bf66792da495909 (diff) | |
parent | 1551f785c5c7c515781995928eec7659365d8988 (diff) |
Merge branch '0.5' into develop
Conflicts:
provider_base/services/tor.json
Change-Id: I826579945a0d93c43384f0fd12c9833762b084cf
Diffstat (limited to 'puppet/modules/site_couchdb/manifests/stunnel.pp')
-rw-r--r-- | puppet/modules/site_couchdb/manifests/stunnel.pp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/modules/site_couchdb/manifests/stunnel.pp b/puppet/modules/site_couchdb/manifests/stunnel.pp index 87c35f05..91f1e3aa 100644 --- a/puppet/modules/site_couchdb/manifests/stunnel.pp +++ b/puppet/modules/site_couchdb/manifests/stunnel.pp @@ -107,4 +107,6 @@ class site_couchdb::stunnel { } create_resources(site_stunnel::clients, $ednp_clients, $ednp_client_defaults) + + include site_check_mk::agent::stunnel } |