[Pkg-nagios-devel] nagios nagios-common.dirs,NONE,1.1 nagios-common.install,NONE,1.1 changelog,1.7,1.8 config,1.1.1.1,1.2 control,1.4,1.5 copyright,1.2,1.3 nagios-mysql.dirs,1.2,1.3 nagios-mysql.install,1.3,1.4 nagios-pgsql.dirs,1.2,1.3 nagios-pgsql.install,1.3,1.4 nagios-text.dirs,1.2,1.3 postinst,1.3,1.4 postrm,1.1.1.1,1.2 templates,1.1.1.1,1.2 conffiles,1.1.1.1,NONE nagios-text.install,1.2,NONE

joerg@haydn.debian.org joerg@haydn.debian.org


Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/tmp/cvs-serv25861

Modified Files:
	changelog config control copyright nagios-mysql.dirs 
	nagios-mysql.install nagios-pgsql.dirs nagios-pgsql.install 
	nagios-text.dirs postinst postrm templates 
Added Files:
	nagios-common.dirs nagios-common.install 
Removed Files:
	conffiles nagios-text.install 
Log Message:
Split is started, but not fully done yet, rest is for monday evening.
Worked a bit on debconf, postinst and postrm part. Should work but needs testing,
and postinst needs a second touch, i simply ignored the last half of the file for
today. :)
Added: 2 files for nagios-common, removed the now empty nagios-text.install
Thats the changelog entrie stuff for it:
    - Lets split the package a bit more and add a nagios-common package to it.
      Move all files that are similar in all 3 existing nagios packages to
      this new package and let all 3 depend on it. Move most of the Package
      dependencies to the -common package. Let all 3 packages depend on the new
      -common one, and let the common one depend on our Virtual Package "nagios".
    - Remove ucf dependency, wasnt used.
    - Remove debconf warnings for upgrades from versions years ago noone has anymore.
    - Revised postinst script, dont modify apaches config directly, put a symlink in
      the conf.d directory which gets automagically included by apache.
    - Revised postrm script for new methods.
    - We now dont check with ps and some greps for apache to reload it anymore. We
      simply issue a reload as this reloads config but doesnt restart server if it
      is not running.


--- NEW FILE: nagios-common.dirs ---
etc/init.d
etc/nagios/stylesheets
usr/sbin
usr/lib/nagios/plugins/eventhandlers
usr/share/nagios/htdocs
usr/share/nagios/pluginconfig
var/log/nagios
var/run/nagios
var/lib/nagios
var/cache/nagios

--- NEW FILE: nagios-common.install ---
contrib/eventhandlers/* usr/lib/nagios/plugins/eventhandlers
debian/apache.conf etc/nagios/
debian/update-nagios usr/sbin/
debian/upgrade-netsaint2nagios usr/sbin/
debian/command.cfg etc/nagios/
debian/check-imap usr/lib/nagios/plugins

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- changelog	4 Nov 2004 05:04:35 -0000	1.7
+++ changelog	7 Nov 2004 23:18:46 -0000	1.8
@@ -22,6 +22,19 @@
     - Try to clean the install-stamp: target a bit and do more things with
       dh_install, to get a more readable rules file.
     - Rename check_imap.sh to check_imap
+    - Lets split the package a bit more and add a nagios-common package to it.
+      Move all files that are similar in all 3 existing nagios packages to
+      this new package and let all 3 depend on it. Move most of the Package
+      dependencies to the -common package. Let all 3 packages depend on the new
+      -common one, and let the common one depend on our Virtual Package "nagios".
+    - Remove ucf dependency, wasnt used.
+    - Remove debconf warnings for upgrades from versions years ago noone has anymore.
+    - Revised postinst script, dont modify apaches config directly, put a symlink in
+      the conf.d directory which gets automagically included by apache.
+    - Revised postrm script for new methods.
+    - We now dont check with ps and some greps for apache to reload it anymore. We
+      simply issue a reload as this reloads config but doesnt restart server if it
+      is not running.
   * Sean Finney:
     - added danish and catalan debconf translations.  thanks go to 
       Claus Hindsgaul and Aleix Badia i Bosch respectively.  

Index: config
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/config,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- config	31 Oct 2004 09:59:28 -0000	1.1.1.1
+++ config	7 Nov 2004 23:18:46 -0000	1.2
@@ -18,20 +18,6 @@
 	true
 fi
 
-# Warn about upgrade?
-if [ "$2" ] && dpkg --compare-versions $2 lt 0.0.6b1-1 ; then
-	db_input high nagios/warnupgrade_5_6 || true
-	db_go
-fi
-if [ "$2" ] && dpkg --compare-versions $2 lt 0.0.6stable8 ; then
-	db_input high nagios/warnmovedcommands || true
-	db_go
-fi
-if [ "$2" ] && dpkg --compare-versions $2 lt 0.0.7 ; then
-	db_input high nagios/warncoords || true
-	db_go
-fi
-
 # If the Netsaint configuration exists, warn...
 if [ -f /etc/netsaint/netsaint.cfg ]; then
 	db_input medium nagios/upgradefromnetsaint || true

Index: control
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/control,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- control	1 Nov 2004 02:51:20 -0000	1.4
+++ control	7 Nov 2004 23:18:46 -0000	1.5
@@ -2,13 +2,37 @@
 Section: net
 Priority: optional
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org>
-Uploaders: Joerg Jaspert <joerg@debian.org>, Jeremy T. Bouse" <jbouse@debian.org>, Tony Mancill <tony@mancill.com>, Sean Finney <seanius@debian.org>, Martin F. Krafft <madduck@debian.org>
+Uploaders: Joerg Jaspert <joerg@debian.org>, Jeremy T. Bouse" <jbouse@debian.org>, Tony Mancill <tony@mancill.com>, Sean Finney <seanius@debian.org>, Guido Trotter <ultrotter@quaqua.net>
 Standards-Version: 3.6.1
 Build-Depends: debhelper (>= 4.2.21), dpatch (>= 2.0.10), libpng12-dev, libgd2-noxpm-dev (>= 2.0.1) | libgd2-xpm-dev (>= 2.0.1), iputils-ping, postgresql-dev (>= 7.2), libmysqlclient10-dev
 
+Package: nagios-common
+Architecture: all
+Depends: nagios, ${shlibs:Depends}, fileutils (>=4.0y) | coreutils (>= 4.5.3), apache | httpd, mailx, nagios-plugins (>= 1.3.1.0-6), adduser, debconf
+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.
+ .
+ Nagios is a host/service/network monitoring and management system. It has
+ the following features: 
+ .
+ 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.) 
+ .
+ Nagios was written in C and is designed to be easy to understand and modify
+ to fit your own needs.
+ .
+ This package contains the common files for all the other nagios packages.
+
 Package: nagios-text
 Architecture: any
-Depends: ${shlibs:Depends}, fileutils (>=4.0y) | coreutils (>= 4.5.3), apache | httpd, mailx, nagios-plugins (>= 1.3.1.0-6), ucf, adduser, debconf
+Depends: ${shlibs:Depends}, nagios-common (= ${Source-Version})
 Conflicts: netsaint, nagios
 Replaces: netsaint, nagios
 Provides: nagios
@@ -35,7 +59,7 @@
 
 Package: nagios-pgsql
 Architecture: any
-Depends: ${shlibs:Depends}, fileutils (>=4.0y) | coreutils (>= 4.5.3), apache | httpd, nagios-plugins (>= 1.3.1.0-6), ucf, adduser, debconf
+Depends: ${shlibs:Depends}, nagios-common (= ${Source-Version})
 Conflicts: netsaint, nagios
 Replaces: netsaint, nagios
 Provides: nagios
@@ -62,7 +86,7 @@
 
 Package: nagios-mysql
 Architecture: any
-Depends: ${shlibs:Depends}, fileutils (>=4.0y) | coreutils (>= 4.5.3), apache | httpd, nagios-plugins (>= 1.3.1.0-6), ucf, adduser, debconf
+Depends: ${shlibs:Depends}, nagios-common (= ${Source-Version})
 Conflicts: netsaint, nagios
 Replaces: netsaint, nagios
 Provides: nagios

Index: copyright
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/copyright,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- copyright	31 Oct 2004 14:52:44 -0000	1.2
+++ copyright	7 Nov 2004 23:18:46 -0000	1.3
@@ -9,6 +9,7 @@
 			   				Jeremy T. Bouse <jbouse@debian.org>
 							Tony Mancill <tony@mancill.com>
 							Sean Finney <seanius@seanius.net>
+							Guido Trotter <ultrotter@quaqua.net>
 Mailing-List: 				pkg-nagios-devel@lists.alioth.debian.org
 
 Copyright:

Index: nagios-mysql.dirs
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-mysql.dirs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nagios-mysql.dirs	4 Nov 2004 22:42:50 -0000	1.2
+++ nagios-mysql.dirs	7 Nov 2004 23:18:46 -0000	1.3
@@ -1,12 +1,2 @@
-etc/init.d
-etc/nagios
 usr/sbin
 usr/lib/cgi-bin/nagios
-usr/lib/nagios
-usr/lib/nagios/plugins/eventhandlers
-usr/share/nagios/htdocs
-usr/share/nagios/pluginconfig
-var/log/nagios
-var/run/nagios
-var/lib/nagios
-var/cache/nagios

Index: nagios-mysql.install
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-mysql.install,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- nagios-mysql.install	3 Nov 2004 22:32:03 -0000	1.3
+++ nagios-mysql.install	7 Nov 2004 23:18:46 -0000	1.4
@@ -1,8 +1,2 @@
 debian/README.mysql usr/share/doc/nagios-mysql/
 contrib/database/create_mysql usr/share/doc/nagios-mysql/
-debian/apache.conf etc/nagios/
-contrib/eventhandlers/* usr/lib/nagios/plugins/eventhandlers/
-debian/update-nagios usr/sbin/
-debian/upgrade-netsaint2nagios usr/sbin/
-debian/command.cfg etc/nagios/
-debian/check-imap usr/lib/nagios/plugins/

Index: nagios-pgsql.dirs
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-pgsql.dirs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nagios-pgsql.dirs	4 Nov 2004 22:42:50 -0000	1.2
+++ nagios-pgsql.dirs	7 Nov 2004 23:18:46 -0000	1.3
@@ -1,12 +1,2 @@
-etc/init.d
-etc/nagios
 usr/sbin
 usr/lib/cgi-bin/nagios
-usr/lib/nagios
-usr/lib/nagios/plugins/eventhandlers
-usr/share/nagios/htdocs
-usr/share/nagios/pluginconfig
-var/log/nagios
-var/run/nagios
-var/lib/nagios
-var/cache/nagios

Index: nagios-pgsql.install
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-pgsql.install,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- nagios-pgsql.install	3 Nov 2004 22:32:03 -0000	1.3
+++ nagios-pgsql.install	7 Nov 2004 23:18:46 -0000	1.4
@@ -1,7 +1 @@
 contrib/database/create_pgsql usr/share/doc/nagios-pgsql/
-debian/apache.conf etc/nagios/
-contrib/eventhandlers/* usr/lib/nagios/plugins/eventhandlers
-debian/update-nagios usr/sbin/
-debian/upgrade-netsaint2nagios usr/sbin/
-debian/command.cfg etc/nagios/
-debian/check-imap usr/lib/nagios/plugins/

Index: nagios-text.dirs
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-text.dirs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nagios-text.dirs	4 Nov 2004 22:42:50 -0000	1.2
+++ nagios-text.dirs	7 Nov 2004 23:18:46 -0000	1.3
@@ -1,12 +1,2 @@
-etc/init.d
-etc/nagios
 usr/sbin
 usr/lib/cgi-bin/nagios
-usr/lib/nagios
-usr/lib/nagios/plugins/eventhandlers
-usr/share/nagios/htdocs
-usr/share/nagios/pluginconfig
-var/log/nagios
-var/run/nagios
-var/lib/nagios
-var/cache/nagios

Index: postinst
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/postinst,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- postinst	4 Nov 2004 22:42:50 -0000	1.3
+++ postinst	7 Nov 2004 23:18:46 -0000	1.4
@@ -8,9 +8,6 @@
 # Source debconf library.
 . /usr/share/debconf/confmodule
 
-# Apache/Apache-SSL location. Apache2 is overwritten below
-htpasswd="/usr/bin/htpasswd"
-
 # summary of how this script can be called:
 #        * <postinst> `configure' <most-recently-configured-version>
 #        * <old-postinst> `abort-upgrade' <new version>
@@ -30,44 +27,62 @@
 
 # Restart apache/apache-ssl
 restartapache () {
-    if /bin/ps ax | grep -v grep | grep -q apache; then
 	if [ -x "/etc/init.d/apache2" ]; then
-	    set +e ; invoke-rc.d apache2 reload ; set -e
+		invoke-rc.d apache2 reload || true
 	else
 	    for apache in $webservers; do
-		if /bin/ps ax | grep -v grep | grep -q $apache; then
 		    if [ -x "/etc/init.d/$apache" ]; then
-			set +e ; invoke-rc.d $apache reload ; set -e
+				invoke-rc.d $apache reload || true
 		    fi
-		fi
 	    done
-	fi
     fi
 }
 
 # Automatic Apache Configuration:
 configapache () {
+	removeoldapache
     for apache in $webservers; do
+	if [ -d "/etc/$apache/conf.d" ]; then
+		ln -s /etc/nagios/apache.conf /etc/$apache/conf.d/nagios
+	fi
+    done
+
+    restartapache
+}
+
+# Remove old entries in httpd.conf
+removeoldapache () {
+    for apache in $webservers; do
+
 	if [ "$apache" = "apache2" ]; then
 	    conf=apache2.conf
 	else
 	    conf=httpd.conf
 	fi
 
-	if [ -f "/etc/$apache/$conf" ]; then
-	    if ! cat "/etc/$apache/$conf" | egrep -q 'NAGIOS|^Include.*/nagios/'; then
-		# No Nagios config/include
-		echo 'Include /etc/nagios/apache.conf' >> /etc/$apache/$conf
-	    fi
+	if grep -qs "^Include /etc/nagios/apache.conf" /etc/$webserver/$conf; then
+		mv -f /etc/$webserver/$conf /etc/$webserver/$conf.old.nagios
+		grep -v "^Include /etc/nagios/apache.conf" /etc/$webserver/$conf.old.nagios \
+			> /etc/$webserver/$conf
+	fi
+	if ! grep -qs "^Include /etc/$webserver/conf.d" /etc/$webserver/$conf; then
+		cp -f /etc/$webserver/$conf /etc/$webserver/$conf.old.nagios
+		echo "Include /etc/$webserver/conf.d" >> /etc/$webserver/$conf
+		mkdir -p /etc/$webserver/$conf
+	fi
+	if [ -f /etc/$webserver/$conf.old.nagios ]; then
+		mv -f /etc/$webserver/$conf.old.nagios /etc/$webserver/$conf.old
 	fi
     done
-
-    restartapache
 }
 
 # Do postinst
 case "$1" in
     configure|upgrade)
+
+    # Apache/Apache-SSL location. Apache2 is overwritten below
+	htpasswd="/usr/bin/htpasswd"
+
 	db_get nagios/configapache
 	webserver="$RET"
 	case "$webserver" in
@@ -120,6 +135,9 @@
 		perl -wpi -e 's[^check_external_commands=1][check_external_commands=0]' /etc/nagios/nagios.cfg
 	fi
 
+	# We are finished with debconf
+	db_stop
+
 	if [ -f /etc/nagios/htpasswd.users ]; then
 	    # Make sure some files aren't world readable, may contain sensitive information
 	    chmod 640 /etc/nagios/htpasswd.users /etc/nagios/cgi.cfg /etc/nagios/resource.cfg
@@ -148,10 +166,6 @@
 	    fi
 	done
 	
-	## Sym link docs
-	#if [ ! -e /usr/share/doc/nagios/html ] ; then
-        #      	ln -s /usr/share/nagios/docs /usr/share/doc/nagios/html
-	#fi
 	;;
     abort-upgrade|abort-remove|abort-deconfigure)
 	;;

Index: postrm
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/postrm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- postrm	31 Oct 2004 09:59:29 -0000	1.1.1.1
+++ postrm	7 Nov 2004 23:18:46 -0000	1.2
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postrm script for netsaint
+# postrm script for nagios
 #
 # see: dh_installdeb(1)
 
@@ -19,34 +19,15 @@
 #        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
 # for details, see /usr/doc/packaging-manual/
 
-configapache () {
-    for apache in $webservers; do
-	if [ -f "/etc/$apache/srm.conf" ] ; then
-	    # Remove from srm.conf (old method)
-	    perl -pe 'BEGIN { $/ = undef } ; s/\n# BEGIN FOR NAGIOS.*# END FOR NAGIOS\n//ms;' < /etc/$apache/srm.conf > /etc/$apache/srm.conf-dpkg.nagios
-	    mv /etc/$apache/srm.conf-dpkg.nagios /etc/$apache/srm.conf
-	fi
-
-	if [ "$apache" = "apache2" ]; then
-	    conf=apache2.conf
+reloadapache () {
+	if [ -x "/etc/init.d/apache2" ]; then
+		invoke-rc.d apache2 reload || true
 	else
-	    conf=httpd.conf
-	fi
-
-	if [ -f "/etc/$apache/$conf" ] ; then
-	    # Remove from httpd.conf (current method)
-	    perl -pe 'BEGIN { $/ = undef } ; s/\n# BEGIN FOR NAGIOS.*# END FOR NAGIOS\n//ms;' \
-		< /etc/$apache/$conf > /etc/$apache/$conf-dpkg.nagios
-	    mv /etc/$apache/$conf-dpkg.nagios /etc/$apache/$conf
-	fi
-    done
-
-    if /bin/ps ax | grep -v grep | grep -q apache; then
-	if [ -x "/etc/init.d/apache" ]; then
-	    set +e ; invoke-rc.d apache  reload ; set -e
-	elif [ -x "/etc/init.d/apache2" ]; then
-	    set +e ; invoke-rc.d apache2 reload ; set -e
-	fi
+	    for apache in $webservers; do
+		    if [ -x "/etc/init.d/$apache" ]; then
+				invoke-rc.d $apache reload || true
+		    fi
+	    done
     fi
 }
 
@@ -54,7 +35,6 @@
     purge|remove|abort-install|abort-upgrade|failed-upgrade|disappear)
 	if [ "$1" = "purge" ]; then
 	    db_purge
-
 	    # Remove logfiles
 	    rm -Rf /var/log/nagios /etc/nagios /usr/lib/nagios/plugins/check_nagios
 	else
@@ -68,9 +48,13 @@
 		Both)          webservers="apache apache-ssl";;
 		*)             webservers="";;
 	    esac
+
+	    for apache in $webservers; do
+			rm /etc/$apache/conf.d/nagios
+		done
 	    
 	    if [ ! -z "$webservers" ]; then
-		configapache
+			reloadapache
 	    fi
 	fi
         ;;
@@ -81,13 +65,8 @@
         exit 0
 esac
 
-if [ "$1" = purge -a -e /usr/share/debconf/confmodule ]; then
-    . /usr/share/debconf/confmodule
-    db_purge
-fi
+# In case it has something to add:
+#DEBHELPER#
 
-if [ "$1" = "purge" -o "$1" = "remove" ] ; then
-    # Stop Nagios
-    update-rc.d -f nagios remove >/dev/null
-fi
+db_stop
 

Index: templates
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/templates,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- templates	31 Oct 2004 09:59:29 -0000	1.1.1.1
+++ templates	7 Nov 2004 23:18:46 -0000	1.2
@@ -7,13 +7,13 @@
  in order for the front end to function properly.
  .
  The Debian packaged version can usually automatically configure apache by
- editing /etc/APACHE-SERVER/httpd.conf. Would you like me to do this? Say
- no if you aren't running apache or you would prefer to set up the web
- server yourself. If you say yes here, all configuration changes will also
- be removed when the packages is purged. Do not edit the configuration by
- hand, but instead make a copy of it, and remove the trailing header and
- footer, as everything between them will be automatically updated on
- package updates.
+ dropping a symlink into the /etc/APACHE-SERVER/conf. directory.
+ Would you like me to do this? Say no if you aren't running apache or
+ you would prefer to set up the web server yourself. If you say yes
+ here, all configuration changes will also be removed when the packages
+ is purged. Do not edit the configuration by hand, but instead make a
+ copy of it, and remove the trailing header and footer, as everything
+ between them will be automatically updated on package updates.
  .
  Since there is no special Apache2-SSL, 'both' means Apache and Apache-SSL.
 
@@ -49,37 +49,6 @@
  the file /var/log/nagios/rw/nagios.cmd. The Debian packaged version can
  support this by running setuid to the nagios user.
 
-Template: nagios/warnupgrade_5_6
-Type: note
-_Description: host.cfg file format change
- The format of the hosts.cfg file has changed subtly between versions 0.0.5
- and 0.0.6 to support volatile services. In 0.0.5 there was no support for
- this feature and so the upgrade is usually a simple case of supplying the
- false flag for each service in this field.
- .
- The supplied program, ns5to6, can be used to automatically update your
- hosts.cfg file.
-
-Template: nagios/warnmovedcommands
-Type: note
-_Description: commands.cfg deprecated
- The commands.cfg file has been deprecated. The command.cfg file supplied
- by the plugins package and the autogenerated plugins-auto.cfg replace it.
- .
- If you added things to commands.cfg, add them to command.cfg instead, but
- make sure you don't clash with any of the commands generated from the
- /usr/share/nagios/pluginconfig/*cfg files.
-
-Template: nagios/warncoords
-Type: note
-_Description: Default status map layout needs coordinates.
- The default method for displaying nodes in the status map is now to use
- user-supplied coordinates. These can be specified in the hostextinfo
- section (see the docs).
- .
- If you don't supply coordinates, you can still select another layout
- method within the script.
-
 Template: nagios/upgradefromnetsaint
 Type: note
 _Description: Upgrading from Netsaint
@@ -88,16 +57,3 @@
  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.
-
-Template: nagios/newapachecfg
-Type: note
-_Description: New apache include file
- The file /etc/nagios/apache.config which tells Apache/Apache-SSL how to
- load and access the Nagios directories and CGI commands have had major
- problems in the past. It is now rewritten, and all access problems have
- been fixed. When you get the question to overwrite this file with the one
- from the package. Please choose 'i' here.
- .
- In case you missed the question, the new file is called
- apache.config.dpkg-new so you move that file to apache.config afterwards
- (using the 'mv' command).

--- conffiles DELETED ---

--- nagios-text.install DELETED ---