summaryrefslogtreecommitdiff
path: root/manifests/defaults
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2011-12-08 16:36:21 -0500
committerMicah Anderson <micah@riseup.net>2011-12-08 16:36:21 -0500
commit59da6a08e1b6d32c018098992e6ab597998afa94 (patch)
treee4d75b1a73ae89e1e32483c7b9a82098e1bb0fb2 /manifests/defaults
parent6ad1e288af0f8b6691aa6b57b2b23c44b06d4165 (diff)
Revert "Fix nagios check_smtp duplicate definition"
This reverts commit fb75fcec220f9e2943d2e7af292ff884fd237f6d. Reverted due to LeLutin's comments in #3310 and the fix implemented in #3298 in preparation of merging those
Diffstat (limited to 'manifests/defaults')
-rw-r--r--manifests/defaults/commands.pp6
1 files changed, 0 insertions, 6 deletions
diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp
index f5fface..ea30a07 100644
--- a/manifests/defaults/commands.pp
+++ b/manifests/defaults/commands.pp
@@ -6,12 +6,6 @@ class nagios::defaults::commands {
# common service commands
case $operatingsystem {
debian,ubuntu: {
- # debian and ubuntu ship the nagios::command::smtp and
- # nagios::command::imap_pop3 commands in the nagios-plugins packages,
- # which are placed in /etc/nagios-plugins/config/mail.cfg, however they
- # are inferior to the ones provided in this module below because they do
- # not provide port options, so we just remove them
- file { '/etc/nagios-plugins/config/mail.cfg': ensure => absent; }
nagios_command {
check_dummy:
command_line => '$USER1$/check_dummy $ARG1$';