Index: /noc/nagios/checkcommands.cfg
===================================================================
--- /noc/nagios/checkcommands.cfg	(revision 715)
+++ /noc/nagios/checkcommands.cfg	(revision 716)
@@ -34,44 +34,4 @@
 ################################################################################
 
-
-
-
-################################################################################
-#
-# SAMPLE SERVICE CHECK COMMANDS
-#
-# These are some example service check commands.  They may or may not work on
-# your system, as they must be modified for your plugins.  See the HTML 
-# documentation on the plugins for examples of how to configure command definitions.
-#
-################################################################################
-
-
-# 'check_dns' command definition
-define command{
-        command_name    check_dns
-        command_line    $USER1$/check_dns -H www.yahoo.com -s $HOSTADDRESS$
-        }
-
-
-# 'check_ftp' command definition
-define command{
-        command_name    check_ftp
-        command_line    $USER1$/check_ftp -H $HOSTADDRESS$
-        }
-
-
-# 'check_hpjd' command definition
-define command{
-        command_name    check_hpjd
-        command_line    $USER1$/check_hpjd -H $HOSTADDRESS$ -C public
-        }
-
-
-# 'check_http' command definition
-define command{
-        command_name    check_http
-        command_line    $USER1$/check_http -H $HOSTADDRESS$
-        }
 
 # 'check_http_heartbeat' command definition
@@ -115,56 +75,4 @@
         }
 
-
-# 'check_nntp' command definition
-define command{
-        command_name    check_nntp
-        command_line    $USER1$/check_nntp -H $HOSTADDRESS$
-        }
-
-
-# 'check_ping' command definition
-define command{
-        command_name    check_ping
-        command_line    $USER1$/check_ping -H $HOSTADDRESS$ -w $ARG1$ -c $ARG2$ -p 5
-        }
-
-
-# 'check_pop' command definition
-define command{
-        command_name    check_pop
-        command_line    $USER1$/check_pop -H $HOSTADDRESS$
-        }
-
-
-# 'check_smtp' command definition
-define command{
-        command_name    check_smtp
-        command_line    $USER1$/check_smtp -H $HOSTADDRESS$
-        }
-
-
-# 'check_tcp' command definition
-define command{
-	command_name	check_tcp
-	command_line	$USER1$/check_tcp -H $HOSTADDRESS$ -p $ARG1$
-	}
-
-
-# 'check_telnet' command definition
-define command{
-        command_name    check_telnet
-        command_line    $USER1$/check_tcp -H $HOSTADDRESS$ -p 23
-        }
-
-
-# 'check_udp' command definition
-define command{
-	command_name	check_udp
-	command_line	$USER1$/check_udp -H $HOSTADDRESS$ -p $ARG1$
-	}
-
-
-
-
 ################################################################################
 #
@@ -185,13 +93,8 @@
 #        }
 
-define command{
-        command_name    check-host-alive
-        command_line    $USER1$/check_ping -H $HOSTADDRESS$ -w 99,99% -c 100,100% -p 1 
-        }
-
-define command {
-	command_name	check_ssh
-	command_line	$USER1$/check_ssh $HOSTADDRESS$
-}
+#define command{
+#        command_name    check-host-alive
+#        command_line    $USER1$/check_ping -H $HOSTADDRESS$ -w 99,99% -c 100,100% -p 1 
+#        }
 
 define command {
@@ -251,9 +154,4 @@
 
 define command {
-	command_name	check_mysql
-	command_line	$USER1$/check_mysql -H $HOSTADDRESS$ -a $USER3$ $USER4$
-}
-
-define command {
 	command_name	check_remote_mysql
 	command_line	$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_mysql -a $USER3$ $USER4$
Index: /noc/nagios/nagios.cfg
===================================================================
--- /noc/nagios/nagios.cfg	(revision 715)
+++ /noc/nagios/nagios.cfg	(revision 716)
@@ -1,11 +1,5 @@
 ##############################################################################
 #
-# NAGIOS.CFG - Sample Main Config File for Nagios 
-#
-# Read the documentation for more information on this configuration
-# file.  I've provided some comments here, but things may not be so
-# clear without further explanation.
-#
-# Last Modified: 11-23-2005
+# NAGIOS.CFG - Main Config File for Nagios
 #
 ##############################################################################
@@ -17,5 +11,5 @@
 # in the config file!!!
 
-log_file=/var/log/nagios/nagios.log
+log_file=/var/log/nagios2/nagios.log
 
 
@@ -35,8 +29,12 @@
 # plugins, so you should use the same config file provided with the
 # plugin release rather than the one provided with Nagios.
-cfg_file=/etc/nagios/checkcommands.cfg
+cfg_file=/etc/nagios2/checkcommands.cfg
+
+# Debian also defaults to using the check commands defined by the debian
+# nagios-plugins package
+cfg_dir=/etc/nagios-plugins/config
 
 # Misc commands (notification and event handler commands, etc)
-cfg_file=/etc/nagios/misccommands.cfg
+cfg_file=/etc/nagios2/misccommands.cfg
 
 # You can split other types of object definitions across several
@@ -44,19 +42,19 @@
 # single config file.
 
-cfg_file=/etc/nagios/base.cfg
-
-#cfg_file=/etc/nagios/contactgroups.cfg
-cfg_file=/etc/nagios/contacts.cfg
-#cfg_file=/etc/nagios/dependencies.cfg
-#cfg_file=/etc/nagios/escalations.cfg
-cfg_file=/etc/nagios/hostgroups.cfg
-cfg_file=/etc/nagios/hosts.cfg
-cfg_file=/etc/nagios/services.cfg
-#cfg_file=/etc/nagios/timeperiods.cfg
+cfg_file=/etc/nagios2/base.cfg
+
+#cfg_file=/etc/nagios2/contactgroups.cfg
+cfg_file=/etc/nagios2/contacts.cfg
+#cfg_file=/etc/nagios2/dependencies.cfg
+#cfg_file=/etc/nagios2/escalations.cfg
+cfg_file=/etc/nagios2/hostgroups.cfg
+cfg_file=/etc/nagios2/hosts.cfg
+cfg_file=/etc/nagios2/services.cfg
+#cfg_file=/etc/nagios2/timeperiods.cfg
 
 # Extended host/service info definitions are now stored along with
 # other object definitions:
-#cfg_file=/etc/nagios/hostextinfo.cfg
-#cfg_file=/etc/nagios/serviceextinfo.cfg
+#cfg_file=/etc/nagios2/hostextinfo.cfg
+#cfg_file=/etc/nagios2/serviceextinfo.cfg
 
 # You can also tell Nagios to process all config files (with a .cfg
@@ -64,8 +62,8 @@
 # directive as shown below:
 
-#cfg_dir=/etc/nagios/servers
-#cfg_dir=/etc/nagios/printers
-#cfg_dir=/etc/nagios/switches
-#cfg_dir=/etc/nagios/routers
+#cfg_dir=/etc/nagios2/servers
+#cfg_dir=/etc/nagios2/printers
+#cfg_dir=/etc/nagios2/switches
+#cfg_dir=/etc/nagios2/routers
 
 
@@ -78,5 +76,5 @@
 # when the config files are modified after Nagios starts.
 
-object_cache_file=/var/log/nagios/objects.cache
+object_cache_file=/var/cache/nagios2/objects.cache
 
 
@@ -91,5 +89,5 @@
 # can be placed on this file.
 
-resource_file=/etc/nagios/private/resource.cfg
+resource_file=/etc/nagios2/resource.cfg
 
 
@@ -101,5 +99,5 @@
 #  restarts.
 
-status_file=/var/log/nagios/status.dat
+status_file=/var/cache/nagios2/status.dat
 
 
@@ -159,6 +157,8 @@
 # directory level instead of on the file, as the file is deleted every
 # time its contents are processed.
-
-command_file=/var/spool/nagios/cmd/nagios.cmd
+# Debian Users: In case you didn't read README.Debian yet, _NOW_ is the
+# time to do it.
+
+command_file=/var/lib/nagios2/rw/nagios.cmd
 
 
@@ -168,5 +168,5 @@
 # comments.
 
-comment_file=/var/log/nagios/comments.dat
+comment_file=/var/lib/nagios2/comments.dat
 
 
@@ -176,5 +176,5 @@
 # downtime data.
 
-downtime_file=/var/log/nagios/downtime.dat
+downtime_file=/var/lib/nagios2/downtime.dat
 
 
@@ -184,5 +184,5 @@
 # in when it is running in daemon mode.
 
-lock_file=/var/run/nagios.pid
+lock_file=/var/run/nagios2/nagios2.pid
 
 
@@ -194,5 +194,5 @@
 # running.
 
-temp_file=/var/log/nagios/nagios.tmp
+temp_file=/var/cache/nagios2/nagios.tmp
 
 
@@ -241,5 +241,5 @@
 # placed (assuming you've chosen to do log rotation).
 
-log_archive_path=/var/log/nagios/archives
+log_archive_path=/var/log/nagios2/archives
 
 
@@ -507,5 +507,5 @@
 # variable is set to 1.
 
-state_retention_file=/var/log/nagios/retention.dat
+state_retention_file=/var/lib/nagios2/retention.dat
 
 
@@ -639,5 +639,5 @@
 # Values: 1 = process performance data, 0 = do not process performance data
 
-#process_performance_data=0
+process_performance_data=0
 
 
@@ -862,5 +862,5 @@
 # Nagios with embedded Perl support, this option has no effect.
 
-p1_file=/usr/sbin/p1.pl
+p1_file=/usr/lib/nagios2/p1.pl
 
 
@@ -951,9 +951,9 @@
 
 
-process_performance_data=1
-service_perfdata_file=/home/noc/ng/log/perfdata
-service_perfdata_file_template=$LASTSERVICECHECK$||$HOSTNAME$||$SERVICEDESC$||$SERVICEOUTPUT$||$SERVICEPERFDATA$
-service_perfdata_file_mode=a
-service_perfdata_file_processing_interval=60
-service_perfdata_file_processing_command=ng-service-perfdata
+#process_performance_data=1
+#service_perfdata_file=/home/noc/ng/log/perfdata
+#service_perfdata_file_template=$LASTSERVICECHECK$||$HOSTNAME$||$SERVICEDESC$||$SERVICEOUTPUT$||$SERVICEPERFDATA$
+#service_perfdata_file_mode=a
+#service_perfdata_file_processing_interval=60
+#service_perfdata_file_processing_command=ng-service-perfdata
 # EOF (End of file)