summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah <micah@leap.se>2016-06-14 12:37:10 -0400
committerMicah <micah@leap.se>2016-06-16 14:41:58 -0400
commit25cdee309d4ad749d633c8b4d5bf7e65f83fb75b (patch)
tree039657e7909f9daac9420dca93ddc4c0c3722584
parent4a9be045411e43534df0aec4289d64f4129c52d2 (diff)
make sure required x509 bits are there before stunnel is started
Change-Id: I772c3b6e489e3c1848c45c6bcaa240324fc88928
-rw-r--r--puppet/modules/site_stunnel/manifests/client.pp6
-rw-r--r--puppet/modules/site_stunnel/manifests/servers.pp6
m---------puppet/modules/stunnel0
3 files changed, 10 insertions, 2 deletions
diff --git a/puppet/modules/site_stunnel/manifests/client.pp b/puppet/modules/site_stunnel/manifests/client.pp
index c9e034f1..de9febd4 100644
--- a/puppet/modules/site_stunnel/manifests/client.pp
+++ b/puppet/modules/site_stunnel/manifests/client.pp
@@ -39,7 +39,11 @@ define site_stunnel::client (
debuglevel => $debuglevel,
sslversion => 'TLSv1',
syslog => 'no',
- output => $logfile;
+ output => $logfile,
+ require => [
+ Class['Site_config::X509::Key'],
+ Class['Site_config::X509::Cert'],
+ Class['Site_config::X509::Ca'] ];
}
# define the log files so that we can purge the
diff --git a/puppet/modules/site_stunnel/manifests/servers.pp b/puppet/modules/site_stunnel/manifests/servers.pp
index e76d1e9d..3dc5dce6 100644
--- a/puppet/modules/site_stunnel/manifests/servers.pp
+++ b/puppet/modules/site_stunnel/manifests/servers.pp
@@ -39,7 +39,11 @@ define site_stunnel::servers (
debuglevel => $debuglevel,
sslversion => 'TLSv1',
syslog => 'no',
- output => $logfile;
+ output => $logfile,
+ require => [
+ Class['Site_config::X509::Key'],
+ Class['Site_config::X509::Cert'],
+ Class['Site_config::X509::Ca'] ];
}
# allow incoming connections on $accept_port
diff --git a/puppet/modules/stunnel b/puppet/modules/stunnel
-Subproject 4056d79a2e07b7178cbbdb1576aa6f5ccd1d9e8
+Subproject 523612fb6daff51837423619f5014e62dc83555