[Pkg-nagios-devel] nagios README.mysql,1.4,1.4.2.1 README.pgsql,1.3,1.3.2.1 changelog,1.54.2.1,1.54.2.2

seanius@haydn.debian.org seanius@haydn.debian.org


Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv28163

Modified Files:
      Tag: nagios_1_x_sarge
	README.mysql README.pgsql changelog 
Log Message:
documentation fixes from sid version


Index: README.mysql
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/README.mysql,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- README.mysql	16 Mar 2005 12:50:14 -0000	1.4
+++ README.mysql	2 Jun 2005 13:18:24 -0000	1.4.2.1
@@ -79,7 +79,7 @@
 
 Then you want the cgi-script and the init.d script to correctly
 know the status of nagios. To do this you will need something like the
-check_nagios_db file from /usr/doc/nagios-common/.  put it where you
+check_nagios_db file from /usr/share/doc/nagios-common/.  put it where you
 like but adjust the paths in the following examples. the default example
 will assume you put it in /etc/nagios/check_nagios_db as the init-script
 now already looks there by default and if it is there it will automagically

Index: README.pgsql
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/README.pgsql,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- README.pgsql	22 Feb 2005 04:53:57 -0000	1.3
+++ README.pgsql	2 Jun 2005 13:18:24 -0000	1.3.2.1
@@ -20,9 +20,9 @@
 
 # gunzip /usr/share/doc/nagios-pgsql/create_pgsql.gz
 # su postgres
-# psql nagios < /usr/share/doc/nagios-pgsql/create_pgsql
 # createuser -A -D nagios
 # createdb -O nagios nagios
+# psql nagios < /usr/share/doc/nagios-pgsql/create_pgsql
 # createlang plpgsql nagios
 # psql nagios
 
@@ -62,12 +62,14 @@
 
    First, create a copy of the check_nagios_db script:
 
-cp /usr/share/doc/nagios-pgsql/check_nagios_db /usr/lib/nagios/plugins/
+cp /usr/share/doc/nagios-pgsql/check_nagios_db /etc/nagios/
+chmod +x /etc/nagios/check_nagios_db
 
-   Apply these changes to /usr/lib/nagios/plugins/check_nagios_db:
+
+   Apply these changes to check_nagios_db:
 
 --- /usr/share/doc/nagios-pgsql/check_nagios_db 2004-11-13 18:56:19.000000000 -0500
-+++ /usr/lib/nagios/plugins/check_nagios_db     2004-12-31 09:16:16.000000000 -0500
++++ /etc/nagios/check_nagios_db     2004-12-31 09:16:16.000000000 -0500
 @@ -11,10 +11,10 @@
  use DBI;
 
@@ -93,7 +95,7 @@
 
    Test it standalone:
 
-/usr/lib/nagios/plugins/check_nagios_db
+/etc/nagios/check_nagios_db
 
    vi /etc/nagios/resource.cfg
 
@@ -117,11 +119,11 @@
 GRANT SELECT ON hostextinfo, programstatus, servicestatus, hoststatus, hostcomments, servicecomments, hostdowntime, servicedowntime, serviceextinfo TO nagios_cgi;
 
 Then the user and password for nagios_cgi should be entered in
-/etc/nagios/nagios.cgi.
+/etc/nagios/cgi.cfg.
 
    In the same file, change the check command:
 
-nagios_check_command=/usr/lib/nagios/plugins/check_nagios_db
+nagios_check_command=/etc/nagios/check_nagios_db
 
    Check and restart:
 
@@ -150,3 +152,6 @@
      * http://arstechnica.com/columns/linux/linux-20040601.ars
      * http://www.xach.com/aolserver/mysql-to-postgresql.html
      * http://www.archonet.com/pgdocs/grant-all.html
+
+
+ -- sean finney <seanius@debian.org>  Wed, 11 May 2005 19:33:27 -0400

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.54.2.1
retrieving revision 1.54.2.2
diff -u -d -r1.54.2.1 -r1.54.2.2
--- changelog	2 Jun 2005 13:10:12 -0000	1.54.2.1
+++ changelog	2 Jun 2005 13:18:24 -0000	1.54.2.2
@@ -1,6 +1,7 @@
-nagios (2:1.3-cvs.20050402-3) unstable; urgency=low
+nagios (2:1.3-cvs.20050402-2.sarge.1) unstable; urgency=low
   * Sean Finney:
     - don't blindly rm -rf /etc/nagios at purge time, that's stupid!
+	- incorporate documentation fixes from sid.
 
  -- sean finney <seanius@debian.org>  Thu, 02 Jun 2005 08:58:51 -0400