diff options
| author | Micah Anderson <micah@riseup.net> | 2013-04-03 14:36:04 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-04-03 14:36:04 -0400 |
| commit | 38ce9a5950f1aadfb8b844c2ba4d280b06456489 (patch) | |
| tree | 134fddead133ab7442afbcc8a6cba624ddb6a488 /manifests/init.pp | |
| parent | 95f55b7586e850fc9d31fc08a86a5bf25a7abb37 (diff) | |
| parent | 74fe8e6a586bec3b04a7b51beb4ed2f8fbc27e03 (diff) | |
Merge remote-tracking branch 'leap/master' into riseup
Conflicts:
manifests/centos.pp
manifests/init.pp
manifests/linux.pp
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index d0d67c9..b2018a5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -17,23 +17,12 @@ # TODO: warn on cert/key issues, fail on false accept? -class stunnel( - $cluster = '', - $ensure_version = 'present', - $startboot = '1', - $default_extra = '', - $nagios_stunnel_procs = false -) { +class stunnel ( $ensure_version = 'present', $startboot = '1', $default_extra, $cluster = '' ) +{ case $::operatingsystem { - debian: { include stunnel::debian } - centos: { include stunnel::centos } - default: { include stunnel::default } - } - - if $nagios_stunnel_procs { - nagios::service { "stunnel": - check_command => "nagios-stat-proc!/usr/bin/stunnel4!6!5!proc"; - } + debian: { class { 'stunnel::debian': } } + centos: { class { 'stunnel::centos': } } + default: { class { 'stunnel::default': } } } } |