Merge remote-tracking branch 'shared/master'

Conflicts:
	README
	manifests/service.pp

4 files changed, 15 insertions, 4 deletions

diff --git a/files/configs/cgi.cfg b/files/configs/cgi.cfg
new file mode 120000
index 0000000..db9667b
--- /dev/null
+++ b/files/configs/cgi.cfg
@@ -0,0 +1 @@
+Debian/cgi.cfg
\ No newline at end of file
diff --git a/files/configs/nagios.cfg b/files/configs/nagios.cfg
new file mode 120000
index 0000000..1409b9e
--- /dev/null
+++ b/files/configs/nagios.cfg
@@ -0,0 +1 @@
+Debian/nagios.cfg
\ No newline at end of file
diff --git a/files/nrpe/nrpe_commands.cfg b/files/nrpe/nrpe_commands.cfg
new file mode 100644
index 0000000..b725a36
--- /dev/null
+++ b/files/nrpe/nrpe_commands.cfg
@@ -0,0 +1,5 @@
+# default plugins
+command[check_users]=/usr/lib/nagios/plugins/check_users $ARG1$ 
+command[check_disk]=/usr/lib/nagios/plugins/check_disk $ARG1$ -x "/dev" -x "/dev/shm" -x "/lib/init/rw" 
+command[check_apt]=sudo /usr/lib/nagios/plugins/check_apt -u $ARG1$
+command[check_swap]=/usr/lib/nagios/plugins/check_swap $ARG1$ 
diff --git a/files/nsca/nsca.cfg b/files/nsca/nsca.cfg
index 238869f..0b019ea 100644
--- a/files/nsca/nsca.cfg
+++ b/files/nsca/nsca.cfg
@@ -21,7 +21,7 @@ pid_file=/var/run/nsca.pid
 # Port number we should wait for connections on.
 # This must be a non-priveledged port (i.e. > 1024).
 
-server_port=5677
+server_port=5667
 
 
 
@@ -79,10 +79,15 @@ debug=0
 # COMMAND FILE
 # This is the location of the Nagios command file that the daemon
 # should write all service check results that it receives.
-
+# Note to debian users: nagios 1.x and nagios 2.x have
+# different default locations for this file.  this is the
+# default location for nagios 1.x:
+#command_file=/var/run/nagios/nagios.cmd
+# and this is the default location for nagios2:
+#command_file=/var/lib/nagios2/rw/nagios.cmd
+# and this is the default location for nagios3:
 command_file=/var/lib/nagios3/rw/nagios.cmd
 
-
 # ALTERNATE DUMP FILE
 # This is used to specify an alternate file the daemon should
 # write service check results to in the event the command file
@@ -96,7 +101,6 @@ command_file=/var/lib/nagios3/rw/nagios.cmd
 alternate_dump_file=/var/run/nagios/nsca.dump
 
 
-
 # AGGREGATED WRITES OPTION
 # This option determines whether or not the nsca daemon will
 # aggregate writes to the external command file for client