[Pkg-nagios-devel] nagios apache.conf,1.2,1.3 changelog,1.65,1.66 control,1.11,1.12 nagios-common.config,1.1,1.2 nagios-common.install,1.5,1.6 nagios-common.postinst,1.13,1.14 nagios-common.templates,1.1,1.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-serv14727
Modified Files:
apache.conf changelog control nagios-common.config
nagios-common.install nagios-common.postinst
nagios-common.templates
Log Message:
removed all netsaint references
Index: apache.conf
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/apache.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- apache.conf 16 Apr 2005 04:59:41 -0000 1.2
+++ apache.conf 4 Jul 2005 16:46:33 -0000 1.3
@@ -33,7 +33,6 @@
#ScriptAlias /nagios/side.html /usr/lib/cgi-bin/nagios/grouplist.cgi
# Where the HTML pages live(d)
-Alias /netsaint /usr/share/nagios/htdocs
Alias /nagios /usr/share/nagios/htdocs
<DirectoryMatch /usr/share/nagios/htdocs>
Options FollowSymLinks
Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- changelog 4 Jul 2005 04:31:28 -0000 1.65
+++ changelog 4 Jul 2005 16:46:34 -0000 1.66
@@ -1,3 +1,12 @@
+nagios (2:1.3-cvs.20050402-5) UNRELEASED; urgency=low
+
+ * Sean Finney:
+ - removed the upgrade scripts and all other references to netsaint,
+ as now there's a full debian release between us and when netsaint
+ was part of the archive.
+
+ -- sean finney <seanius@debian.org> Mon, 04 Jul 2005 12:45:54 -0400
+
nagios (2:1.3-cvs.20050402-4) unstable; urgency=low
* Sean Finney:
Index: control
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/control,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- control 4 Jul 2005 04:26:12 -0000 1.11
+++ control 4 Jul 2005 16:46:34 -0000 1.12
@@ -10,7 +10,7 @@
Architecture: all
Depends: nagios, fileutils (>=4.0y) | coreutils (>= 4.5.3), apache | httpd, mailx, nagios-plugins (>= 1.3.1.0-6), adduser, ${misc:Depends}
Conflicts: nagios-text (<= 2:1.2-3.6), nagios-mysql (<= 2:1.2-3.6), nagios-pgsql (<= 2:1.2-3.6)
-Replaces: netsaint, nagios
+Replaces: nagios
Description: A host/service/network monitoring and management system
Nagios is a replacement of the Netsaint project. It accept and uses the
previous Netsaint modules transparently.
@@ -35,8 +35,8 @@
Package: nagios-text
Architecture: any
Depends: ${shlibs:Depends}, nagios-common (= ${Source-Version})
-Conflicts: netsaint, nagios
-Replaces: netsaint, nagios
+Conflicts: nagios
+Replaces: nagios
Provides: nagios
Description: A host/service/network monitoring and management system
Nagios is a replacement of the Netsaint project. It accept and uses the
@@ -63,8 +63,8 @@
Architecture: any
Depends: ${shlibs:Depends}, nagios-common (= ${Source-Version})
Recommends: libdbd-pg-perl
-Conflicts: netsaint, nagios
-Replaces: netsaint, nagios
+Conflicts: nagios
+Replaces: nagios
Provides: nagios
Description: A host/service/network monitoring and management system
Nagios is a replacement of the Netsaint project. It accept and uses the
@@ -91,8 +91,8 @@
Architecture: any
Depends: ${shlibs:Depends}, nagios-common (= ${Source-Version})
Recommends: libdbd-mysql-perl
-Conflicts: netsaint, nagios
-Replaces: netsaint, nagios
+Conflicts: nagios
+Replaces: nagios
Provides: nagios
Description: A host/service/network monitoring and management system
Nagios is a replacement of the Netsaint project. It accept and uses the
Index: nagios-common.config
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nagios-common.config 9 Nov 2004 23:30:07 -0000 1.1
+++ nagios-common.config 4 Jul 2005 16:46:34 -0000 1.2
@@ -18,8 +18,3 @@
true
fi
-# If the Netsaint configuration exists, warn...
-if [ -f /etc/netsaint/netsaint.cfg ]; then
- db_input medium nagios/upgradefromnetsaint || true
- db_go
-fi
Index: nagios-common.install
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.install,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- nagios-common.install 8 Mar 2005 23:07:50 -0000 1.5
+++ nagios-common.install 4 Jul 2005 16:46:34 -0000 1.6
@@ -11,6 +11,5 @@
html/images/logos/*.* usr/share/nagios/htdocs/images/logos
sample-config/*.cfg sample-config/template-object/*.cfg etc/nagios/
debian/apache.conf etc/nagios/
-debian/upgrade-netsaint2nagios usr/sbin/
debian/checkcommands.cfg etc/nagios/
debian/check-imap usr/lib/nagios/plugins
Index: nagios-common.postinst
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.postinst,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- nagios-common.postinst 4 Jul 2005 04:26:12 -0000 1.13
+++ nagios-common.postinst 4 Jul 2005 16:46:34 -0000 1.14
@@ -202,14 +202,6 @@
mv $TMPFILE /etc/nagios/hosts.cfg
fi
-if [ ! -L /usr/lib/nagios/plugins/check_nagios -a \
- ! -f /usr/lib/nagios/plugins/check_nagios -a \
- -e /usr/lib/nagios/plugins/check_netsaint ]
-then
- (cd /usr/lib/nagios/plugins ; \
- ln -s /usr/lib/nagios/plugins/check_netsaint check_nagios)
-fi
-
# Make sure the config file is readable by both nagios
# and apache
chown -R nagios:www-data /var/log/nagios /etc/nagios /var/run/nagios /var/cache/nagios
Index: nagios-common.templates
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.templates,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nagios-common.templates 13 Nov 2004 23:56:20 -0000 1.1
+++ nagios-common.templates 4 Jul 2005 16:46:34 -0000 1.2
@@ -49,11 +49,3 @@
the file /var/run/nagios/nagios.cmd. The Debian packaged version can
support this by running setuid to the Nagios user.
-Template: nagios/upgradefromnetsaint
-Type: note
-_Description: Upgrading from Netsaint
- I see that you've been running Netsaint (at least there's a Netsaint
- configuration). Nagios is Netsaint with another name (and quite a big
- change in code base) using a different type of configuration. To migrate
- the Netsaint configuration to Nagios format, please execute the command
- /usr/sbin/upgrade-netsaint2nagios.