aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-04-13 15:21:45 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-04-13 15:21:45 -0300
commit616a76609b9e03223328d3dfb66c2334bade9464 (patch)
treed6ffcdf617b467c07b789a21d8b6b1023512d577 /manifests
parent49e1519b9c8087205a7dedf1dc1dae58b00fe97a (diff)
downloadpuppet-nodo-616a76609b9e03223328d3dfb66c2334bade9464.tar.gz
puppet-nodo-616a76609b9e03223328d3dfb66c2334bade9464.tar.bz2
Removing duplicate definition for nodo::subsystem::monitor
Diffstat (limited to 'manifests')
-rw-r--r--manifests/personal.pp6
-rw-r--r--manifests/subsystem/monitor.pp2
2 files changed, 1 insertions, 7 deletions
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
}