diff options
author | Matt Taggart <taggart@riseup.net> | 2015-05-12 10:43:56 -0700 |
---|---|---|
committer | Matt Taggart <taggart@riseup.net> | 2015-05-12 10:43:56 -0700 |
commit | bcde059a9b1e95d72f6622604837b85496a5f75a (patch) | |
tree | c0a6f72732eb75a9fc3ba316e789c7d8bcfbd7fe /manifests/service.pp | |
parent | f5f3bca062ea6af44f9b8eb654d3b532a3f758cc (diff) | |
parent | 9930649228a509eda998699e213ed458685763f0 (diff) |
Merge branch 'master' of gitlab.com:shared-puppet-modules-group/check_mk
Conflicts:
manifests/agent/generate_sshkey.pp
Diffstat (limited to 'manifests/service.pp')
-rw-r--r-- | manifests/service.pp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/manifests/service.pp b/manifests/service.pp index de0cbdb..36fb2d1 100644 --- a/manifests/service.pp +++ b/manifests/service.pp @@ -6,6 +6,7 @@ class check_mk::service { enable => true, } } + # FIXME: this should get and check $use_ssh before doing this if ! defined(Service[xinetd]) { service { 'xinetd': ensure => 'running', |