[SRM] nagvis upload for stable?
[ resending with corrected e-mail address; sorry if you get the mail
twice ]
Hi!
I just joined the pkg-nagios team and am now taking care of the nagvis
package, which is in a less than ideal state in the current release.
(I'm sorry, I NMUed the version in stable, but didn't noticed all
problems.)
I'd like to address the following problems:
#620037 - serious piuparts bug; package fails to purge
#611909 - Missing path for "gadgets" in created configuration
#632333 - Apache configuration error (Option FollowSymLinks)
The last three are of severity important, but as the point of nagvis is
to visualise nagios one could argue for each of them, if they aren't
serious by themself, by rendering parts of the package useless.
The fix for #620037 is in debian/postrm:
- ucf --debconf-ok --purge /etc/nagvis/$file
+ if [ -x /usr/bin/ucf ] ; then
+ ucf --debconf-ok --purge /etc/nagvis/$file
+ fi
The fix for #611909 is basically in debian/patches/config.dpatch:
++gadget="/etc/nagvis/gadgets"
(Adding an additional parth to the configuration file via already
existing dpatch patch.)
The fix for #632333 is in debian/apache.conf:
+# 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>
If possible, I'd also like to fix an unreported bug I just noticed
today: Documentation isn't installed.
The fix for that problem is quite easy, too: in debian/install:
+docs /usr/share/doc/nagvis
and in debian/apache.conf:
+Alias /nagvis/docs /usr/share/doc/nagvis/docs
-<DirectoryMatch
(/usr/share/nagvis/htdocs|etc/nagvis(templates|gadgets)|/var/lib/nagvis)>
+<DirectoryMatch
(/usr/share/nagvis/htdocs|etc/nagvis(templates|gadgets)|/var/lib/nagvis|/usr/share/doc/nagvis/docs)>
And finnally, I'd like to address #626456 a little bit, by adding that
to the README.Debian file.
Entire debdiff is attached.
Regards,
Alexander
diff -u nagvis-1.4.6/debian/README.Debian nagvis-1.4.6/debian/README.Debian
--- nagvis-1.4.6/debian/README.Debian
+++ nagvis-1.4.6/debian/README.Debian
@@ -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@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.
diff -u nagvis-1.4.6/debian/changelog nagvis-1.4.6/debian/changelog
--- nagvis-1.4.6/debian/changelog
+++ nagvis-1.4.6/debian/changelog
@@ -1,3 +1,15 @@
+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)
+
+ -- Alexander Reichle-Schmehl <tolimar@debian.org> Wed, 07 Sep 2011 21:43:21 +0200
+
nagvis (1:1.4.6-1.1) unstable; urgency=low
* Non-maintainer upload.
diff -u nagvis-1.4.6/debian/install nagvis-1.4.6/debian/install
--- nagvis-1.4.6/debian/install
+++ nagvis-1.4.6/debian/install
@@ -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
diff -u nagvis-1.4.6/debian/postrm nagvis-1.4.6/debian/postrm
--- nagvis-1.4.6/debian/postrm
+++ nagvis-1.4.6/debian/postrm
@@ -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
diff -u nagvis-1.4.6/debian/apache.conf nagvis-1.4.6/debian/apache.conf
--- nagvis-1.4.6/debian/apache.conf
+++ nagvis-1.4.6/debian/apache.conf
@@ -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
diff -u nagvis-1.4.6/debian/control nagvis-1.4.6/debian/control
--- nagvis-1.4.6/debian/control
+++ nagvis-1.4.6/debian/control
@@ -2,7 +2,7 @@
Section: net
Priority: extra
Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org>
-Uploaders: Jan Wagner <waja@cyconet.org>, Alexander Wirt <formorer@debian.org>, Hendrik Frenzel <hfrenzel@scunc.net>, Wolfgang Barth <wob@swobspace.net>
+Uploaders: Jan Wagner <waja@cyconet.org>, Alexander Wirt <formorer@debian.org>, Hendrik Frenzel <hfrenzel@scunc.net>, Wolfgang Barth <wob@swobspace.net>, Alexander Reichle-Schmehl <tolimar@debian.org>
Build-Depends: debhelper (>= 6.0.7~), dpatch
Standards-Version: 3.8.4
Homepage: http://www.nagvis.org
diff -u nagvis-1.4.6/debian/patches/config.dpatch nagvis-1.4.6/debian/patches/config.dpatch
--- nagvis-1.4.6/debian/patches/config.dpatch
+++ nagvis-1.4.6/debian/patches/config.dpatch
@@ -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);
Reply to: