Removing duplicate definition for nodo::subsystem::monitor

diff --git a/manifests/personal.pp b/manifests/personal.pp
index 8d14f1ef71f66896528f43900d1fc2e21a4fa75a..90f36aea310f5fa811abfb2e08789ead4739c8a0 100644 (file)
--- 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 d7fa7209d1383d06e24cf7e7eed86635add1b05d..015f43c6e75b7824fe600ae92663444403e4acd7 100644 (file)
--- 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
       }