[Pkg-nagios-changes] [pkg-nagios] r1967 - in nagvis/tags: . 1.4.6-1.1+squeeze1/debian 1.4.6-1.1+squeeze1/debian/patches
Alexander Reichle-Schmehl
tolimar at alioth.debian.org
Sat Sep 17 19:14:59 UTC 2011
tags 611909 pending
tags 620037 pending
tags 632333 pending
thanks
Author: tolimar
Date: 2011-09-17 19:14:59 +0000 (Sat, 17 Sep 2011)
New Revision: 1967
Added:
nagvis/tags/1.4.6-1.1+squeeze1/
Modified:
nagvis/tags/1.4.6-1.1+squeeze1/debian/README.Debian
nagvis/tags/1.4.6-1.1+squeeze1/debian/apache.conf
nagvis/tags/1.4.6-1.1+squeeze1/debian/changelog
nagvis/tags/1.4.6-1.1+squeeze1/debian/control
nagvis/tags/1.4.6-1.1+squeeze1/debian/install
nagvis/tags/1.4.6-1.1+squeeze1/debian/patches/config.dpatch
nagvis/tags/1.4.6-1.1+squeeze1/debian/postrm
Log:
Tag 1.4.6-1.1+squeeze1, which I just uploaded to stable-p-u
Modified: nagvis/tags/1.4.6-1.1+squeeze1/debian/README.Debian
===================================================================
--- nagvis/tags/1:1.4.6-1.1/debian/README.Debian 2011-09-07 21:46:30 UTC (rev 1966)
+++ nagvis/tags/1.4.6-1.1+squeeze1/debian/README.Debian 2011-09-17 19:14:59 UTC (rev 1967)
@@ -1,6 +1,18 @@
nagvis for Debian
-----------------
+If nagvis doesn't work out of the box right after installation, please check
+the following steps:
+
+* Activate the ndoutils as described in
+ /usr/share/doc/ndoutils-nagios3-mysql/README.Debian
+* Check the [backend_ndomy_1] section of /etc/nagvis/nagvis.ini.php.
+ dbname, dbuser and dbpass must be set to the values specified in
+ /etc/dbconfig-common/ndoutils-mysql.conf. Also make sure, that the entries are
+ not commented out with a leading ;
+
+ -- Alexander Reichle-Schmehl <tolimar at debian.org> Wed, 07 Sep 2011 21:43:21 +0200
+
Since Version 1:1.4.6-1.1 you may also use nagvis with a remote database.
However you'll need to configure the Database settings by hand.
Modified: nagvis/tags/1.4.6-1.1+squeeze1/debian/apache.conf
===================================================================
--- nagvis/tags/1:1.4.6-1.1/debian/apache.conf 2011-09-07 21:46:30 UTC (rev 1966)
+++ nagvis/tags/1.4.6-1.1+squeeze1/debian/apache.conf 2011-09-17 19:14:59 UTC (rev 1967)
@@ -2,15 +2,21 @@
Alias /nagvis/nagvis/templates /etc/nagvis/templates
Alias /nagvis/nagvis/gadgets /etc/nagvis/gadgets
Alias /nagvis/nagvis/images /var/lib/nagvis/images
+Alias /nagvis/docs /usr/share/doc/nagvis/docs
Alias /nagvis /usr/share/nagvis/htdocs
# -- old style
# Alias /nagios3/nagvis /usr/share/nagvis/htdocs
+# the FollowSymlinks option is only considere in a directory section, not
+# in a DirectoryMatch section. Setting it here.
+<Directory /usr/share/nagvis/htdocs>
+ Options FollowSymLinks
+</Directory>
+
# -- use basic authentification from nagios3 package
# please adapt to your needs
-<DirectoryMatch (/usr/share/nagvis/htdocs|etc/nagvis(templates|gadgets)|/var/lib/nagvis)>
- Options FollowSymLinks
+<DirectoryMatch (/usr/share/nagvis/htdocs|etc/nagvis(templates|gadgets)|/var/lib/nagvis|/usr/share/doc/nagvis/docs)>
DirectoryIndex index.php
Order Allow,Deny
Modified: nagvis/tags/1.4.6-1.1+squeeze1/debian/changelog
===================================================================
--- nagvis/tags/1:1.4.6-1.1/debian/changelog 2011-09-07 21:46:30 UTC (rev 1966)
+++ nagvis/tags/1.4.6-1.1+squeeze1/debian/changelog 2011-09-17 19:14:59 UTC (rev 1967)
@@ -1,3 +1,16 @@
+nagvis (1:1.4.6-1.1+squeeze1) stable; urgency=low
+
+ * Add myself to uploaders
+ * Actually install the documentation
+ * Properly set "Options FollowSymLinks" in the apache configuration
+ (Closes: #632333)
+ * Only call ucf on purge if it's available (Closes: #620037)
+ * Set Path to gadget files in example configuration (via
+ patches/config.dpatch) (Closes: #611909)
+ * Document on how to activate nagvis after installation (Partly fixes #626456)
+
+ -- Alexander Reichle-Schmehl <tolimar at debian.org> Sat, 17 Sep 2011 21:58:51 +0300
+
nagvis (1:1.4.6-1.1) unstable; urgency=low
* Non-maintainer upload.
Modified: nagvis/tags/1.4.6-1.1+squeeze1/debian/control
===================================================================
--- nagvis/tags/1:1.4.6-1.1/debian/control 2011-09-07 21:46:30 UTC (rev 1966)
+++ nagvis/tags/1.4.6-1.1+squeeze1/debian/control 2011-09-17 19:14:59 UTC (rev 1967)
@@ -2,7 +2,7 @@
Section: net
Priority: extra
Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
-Uploaders: Jan Wagner <waja at cyconet.org>, Alexander Wirt <formorer at debian.org>, Hendrik Frenzel <hfrenzel at scunc.net>, Wolfgang Barth <wob at swobspace.net>
+Uploaders: Jan Wagner <waja at cyconet.org>, Alexander Wirt <formorer at debian.org>, Hendrik Frenzel <hfrenzel at scunc.net>, Wolfgang Barth <wob at swobspace.net>, Alexander Reichle-Schmehl <tolimar at debian.org>
Build-Depends: debhelper (>= 6.0.7~), dpatch
Standards-Version: 3.8.4
Homepage: http://www.nagvis.org
Modified: nagvis/tags/1.4.6-1.1+squeeze1/debian/install
===================================================================
--- nagvis/tags/1:1.4.6-1.1/debian/install 2011-09-07 21:46:30 UTC (rev 1966)
+++ nagvis/tags/1.4.6-1.1+squeeze1/debian/install 2011-09-17 19:14:59 UTC (rev 1967)
@@ -1,5 +1,6 @@
etc/* /etc/nagvis
nagvis/* /usr/share/nagvis/htdocs/nagvis
+docs /usr/share/doc/nagvis
wui/* /usr/share/nagvis/htdocs/wui
index.php /usr/share/nagvis/htdocs
debian/apache.conf /usr/share/nagvis/debian
Modified: nagvis/tags/1.4.6-1.1+squeeze1/debian/patches/config.dpatch
===================================================================
--- nagvis/tags/1:1.4.6-1.1/debian/patches/config.dpatch 2011-09-07 21:46:30 UTC (rev 1966)
+++ nagvis/tags/1.4.6-1.1+squeeze1/debian/patches/config.dpatch 2011-09-17 19:14:59 UTC (rev 1967)
@@ -5,10 +5,10 @@
## DP: changes default configs
@DPATCH@
-diff -urNad nagvis-1.4.6~/etc/nagvis.ini.php-sample nagvis-1.4.6/etc/nagvis.ini.php-sample
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagvis-1.4.6~/etc/nagvis.ini.php-sample nagvis-1.4.6/etc/nagvis.ini.php-sample
--- nagvis-1.4.6~/etc/nagvis.ini.php-sample 2010-02-04 21:51:13.000000000 +0100
-+++ nagvis-1.4.6/etc/nagvis.ini.php-sample 2010-03-01 18:40:01.000000000 +0100
-@@ -24,17 +24,26 @@
++++ nagvis-1.4.6/etc/nagvis.ini.php-sample 2011-09-07 14:19:01.000000000 +0200
+@@ -24,17 +24,27 @@
; Path definitions
[paths]
@@ -25,6 +25,7 @@
+headertemplate="/etc/nagvis/templates/header/"
+hovertemplate="/etc/nagvis/templates/hover/"
+contexttemplate="/etc/nagvis/templates/context/"
++gadget="/etc/nagvis/gadgets"
; absolute html NagVis path
-;htmlbase="/nagios/nagvis"
+htmlbase="/nagvis"
@@ -79,9 +80,9 @@
; ------------------------------------------------------------------------------
; Below you find some advanced stuff
-diff -urNad nagvis-1.4.6~/nagvis/includes/defines/global.php nagvis-1.4.6/nagvis/includes/defines/global.php
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagvis-1.4.6~/nagvis/includes/defines/global.php nagvis-1.4.6/nagvis/includes/defines/global.php
--- nagvis-1.4.6~/nagvis/includes/defines/global.php 2010-02-04 21:51:13.000000000 +0100
-+++ nagvis-1.4.6/nagvis/includes/defines/global.php 2010-03-01 18:39:30.000000000 +0100
++++ nagvis-1.4.6/nagvis/includes/defines/global.php 2011-09-07 14:18:33.000000000 +0200
@@ -61,13 +61,13 @@
define('DEBUGLEVEL', 4);
Modified: nagvis/tags/1.4.6-1.1+squeeze1/debian/postrm
===================================================================
--- nagvis/tags/1:1.4.6-1.1/debian/postrm 2011-09-07 21:46:30 UTC (rev 1966)
+++ nagvis/tags/1.4.6-1.1+squeeze1/debian/postrm 2011-09-17 19:14:59 UTC (rev 1967)
@@ -41,7 +41,9 @@
if [ "$1" = "purge" ]; then
for file in apache.conf nagvis.ini.php; do
rm -f /etc/nagvis/$file
- ucf --debconf-ok --purge /etc/nagvis/$file
+ if [ -x /usr/bin/ucf ] ; then
+ ucf --debconf-ok --purge /etc/nagvis/$file
+ fi
done
#if [ -e /etc/apache2/conf.d/nagvis.conf ]; then
More information about the Pkg-nagios-changes
mailing list