From 616a76609b9e03223328d3dfb66c2334bade9464 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 13 Apr 2013 15:21:45 -0300
Subject: Removing duplicate definition for nodo::subsystem::monitor

---
 manifests/personal.pp          | 6 ------
 manifests/subsystem/monitor.pp | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'manifests')

diff --git a/manifests/personal.pp b/manifests/personal.pp
index 8d14f1e..90f36ae 100644
--- a/manifests/personal.pp
+++ b/manifests/personal.pp
@@ -14,12 +14,6 @@ class nodo::personal {
     include nodo::subsystem::gdm3
   }
 
-  # Monitoring
-  class { 'nodo::subsystem::monitor':
-    type       => 'personal',
-    use_nagios => hiera('nodo::personal::use_nagios', false),
-  }
-
   # Media folders and groups
   class { [ 'nodo::subsystem::media::folders', 'nodo::subsystem::media::groups' ]: }
 
diff --git a/manifests/subsystem/monitor.pp b/manifests/subsystem/monitor.pp
index d7fa720..015f43c 100644
--- a/manifests/subsystem/monitor.pp
+++ b/manifests/subsystem/monitor.pp
@@ -11,7 +11,7 @@ class nodo::subsystem::monitor(
       nagios::service::ping { "${::fqdn}": }
     }
 
-    if $type == 'host' or $type == 'personal' {
+    if $type == 'host' {
       if $use_fqdn == true {
         include nagios::target::fqdn
       }
-- 
cgit v1.2.3