[Pkg-nagios-devel] nagios/patches 02_reasonable_config.dpatch,1.3,1.4
seanius@haydn.debian.org
seanius@haydn.debian.org
Update of /cvsroot/pkg-nagios/nagios/patches
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv27636/patches
Modified Files:
02_reasonable_config.dpatch
Log Message:
localhost.localdomain -> localhost
Index: 02_reasonable_config.dpatch
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/patches/02_reasonable_config.dpatch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- 02_reasonable_config.dpatch 17 Nov 2004 23:30:08 -0000 1.3
+++ 02_reasonable_config.dpatch 5 Apr 2005 04:27:46 -0000 1.4
@@ -5,9 +5,9 @@
## DP: Fix the config.
@DPATCH@
-diff -urNad nagios-1.3/sample-config/cgi.cfg.in /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/cgi.cfg.in
---- nagios-1.3/sample-config/cgi.cfg.in 2004-11-17 23:40:21.619435517 +0100
-+++ /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/cgi.cfg.in 2004-11-17 23:45:35.474930119 +0100
+diff -urNad nagios-1.3-cvs.20050402/sample-config/cgi.cfg.in /home/seanius/tmp/dpep.1CzbOZ/nagios-1.3-cvs.20050402/sample-config/cgi.cfg.in
+--- nagios-1.3-cvs.20050402/sample-config/cgi.cfg.in 2002-10-29 19:05:35.000000000 -0500
++++ /home/seanius/tmp/dpep.1CzbOZ/nagios-1.3-cvs.20050402/sample-config/cgi.cfg.in 2005-04-05 00:20:03.567314574 -0400
@@ -68,7 +68,13 @@
# Nagios. Run the 'ps' command manually to see what the command
# line entry for the Nagios process looks like.
@@ -23,9 +23,9 @@
-diff -urNad nagios-1.3/sample-config/template-object/checkcommands.cfg.in /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/checkcommands.cfg.in
---- nagios-1.3/sample-config/template-object/checkcommands.cfg.in 2004-11-17 23:40:21.619435517 +0100
-+++ /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/checkcommands.cfg.in 2004-11-17 23:42:51.447291281 +0100
+diff -urNad nagios-1.3-cvs.20050402/sample-config/template-object/checkcommands.cfg.in /home/seanius/tmp/dpep.1CzbOZ/nagios-1.3-cvs.20050402/sample-config/template-object/checkcommands.cfg.in
+--- nagios-1.3-cvs.20050402/sample-config/template-object/checkcommands.cfg.in 2002-06-09 23:25:52.000000000 -0400
++++ /home/seanius/tmp/dpep.1CzbOZ/nagios-1.3-cvs.20050402/sample-config/template-object/checkcommands.cfg.in 2005-04-05 00:20:03.567314574 -0400
@@ -124,30 +124,30 @@
}
@@ -65,9 +65,9 @@
command_line $USER1$/check_load -w $ARG1$ -c $ARG2$
}
-diff -urNad nagios-1.3/sample-config/template-object/contactgroups.cfg.in /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/contactgroups.cfg.in
---- nagios-1.3/sample-config/template-object/contactgroups.cfg.in 2004-11-17 23:40:21.620435356 +0100
-+++ /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/contactgroups.cfg.in 2004-11-17 23:42:51.448291120 +0100
+diff -urNad nagios-1.3-cvs.20050402/sample-config/template-object/contactgroups.cfg.in /home/seanius/tmp/dpep.1CzbOZ/nagios-1.3-cvs.20050402/sample-config/template-object/contactgroups.cfg.in
+--- nagios-1.3-cvs.20050402/sample-config/template-object/contactgroups.cfg.in 2002-10-03 20:12:48.000000000 -0400
++++ /home/seanius/tmp/dpep.1CzbOZ/nagios-1.3-cvs.20050402/sample-config/template-object/contactgroups.cfg.in 2005-04-05 00:20:03.567314574 -0400
@@ -18,35 +18,35 @@
################################################################################
@@ -140,10 +140,18 @@
+# }
-diff -urNad nagios-1.3/sample-config/template-object/contacts.cfg.in /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/contacts.cfg.in
---- nagios-1.3/sample-config/template-object/contacts.cfg.in 2004-11-17 23:40:21.621435195 +0100
-+++ /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/contacts.cfg.in 2004-11-17 23:42:51.448291120 +0100
-@@ -33,16 +33,16 @@
+diff -urNad nagios-1.3-cvs.20050402/sample-config/template-object/contacts.cfg.in /home/seanius/tmp/dpep.1CzbOZ/nagios-1.3-cvs.20050402/sample-config/template-object/contacts.cfg.in
+--- nagios-1.3-cvs.20050402/sample-config/template-object/contacts.cfg.in 2002-03-07 22:38:36.000000000 -0500
++++ /home/seanius/tmp/dpep.1CzbOZ/nagios-1.3-cvs.20050402/sample-config/template-object/contacts.cfg.in 2005-04-05 00:26:25.367259533 -0400
+@@ -27,22 +27,22 @@
+ host_notification_options d,u,r
+ service_notification_commands notify-by-email,notify-by-epager
+ host_notification_commands host-notify-by-email,host-notify-by-epager
+- email @nagios_user@-admin@localhost.localdomain
+- pager page@nagios_user@-admin@localhost.localdomain
++ email @nagios_user@-admin@localhost
++ pager page@nagios_user@-admin@localhost
+ }
# 'jdoe' contact definition
@@ -167,13 +175,13 @@
+# host_notification_options d,r
+# service_notification_commands notify-by-email
+# host_notification_commands host-notify-by-email
-+# email jdoe@localhost.localdomain
++# email jdoe@localhost
+# }
-diff -urNad nagios-1.3/sample-config/template-object/escalations.cfg.in /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/escalations.cfg.in
---- nagios-1.3/sample-config/template-object/escalations.cfg.in 2004-11-17 23:40:21.621435195 +0100
-+++ /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/escalations.cfg.in 2004-11-17 23:42:51.448291120 +0100
+diff -urNad nagios-1.3-cvs.20050402/sample-config/template-object/escalations.cfg.in /home/seanius/tmp/dpep.1CzbOZ/nagios-1.3-cvs.20050402/sample-config/template-object/escalations.cfg.in
+--- nagios-1.3-cvs.20050402/sample-config/template-object/escalations.cfg.in 2002-03-07 22:38:36.000000000 -0500
++++ /home/seanius/tmp/dpep.1CzbOZ/nagios-1.3-cvs.20050402/sample-config/template-object/escalations.cfg.in 2005-04-05 00:20:03.568314375 -0400
@@ -19,24 +19,33 @@
# Serviceescalation definition
@@ -256,9 +264,9 @@
-diff -urNad nagios-1.3/sample-config/template-object/hostgroups.cfg.in /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/hostgroups.cfg.in
---- nagios-1.3/sample-config/template-object/hostgroups.cfg.in 2004-11-17 23:40:21.622435033 +0100
-+++ /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/hostgroups.cfg.in 2004-11-17 23:42:51.448291120 +0100
+diff -urNad nagios-1.3-cvs.20050402/sample-config/template-object/hostgroups.cfg.in /home/seanius/tmp/dpep.1CzbOZ/nagios-1.3-cvs.20050402/sample-config/template-object/hostgroups.cfg.in
+--- nagios-1.3-cvs.20050402/sample-config/template-object/hostgroups.cfg.in 2002-03-07 22:38:36.000000000 -0500
++++ /home/seanius/tmp/dpep.1CzbOZ/nagios-1.3-cvs.20050402/sample-config/template-object/hostgroups.cfg.in 2005-04-05 00:20:03.568314375 -0400
@@ -17,57 +17,67 @@
#
################################################################################
@@ -362,9 +370,9 @@
+# }
-diff -urNad nagios-1.3/sample-config/template-object/hosts.cfg.in /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/hosts.cfg.in
---- nagios-1.3/sample-config/template-object/hosts.cfg.in 2004-11-17 23:40:21.623434872 +0100
-+++ /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/hosts.cfg.in 2004-11-17 23:42:51.449290959 +0100
+diff -urNad nagios-1.3-cvs.20050402/sample-config/template-object/hosts.cfg.in /home/seanius/tmp/dpep.1CzbOZ/nagios-1.3-cvs.20050402/sample-config/template-object/hosts.cfg.in
+--- nagios-1.3-cvs.20050402/sample-config/template-object/hosts.cfg.in 2002-03-10 18:49:27.000000000 -0500
++++ /home/seanius/tmp/dpep.1CzbOZ/nagios-1.3-cvs.20050402/sample-config/template-object/hosts.cfg.in 2005-04-05 00:20:03.568314375 -0400
@@ -21,8 +21,8 @@
define host{
name generic-host ; The name of this host template - referenced in other host definitions, used for template recursion/resolution
@@ -793,9 +801,9 @@
+# }
-diff -urNad nagios-1.3/sample-config/template-object/minimal.cfg.in /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/minimal.cfg.in
---- nagios-1.3/sample-config/template-object/minimal.cfg.in 2004-11-17 23:40:21.623434872 +0100
-+++ /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/minimal.cfg.in 2004-11-17 23:42:51.449290959 +0100
+diff -urNad nagios-1.3-cvs.20050402/sample-config/template-object/minimal.cfg.in /home/seanius/tmp/dpep.1CzbOZ/nagios-1.3-cvs.20050402/sample-config/template-object/minimal.cfg.in
+--- nagios-1.3-cvs.20050402/sample-config/template-object/minimal.cfg.in 2002-10-03 20:12:48.000000000 -0400
++++ /home/seanius/tmp/dpep.1CzbOZ/nagios-1.3-cvs.20050402/sample-config/template-object/minimal.cfg.in 2005-04-05 00:20:03.568314375 -0400
@@ -90,7 +90,7 @@
# Command used to check disk space usage on local partitions
@@ -907,9 +915,9 @@
-
-
-# EOF
-diff -urNad nagios-1.3/sample-config/template-object/services.cfg.in /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/services.cfg.in
---- nagios-1.3/sample-config/template-object/services.cfg.in 2004-11-17 23:40:21.625434549 +0100
-+++ /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/services.cfg.in 2004-11-17 23:42:51.451290638 +0100
+diff -urNad nagios-1.3-cvs.20050402/sample-config/template-object/services.cfg.in /home/seanius/tmp/dpep.1CzbOZ/nagios-1.3-cvs.20050402/sample-config/template-object/services.cfg.in
+--- nagios-1.3-cvs.20050402/sample-config/template-object/services.cfg.in 2002-09-18 22:15:36.000000000 -0400
++++ /home/seanius/tmp/dpep.1CzbOZ/nagios-1.3-cvs.20050402/sample-config/template-object/services.cfg.in 2005-04-05 00:20:03.570313977 -0400
@@ -19,15 +19,17 @@
# Generic service definition template