From 25cdee309d4ad749d633c8b4d5bf7e65f83fb75b Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 14 Jun 2016 12:37:10 -0400 Subject: make sure required x509 bits are there before stunnel is started Change-Id: I772c3b6e489e3c1848c45c6bcaa240324fc88928 --- puppet/modules/site_stunnel/manifests/client.pp | 6 +++++- puppet/modules/site_stunnel/manifests/servers.pp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'puppet/modules/site_stunnel') 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 -- cgit v1.2.3 From 8532c9656eba93a10601421089502e39aa23b753 Mon Sep 17 00:00:00 2001 From: Micah Date: Tue, 14 Jun 2016 12:51:08 -0400 Subject: switch to two-space soft tabs to fix lint error Change-Id: Ic12b243b195e40482a70dd70219212c3697899ba --- puppet/modules/site_stunnel/manifests/client.pp | 7 +++---- puppet/modules/site_stunnel/manifests/servers.pp | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'puppet/modules/site_stunnel') diff --git a/puppet/modules/site_stunnel/manifests/client.pp b/puppet/modules/site_stunnel/manifests/client.pp index de9febd4..7c431c50 100644 --- a/puppet/modules/site_stunnel/manifests/client.pp +++ b/puppet/modules/site_stunnel/manifests/client.pp @@ -40,10 +40,9 @@ define site_stunnel::client ( sslversion => 'TLSv1', syslog => 'no', output => $logfile, - require => [ - Class['Site_config::X509::Key'], - Class['Site_config::X509::Cert'], - Class['Site_config::X509::Ca'] ]; + 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 3dc5dce6..37aaf5a6 100644 --- a/puppet/modules/site_stunnel/manifests/servers.pp +++ b/puppet/modules/site_stunnel/manifests/servers.pp @@ -40,10 +40,9 @@ define site_stunnel::servers ( sslversion => 'TLSv1', syslog => 'no', output => $logfile, - require => [ - Class['Site_config::X509::Key'], - Class['Site_config::X509::Cert'], - Class['Site_config::X509::Ca'] ]; + require => [ Class['Site_config::X509::Key'], + Class['Site_config::X509::Cert'], + Class['Site_config::X509::Ca'] ]; } # allow incoming connections on $accept_port -- cgit v1.2.3