[Pkg-nagios-changes] [pkg-nagios] r1756 - nagios3/trunk/debian
Alexander Wirt
formorer at alioth.debian.org
Sat Sep 19 08:05:17 UTC 2009
Author: formorer
Date: 2009-09-19 08:05:15 +0000 (Sat, 19 Sep 2009)
New Revision: 1756
Added:
nagios3/trunk/debian/nagios3-core.dirs
nagios3/trunk/debian/nagios3-core.links
nagios3/trunk/debian/nagios3-core.manpages
nagios3/trunk/debian/nagios3-core.postinst
nagios3/trunk/debian/nagios3-core.prerm
nagios3/trunk/debian/nagios3.links
Removed:
nagios3/trunk/debian/nagios3.dirs
nagios3/trunk/debian/nagios3.links
nagios3/trunk/debian/nagios3.manpages
nagios3/trunk/debian/nagios3.postinst
nagios3/trunk/debian/nagios3.prerm
Modified:
nagios3/trunk/debian/control
nagios3/trunk/debian/rules
Log:
Introduce nagios3-core package
Modified: nagios3/trunk/debian/control
===================================================================
--- nagios3/trunk/debian/control 2009-09-19 07:52:21 UTC (rev 1755)
+++ nagios3/trunk/debian/control 2009-09-19 08:05:15 UTC (rev 1756)
@@ -73,8 +73,7 @@
Package: nagios3
Architecture: any
-Depends: ${shlibs:Depends}, nagios3-common (= ${source:Version}), ${perl:Depends}, ${misc:Depends}
-Recommends: nagios3-cgi (= ${source:Version})
+Depends: nagios3-common (= ${source:Version}), nagios3-cgi (= ${source:Version})
Suggests: nagios-nrpe-plugin
Description: A host/service/network monitoring and management system
Nagios is a monitoring and management system for hosts, services and
@@ -93,6 +92,8 @@
.
Nagios was written in C and is designed to be easy to understand and modify
to fit your own needs.
+ .
+ This is a metapackage which depends on the nagios core and the webfrontend
.
This package is the new version 3.x series of nagios, which replaced
the 2.x versions.
@@ -102,6 +103,39 @@
.
Upstream URL: http://www.nagios.org/
+Package: nagios3-core
+Architecture: any
+Depends: ${shlibs:Depends}, nagios3-common (= ${source:Version}), ${perl:Depends}, ${misc:Depends}
+Suggests: nagios-nrpe-plugin
+Replaces: nagios3
+Description: A host/service/network monitoring and management system core files
+ Nagios is a monitoring and management system for hosts, services and
+ networks.
+ .
+ Nagios' features include:
+ .
+ o Monitoring of network services (via TCP port, SMTP, POP3, HTTP, NNTP,
+ PING, etc.)
+ o Plugin interface to allow for user-developed service checks
+ o Contact notifications when problems occur and get resolved (via email,
+ pager, or user-defined method)
+ o Ability to define event handlers to be run during service or host events
+ (for proactive problem resolution)
+ o Web output (current status, notifications, problem history, log file, etc.)
+ .
+ This package included the nagios core without the webfrontend
+ .
+ Nagios was written in C and is designed to be easy to understand and modify
+ to fit your own needs.
+ .
+ This package is the new version 3.x series of nagios, which replaced
+ the 2.x versions.
+ .
+ Nagios is a replacement of the Netsaint project. It accepts and uses the
+ previous Netsaint modules transparently.
+ .
+ Upstream URL: http://www.nagios.org/
+
Package: nagios3-doc
Section: doc
Architecture: all
Copied: nagios3/trunk/debian/nagios3-core.dirs (from rev 1751, nagios3/trunk/debian/nagios3.dirs)
===================================================================
--- nagios3/trunk/debian/nagios3-core.dirs (rev 0)
+++ nagios3/trunk/debian/nagios3-core.dirs 2009-09-19 08:05:15 UTC (rev 1756)
@@ -0,0 +1,2 @@
+usr/sbin
+usr/lib/nagios3
Copied: nagios3/trunk/debian/nagios3-core.links (from rev 1751, nagios3/trunk/debian/nagios3.links)
===================================================================
--- nagios3/trunk/debian/nagios3-core.links (rev 0)
+++ nagios3/trunk/debian/nagios3-core.links 2009-09-19 08:05:15 UTC (rev 1756)
@@ -0,0 +1 @@
+usr/share/doc/nagios3-common usr/share/doc/nagios3-core
Copied: nagios3/trunk/debian/nagios3-core.manpages (from rev 1751, nagios3/trunk/debian/nagios3.manpages)
===================================================================
--- nagios3/trunk/debian/nagios3-core.manpages (rev 0)
+++ nagios3/trunk/debian/nagios3-core.manpages 2009-09-19 08:05:15 UTC (rev 1756)
@@ -0,0 +1,2 @@
+debian/nagios3.8
+debian/nagios3stats.8
Copied: nagios3/trunk/debian/nagios3-core.postinst (from rev 1751, nagios3/trunk/debian/nagios3.postinst)
===================================================================
--- nagios3/trunk/debian/nagios3-core.postinst (rev 0)
+++ nagios3/trunk/debian/nagios3-core.postinst 2009-09-19 08:05:15 UTC (rev 1756)
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+#if we stop nagios3 in nagios3.prerm we should also start it here..
+#(#481334)
+if [ -x "/etc/init.d/nagios3" ]; then
+ if ! /etc/init.d/nagios3 status >/dev/null; then
+
+ if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+ invoke-rc.d nagios3 start || true
+ else
+ /etc/init.d/nagios3 start || true
+ fi
+ fi
+fi
+
+#DEBHELPER#
Copied: nagios3/trunk/debian/nagios3-core.prerm (from rev 1751, nagios3/trunk/debian/nagios3.prerm)
===================================================================
--- nagios3/trunk/debian/nagios3-core.prerm (rev 0)
+++ nagios3/trunk/debian/nagios3-core.prerm 2009-09-19 08:05:15 UTC (rev 1756)
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+# we attempt to stop nagios3 twice, once in nagios3-common's prerm
+# and once here. otherwise, if nagios3+nagios3-common are being purged,
+# the /usr/sbin/nagios3 binary could disappear before nagios3-common's
+# prerm script runs, which would prevent it from being able to stop
+# the binary.
+if [ -x "/etc/init.d/nagios3" ]; then
+ if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+ invoke-rc.d nagios3 stop || true
+ else
+ /etc/init.d/nagios3 stop || true
+ fi
+fi
+
+#DEBHELPER#
Deleted: nagios3/trunk/debian/nagios3.dirs
===================================================================
--- nagios3/trunk/debian/nagios3.dirs 2009-09-19 07:52:21 UTC (rev 1755)
+++ nagios3/trunk/debian/nagios3.dirs 2009-09-19 08:05:15 UTC (rev 1756)
@@ -1,2 +0,0 @@
-usr/sbin
-usr/lib/nagios3
Deleted: nagios3/trunk/debian/nagios3.links
===================================================================
--- nagios3/trunk/debian/nagios3.links 2009-09-19 07:52:21 UTC (rev 1755)
+++ nagios3/trunk/debian/nagios3.links 2009-09-19 08:05:15 UTC (rev 1756)
@@ -1 +0,0 @@
-usr/share/doc/nagios3-common usr/share/doc/nagios3
Added: nagios3/trunk/debian/nagios3.links
===================================================================
--- nagios3/trunk/debian/nagios3.links (rev 0)
+++ nagios3/trunk/debian/nagios3.links 2009-09-19 08:05:15 UTC (rev 1756)
@@ -0,0 +1 @@
+usr/share/doc/nagios3-common usr/share/doc/nagios3
Deleted: nagios3/trunk/debian/nagios3.manpages
===================================================================
--- nagios3/trunk/debian/nagios3.manpages 2009-09-19 07:52:21 UTC (rev 1755)
+++ nagios3/trunk/debian/nagios3.manpages 2009-09-19 08:05:15 UTC (rev 1756)
@@ -1,2 +0,0 @@
-debian/nagios3.8
-debian/nagios3stats.8
Deleted: nagios3/trunk/debian/nagios3.postinst
===================================================================
--- nagios3/trunk/debian/nagios3.postinst 2009-09-19 07:52:21 UTC (rev 1755)
+++ nagios3/trunk/debian/nagios3.postinst 2009-09-19 08:05:15 UTC (rev 1756)
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-#if we stop nagios3 in nagios3.prerm we should also start it here..
-#(#481334)
-if [ -x "/etc/init.d/nagios3" ]; then
- if ! /etc/init.d/nagios3 status >/dev/null; then
-
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d nagios3 start || true
- else
- /etc/init.d/nagios3 start || true
- fi
- fi
-fi
-
-#DEBHELPER#
Deleted: nagios3/trunk/debian/nagios3.prerm
===================================================================
--- nagios3/trunk/debian/nagios3.prerm 2009-09-19 07:52:21 UTC (rev 1755)
+++ nagios3/trunk/debian/nagios3.prerm 2009-09-19 08:05:15 UTC (rev 1756)
@@ -1,16 +0,0 @@
-#!/bin/sh -e
-
-# we attempt to stop nagios3 twice, once in nagios3-common's prerm
-# and once here. otherwise, if nagios3+nagios3-common are being purged,
-# the /usr/sbin/nagios3 binary could disappear before nagios3-common's
-# prerm script runs, which would prevent it from being able to stop
-# the binary.
-if [ -x "/etc/init.d/nagios3" ]; then
- if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
- invoke-rc.d nagios3 stop || true
- else
- /etc/init.d/nagios3 stop || true
- fi
-fi
-
-#DEBHELPER#
Modified: nagios3/trunk/debian/rules
===================================================================
--- nagios3/trunk/debian/rules 2009-09-19 07:52:21 UTC (rev 1755)
+++ nagios3/trunk/debian/rules 2009-09-19 08:05:15 UTC (rev 1756)
@@ -9,6 +9,7 @@
bnc := $b/nagios3-common
bncgi := $b/nagios3-cgi
bnd := $b/nagios3-doc
+bnco := $b/nagios3-core
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -137,12 +138,12 @@
chown root:www-data ${bnc}/var/lib/nagios3/rw
chmod 700 ${bnc}/var/lib/nagios3/rw
# alter some installed filenames/locations
- mv ${b}/nagios3/usr/sbin/nagios ${b}/nagios3/usr/sbin/nagios3
- mv ${b}/nagios3/usr/sbin/nagiostats ${b}/nagios3/usr/sbin/nagios3stats
- mv ${b}/nagios3/usr/sbin/p1.pl ${b}/nagios3/usr/lib/nagios3/p1.pl
+ mv ${b}/nagios3/usr/sbin/nagios ${b}/nagios3-core/usr/sbin/nagios3
+ mv ${b}/nagios3/usr/sbin/nagiostats ${b}/nagios3-core/usr/sbin/nagios3stats
+ mv ${b}/nagios3/usr/sbin/p1.pl ${b}/nagios3-core/usr/lib/nagios3/p1.pl
mv ${b}/nagios3-doc/usr/share/nagios3/htdocs/stylesheets/* ${b}/nagios3-cgi/etc/nagios3/stylesheets
rmdir ${b}/nagios3-doc/usr/share/nagios3/htdocs/stylesheets/
- chmod 755 ${b}/nagios3/usr/lib/nagios3/p1.pl
+ chmod 755 ${b}/nagios3-core/usr/lib/nagios3/p1.pl
dh_link -i
dh_installdocs -i
dh_installman -a -pnagios3
More information about the Pkg-nagios-changes
mailing list