From b449ad813d8c9672d23393ca30bbfd3dc1dd7fe3 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Tue, 4 Feb 2014 17:55:09 +0100
Subject: don't install xinetd by default, restructed agent use of ssh

---
 manifests/agent/install.pp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'manifests/agent/install.pp')

diff --git a/manifests/agent/install.pp b/manifests/agent/install.pp
index 903a9f5..7e41a7b 100644
--- a/manifests/agent/install.pp
+++ b/manifests/agent/install.pp
@@ -4,12 +4,19 @@ class check_mk::agent::install (
   $workspace,
   $agent_package_name,
   $agent_logwatch_package_name,
+  $method = 'xinetd',
 ) {
-  if ! defined(Package['xinetd']) {
-    package { 'xinetd':
-      ensure => present,
+  if $method == 'xinetd' {
+    if ! defined($require_method) {
+      package { 'xinetd':
+        ensure => present,
+      }
     }
+    $require_method = 'Package[\'xinetd\']'
+  } else {
+    $require_method = undef
   }
+
   if $filestore {
     if ! defined(File[$workspace]) {
       file { $workspace:
@@ -19,12 +26,12 @@ class check_mk::agent::install (
     file { "${workspace}/check_mk-agent-${version}.noarch.rpm":
       ensure  => present,
       source  => "${filestore}/check_mk-agent-${version}.noarch.rpm",
-      require => Package['xinetd'],
+      require => $require_method,
     }
     file { "${workspace}/check_mk-agent-logwatch-${version}.noarch.rpm":
       ensure  => present,
       source  => "${filestore}/check_mk-agent-logwatch-${version}.noarch.rpm",
-      require => Package['xinetd'],
+      require => $require_method,
     }
     package { 'check_mk-agent':
       ensure   => present,
@@ -46,7 +53,7 @@ class check_mk::agent::install (
     package { 'check_mk-agent':
       ensure  => present,
       name    => $agent_package_name,
-      require => Package['xinetd'],
+      require => $require_method,
     }
     package { 'check_mk-agent-logwatch':
       ensure  => present,
-- 
cgit v1.2.3