[Pkg-nagios-changes] [pkg-nagios] r1232 - ndoutils/trunk/debian/patches

Hendrik Frenzel hfrenzel-guest at alioth.debian.org
Thu Sep 27 18:05:30 UTC 2007 

Author: hfrenzel-guest
Date: 2007-09-27 18:05:29 +0000 (Thu, 27 Sep 2007)
New Revision: 1232

Modified:
   ndoutils/trunk/debian/patches/01-pathnames.dpatch
Log:
fixed locations.h patch


Modified: ndoutils/trunk/debian/patches/01-pathnames.dpatch
===================================================================
--- ndoutils/trunk/debian/patches/01-pathnames.dpatch	2007-09-27 17:50:14 UTC (rev 1231)
+++ ndoutils/trunk/debian/patches/01-pathnames.dpatch	2007-09-27 18:05:29 UTC (rev 1232)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad ndoutils-1.4b3~/config/misccommands.cfg ndoutils-1.4b3/config/misccommands.cfg
---- ndoutils-1.4b3~/config/misccommands.cfg	2007-01-08 01:35:58.000000000 +0100
-+++ ndoutils-1.4b3/config/misccommands.cfg	2007-06-05 21:05:04.000000000 +0200
+diff -urNad ndoutils-1.4b6~/config/misccommands.cfg ndoutils-1.4b6/config/misccommands.cfg
+--- ndoutils-1.4b6~/config/misccommands.cfg	2007-01-08 01:35:58.000000000 +0100
++++ ndoutils-1.4b6/config/misccommands.cfg	2007-09-27 19:57:47.000000000 +0200
 @@ -7,5 +7,5 @@
  
  define command{
@@ -15,9 +15,9 @@
 -	command_line	/bin/mv /usr/local/nagios/var/ndo.dat /usr/local/nagios/var/ndo.`date +%s`
 +	command_line	/bin/mv /var/cache/nagios2/ndo.dat /var/cache/nagios2/ndo.`date +%s`
          }
-diff -urNad ndoutils-1.4b3~/config/nagios.cfg ndoutils-1.4b3/config/nagios.cfg
---- ndoutils-1.4b3~/config/nagios.cfg	2007-01-08 01:35:58.000000000 +0100
-+++ ndoutils-1.4b3/config/nagios.cfg	2007-06-05 21:05:04.000000000 +0200
+diff -urNad ndoutils-1.4b6~/config/nagios.cfg ndoutils-1.4b6/config/nagios.cfg
+--- ndoutils-1.4b6~/config/nagios.cfg	2007-01-08 01:35:58.000000000 +0100
++++ ndoutils-1.4b6/config/nagios.cfg	2007-09-27 19:57:47.000000000 +0200
 @@ -5,7 +5,7 @@
  # configuration file (nagios.cfg).  Adjust the paths, etc. to suit your needs.
  
@@ -27,9 +27,9 @@
  
  # Uncomment the line below if you're running Nagios 3.x
  #broker_module=/usr/local/nagios/bin/ndomod-3x.o config_file=/usr/local/nagios/etc/ndomod.cfg
-diff -urNad ndoutils-1.4b3~/config/ndo2db.cfg ndoutils-1.4b3/config/ndo2db.cfg
---- ndoutils-1.4b3~/config/ndo2db.cfg	2007-01-08 01:35:58.000000000 +0100
-+++ ndoutils-1.4b3/config/ndo2db.cfg	2007-06-05 21:05:04.000000000 +0200
+diff -urNad ndoutils-1.4b6~/config/ndo2db.cfg ndoutils-1.4b6/config/ndo2db.cfg
+--- ndoutils-1.4b6~/config/ndo2db.cfg	2007-01-08 01:35:58.000000000 +0100
++++ ndoutils-1.4b6/config/ndo2db.cfg	2007-09-27 19:57:47.000000000 +0200
 @@ -32,7 +32,7 @@
  # This option is only valid if the socket type specified above
  # is "unix".
@@ -39,9 +39,9 @@
  
  
  
-diff -urNad ndoutils-1.4b3~/config/ndomod.cfg ndoutils-1.4b3/config/ndomod.cfg
---- ndoutils-1.4b3~/config/ndomod.cfg	2007-02-19 05:48:11.000000000 +0100
-+++ ndoutils-1.4b3/config/ndomod.cfg	2007-06-05 21:05:04.000000000 +0200
+diff -urNad ndoutils-1.4b6~/config/ndomod.cfg ndoutils-1.4b6/config/ndomod.cfg
+--- ndoutils-1.4b6~/config/ndomod.cfg	2007-09-27 18:47:44.000000000 +0200
++++ ndoutils-1.4b6/config/ndomod.cfg	2007-09-27 19:57:47.000000000 +0200
 @@ -35,9 +35,9 @@
  # of fully qualified domain name of the host that the module should
  # connect to for sending output.
@@ -63,47 +63,48 @@
  
  
  
-diff -urNad ndoutils-1.4b3~/include/nagios-2x/locations.h ndoutils-1.4b3/include/nagios-2x/locations.h
---- ndoutils-1.4b3~/include/nagios-2x/locations.h	2007-04-10 18:21:35.000000000 +0200
-+++ ndoutils-1.4b3/include/nagios-2x/locations.h	2007-06-05 21:11:31.000000000 +0200
+diff -urNad ndoutils-1.4b6~/include/nagios-2x/locations.h ndoutils-1.4b6/include/nagios-2x/locations.h
+--- ndoutils-1.4b6~/include/nagios-2x/locations.h	2007-09-27 18:47:45.000000000 +0200
++++ ndoutils-1.4b6/include/nagios-2x/locations.h	2007-09-27 20:02:15.000000000 +0200
 @@ -18,22 +18,22 @@
   * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   ************************************************************************/
  
--#define DEFAULT_TEMP_FILE			"/usr/local/nagios/var/tempfile"
--#define DEFAULT_STATUS_FILE			"/usr/local/nagios/var/status.dat"
--#define DEFAULT_LOG_FILE			"/usr/local/nagios/var/nagios.log"
--#define DEFAULT_LOG_ARCHIVE_PATH		"/usr/local/nagios/var/archives/"
--#define DEFAULT_COMMENT_FILE			"/usr/local/nagios/var/comments.dat"
--#define DEFAULT_DOWNTIME_FILE			"/usr/local/nagios/var/downtime.dat"
--#define DEFAULT_RETENTION_FILE			"/usr/local/nagios/var/retention.dat"
--#define DEFAULT_COMMAND_FILE			"/usr/local/nagios/var/rw/nagios.cmd"
--#define DEFAULT_CONFIG_FILE			"/usr/local/nagios/etc/nagios.cfg"
--#define DEFAULT_PHYSICAL_HTML_PATH		"/usr/local/nagios/share"
--#define DEFAULT_URL_HTML_PATH			"/nagios"
--#define DEFAULT_PHYSICAL_CGIBIN_PATH		"/usr/local/nagios/sbin"
--#define DEFAULT_URL_CGIBIN_PATH			"/nagios/cgi-bin"
--#define DEFAULT_CGI_CONFIG_FILE			"/usr/local/nagios/etc/cgi.cfg"
--#define DEFAULT_LOCK_FILE			"/usr/local/nagios/var/nagios.lock"
--#define DEFAULT_OBJECT_CACHE_FILE		"/usr/local/nagios/var/objects.cache"
--#define DEFAULT_EVENT_BROKER_FILE		"/usr/local/nagios/var/broker.socket"
--#define DEFAULT_P1_FILE				"/usr/local/nagios/bin/p1.pl"	/**** EMBEDDED PERL ****/
-+#define DEFAULT_TEMP_FILE			"/var/cache/nagios2/tempfile"
-+#define DEFAULT_STATUS_FILE			"/var/cache/nagios2/status.dat"
-+#define DEFAULT_LOG_FILE			"/var/log/nagios2/nagios.log"
-+#define DEFAULT_LOG_ARCHIVE_PATH		"/var/log/nagios2/archives/"
-+#define DEFAULT_COMMENT_FILE			"/var/lib/nagios2/comments.dat"
-+#define DEFAULT_DOWNTIME_FILE			"/var/lib/nagios2/downtime.dat"
-+#define DEFAULT_RETENTION_FILE			"/var/lib/nagiod2/retention.dat"
-+#define DEFAULT_COMMAND_FILE			"/var/lib/nagios2/rw/nagios.cmd"
-+#define DEFAULT_CONFIG_FILE			"/etc/nagios2/nagios.cfg"
-+#define DEFAULT_PHYSICAL_HTML_PATH		"/usr/share/nagios2/htdocs"
-+#define DEFAULT_URL_HTML_PATH			"/nagios2"
-+#define DEFAULT_PHYSICAL_CGIBIN_PATH		"/usr/lib/cgi-bin/nagios2"
-+#define DEFAULT_URL_CGIBIN_PATH			"/cgi-bin/nagios2"
-+#define DEFAULT_CGI_CONFIG_FILE			"/etc/nagios2/cgi.cfg"
-+#define DEFAULT_LOCK_FILE			"/var/lock/nagios2/nagios.lock"
-+#define DEFAULT_OBJECT_CACHE_FILE		"/var/cache/nagios2/objects.cache"
-+#define DEFAULT_EVENT_BROKER_FILE		"/var/cache/nagios2/broker.socket"
-+#define DEFAULT_P1_FILE				"/usr/lib/nagios2/bin/p1.pl"	/**** EMBEDDED PERL ****/
- #define DEFAULT_AUTH_FILE			""			/**** EMBEDDED PERL - IS THIS USED? ****/
+-#define DEFAULT_TEMP_FILE			"/usr/local/nagios-2x/var/tempfile"
+-#define DEFAULT_STATUS_FILE			"/usr/local/nagios-2x/var/status.dat"
+-#define DEFAULT_LOG_FILE			"/usr/local/nagios-2x/var/nagios.log"
+-#define DEFAULT_LOG_ARCHIVE_PATH		"/usr/local/nagios-2x/var/archives/"
+-#define DEFAULT_COMMENT_FILE			"/usr/local/nagios-2x/var/comments.dat"
+-#define DEFAULT_DOWNTIME_FILE			"/usr/local/nagios-2x/var/downtime.dat"
+-#define DEFAULT_RETENTION_FILE			"/usr/local/nagios-2x/var/retention.dat"
+-#define DEFAULT_COMMAND_FILE			"/usr/local/nagios-2x/var/rw/nagios.cmd"
+-#define DEFAULT_CONFIG_FILE			"/usr/local/nagios-2x/etc/nagios.cfg"
+-#define DEFAULT_PHYSICAL_HTML_PATH		"/usr/local/nagios-2x/share"
+-#define DEFAULT_URL_HTML_PATH			"/nagios-2x"
+-#define DEFAULT_PHYSICAL_CGIBIN_PATH		"/usr/local/nagios-2x/sbin"
+-#define DEFAULT_URL_CGIBIN_PATH			"/nagios-2x/cgi-bin"
+-#define DEFAULT_CGI_CONFIG_FILE			"/usr/local/nagios-2x/etc/cgi.cfg"
+-#define DEFAULT_LOCK_FILE			"/usr/local/nagios-2x/var/nagios.lock"
+-#define DEFAULT_OBJECT_CACHE_FILE		"/usr/local/nagios-2x/var/objects.cache"
+-#define DEFAULT_EVENT_BROKER_FILE		"/usr/local/nagios-2x/var/broker.socket"
+-#define DEFAULT_P1_FILE				"/usr/local/nagios-2x/bin/p1.pl"	/**** EMBEDDED PERL ****/
+-#define DEFAULT_AUTH_FILE			""			/**** EMBEDDED PERL - IS THIS USED? ****/
++#define DEFAULT_TEMP_FILE                     "/var/cache/nagios2/tempfile"
++#define DEFAULT_STATUS_FILE                   "/var/cache/nagios2/status.dat"
++#define DEFAULT_LOG_FILE                      "/var/log/nagios2/nagios.log"
++#define DEFAULT_LOG_ARCHIVE_PATH              "/var/log/nagios2/archives/"
++#define DEFAULT_COMMENT_FILE                  "/var/lib/nagios2/comments.dat"
++#define DEFAULT_DOWNTIME_FILE                 "/var/lib/nagios2/downtime.dat"
++#define DEFAULT_RETENTION_FILE                "/var/lib/nagiod2/retention.dat"
++#define DEFAULT_COMMAND_FILE                  "/var/lib/nagios2/rw/nagios.cmd"
++#define DEFAULT_CONFIG_FILE                   "/etc/nagios2/nagios.cfg"
++#define DEFAULT_PHYSICAL_HTML_PATH            "/usr/share/nagios2/htdocs"
++#define DEFAULT_URL_HTML_PATH                 "/nagios2"
++#define DEFAULT_PHYSICAL_CGIBIN_PATH          "/usr/lib/cgi-bin/nagios2"
++#define DEFAULT_URL_CGIBIN_PATH               "/cgi-bin/nagios2"
++#define DEFAULT_CGI_CONFIG_FILE               "/etc/nagios2/cgi.cfg"
++#define DEFAULT_LOCK_FILE                     "/var/lock/nagios2/nagios.lock"
++#define DEFAULT_OBJECT_CACHE_FILE             "/var/cache/nagios2/objects.cache"
++#define DEFAULT_EVENT_BROKER_FILE             "/var/cache/nagios2/broker.socket"
++#define DEFAULT_P1_FILE	                      "/usr/lib/nagios2/bin/p1.pl"    /**** EMBEDDED PERL ****/
++#define DEFAULT_AUTH_FILE                     ""                      /**** EMBEDDED PERL - IS THIS USED? ****/

More information about the Pkg-nagios-changes mailing list