diff options
| author | Micah Anderson <micah@riseup.net> | 2013-09-17 16:03:05 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-09-17 16:03:05 -0400 |
| commit | 45a9018f756830129b0acf59d165063edfbd72df (patch) | |
| tree | 2328e80b236fd474331e607dc334e1d24ec03cf6 | |
| parent | b6fbb5f013976f6ad1448ac744ae50b2b1aa0bd0 (diff) | |
Revert "include stunnel in stunnel::service (https://leap.se/code/issues/3861)"
This reverts commit b6fbb5f013976f6ad1448ac744ae50b2b1aa0bd0.
This removes some pieces of service.pp that shouldn't be removed
| -rw-r--r-- | manifests/service.pp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/manifests/service.pp b/manifests/service.pp index b041833..666826d 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -55,19 +55,20 @@ define stunnel::service ( $verify = false ) { - include stunnel - $real_client = $client ? { default => 'yes' } $real_pid = $pid ? { false => "/${name}.pid", default => $pid } - file { "/etc/stunnel/${name}.conf": - ensure => $ensure, - content => template('stunnel/service.conf.erb'), - require => File['/etc/stunnel'], - notify => Service[stunnel], - owner => root, - group => 0, - mode => '0600'; + $stunnel_compdir = "${::puppet_vardir}/stunnel4/configs" + + file { + "${stunnel_compdir}/${name}.conf": + ensure => $ensure, + content => template('stunnel/service.conf.erb'), + require => Package['stunnel'], + notify => Exec['refresh_stunnel'], + owner => root, + group => 0, + mode => '0600'; } if $use_nagios { |