[Pkg-nagios-devel] nagios check_nagios_db,NONE,1.1 README.Debian,1.1.1.1,1.2 changelog,1.9,1.10 nagios-common.docs,1.1,1.2 nagios-common.init.d,1.1,1.2 nagios-common.install,1.2,1.3 nagios-common.postinst,1.1,1.2 rules,1.8,1.9

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


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

Modified Files:
	README.Debian changelog nagios-common.docs 
	nagios-common.init.d nagios-common.install 
	nagios-common.postinst rules 
Added Files:
	check_nagios_db 
Log Message:
Added chack_nagios_db for mysql/postgresql users, to check if nagios is alive.
Added part in Readme.Debian about it.
Moved sed magic out of debian/rules in dpatch patches.
Fix a whole lot of bugs with this.
Install check_nagios_db as a doc file, user can read in Readme.Debian howto
activate it.
Modify init-script to use check_nagios_db if user does what we tell him in the
Readme.
Removed useless dbs files.
Postinst: Check if symlink already exist and dont try to add it if it is already there.
Postinst: Args, use the right variable, $apache instead of $webserver.
          Hint: Always use your brain if you use copy and paste. :)

debian/rules:
Remove the FLAGS_text,mysql,pgsql.
Add CONFIGUREMY and CONFIGUREPG, let the mysql and pgsql variant run a make clean
and after it a new configure, with added configure-flags for the database stuff.
That removes that scary "delete some files, patch a configure-generated file, rebuild some others"
hack we had before.
Remove the patch-target that patched the generated file.


--- NEW FILE: check_nagios_db ---
#!/usr/bin/perl

use strict;
$|++;

use vars qw/$opt_e $opt_c/;

$ENV{"PATH"} = "/usr/bin:/usr/sbin:/bin";

use Getopt::Std;
use DBI;

my $driver = "mysql";

my $CFG_DEF = "/etc/nagios/cgi.cfg";
my $QUERY = "select *, UNIX_TIMESTAMP(last_update) as ut from programstatus;";
my $EXPIRE_DEF = 5; ## expressed in minutes
my $PROCCNT = 0;

use constant OK => 1;
use constant WARN => 2;

my $STAT = WARN;

sub usage {
        print STDERR "\n";
        print STDERR "$0 -F -e <expire time in minutes> -C <process string>\n";
        print STDERR "\n";
        exit -1;
}

getopt("e:c:");

my $EXPIRE = $opt_e || $EXPIRE_DEF;
my $CFG = $opt_c || $CFG_DEF;

( -f $CFG ) or die "Can't open config file '$CFG': $!\n";

my ($dbhost, $dbport, $dbuser, $dbpass, $dbname);

open(F, "< $CFG");
while ( <F> ) {
        if (/^xsddb_host=(.+)/) { $dbhost = $1; next; };
        if (/^xsddb_port=(.+)/) { $dbport = $1; next; };
        if (/^xsddb_database=(.+)/) { $dbname = $1; next; };
        if (/^xsddb_username=(.+)/) { $dbuser = $1; next; };
        if (/^xsddb_password=(.+)/) { $dbpass = $1; next; };
}
close(F);

# print "($dbhost, $dbport, $dbuser, $dbpass, $dbname)\n";

my $dsn = "DBI:$driver:database=$dbname;host=$dbhost;port=$dbport";
my $dbh = DBI->connect($dsn, $dbuser, $dbpass, {'RaiseError' => 1});

my $sth = $dbh->prepare($QUERY);
if (!$sth) { die "Error:" . $dbh->errstr . "\n"; }
$sth->execute;
if (!$sth->execute) { die "Error:" . $sth->errstr . "\n"; }

my %status = ();

my $names = $sth->{'NAME'};
my $numFields = $sth->{'NUM_OF_FIELDS'};
my $ref = $sth->fetchrow_arrayref;
for (my $i = 0;  $i < $numFields;  $i++) {
        $status{"$$names[$i]"} = $$ref[$i];
}

#foreach (keys(%status)) {
#       print "$_: $status{$_}\n";
#}

if (!$status{nagios_pid}) {
	print "Nagios problem: no process identifier found in the database\n";
	exit 1;
}

my $lastupdated = time() - $status{"ut"};
if ( $lastupdated < ($EXPIRE*60) ) { ## convert $EXPIRE to seconds
        $STAT = OK;
}

open(PS, "ps -eaf | grep $status{nagios_pid} | grep -v grep | ");
$PROCCNT = 0;
while(<PS>) {
        $PROCCNT++;
}
close(PS);

if ( $STAT == OK ) {
        print "Nagios OK: located $PROCCNT processes, program status updated $lastupdated seconds ago\n";
} else {
	print "Nagios problem: no processus found";
	exit 1;
}


Index: README.Debian
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/README.Debian,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- README.Debian	31 Oct 2004 09:59:28 -0000	1.1.1.1
+++ README.Debian	11 Nov 2004 00:01:49 -0000	1.2
@@ -1,6 +1,14 @@
 nagios for Debian
 ----------------------
 
+1. General Information.
+2. Compile options
+3. nagios for netsaint Users
+4. Nagios and Databases and "Cgi and init.d script can't read status
+info"
+
+1. General Information.
+
 Nagios is the replacement and coninuation of the Netsaint project.
 It will install as a totaly separate software package, but will replace
 Netsaint. Where I can, I'll preserve configuration choices from Netsaint.
@@ -29,6 +37,8 @@
 
 ----------------------
 
+2. Compile options
+
 This version has been compiled to use pngs and jpgs in the statusmap.cgi
 whereever you would normally use a GD2.
 
@@ -79,6 +89,8 @@
 
 ----------------------
 
+3. nagios for netsaint Users
+
 A note about upgrading Netsaint to Nagios if I may. I created a quite simple
 shell script (installed as /usr/sbin/upgrade-netsaint2nagios). This works
 for me, but don't take my word for it. My Nagios setup is quite simple at
@@ -91,3 +103,31 @@
 we'll see what happens.
 
  -- Turbo Fredriksson <turbo@debian.org>, Thu, 20 Jun 2002 08:28:44 +0200
+
+4. Nagios and Databases and "Cgi and init.d script can't read status
+info"
+
+First read the normal nagios documentation to setup nagios for the
+database access.
+Then you want the cgi-script and the init.d script to correctly know the
+status of nagios. You need the check_nagios_db file from
+/usr/doc/nagios-common/, put it where you like but adjust the pathes in
+the following examples. I REALLY suggest /etc/nagios/check_nagios_db as
+the init-script now already looks if it is there and will use it
+automagically.
+If you use PostgreSQL you need to change the line
+my $driver = "mysql"; in the script to
+my $driver = "Pg";
+
+Make it executable:
+sudo chmod +x /etc/nagios/check_nagios_db
+
+Now edit the /etc/nagios/cgi.cfg and put a # in front of the line
+nagios_check_command=/usr/lib/nagios/plugins/check_nagios /var/log/nagios/status.log 5 'nagios'
+
+and remove the # in front of the line
+nagios_check_command=/etc/nagios/check_nagios_db
+
+Restart nagios and you are done.
+
+ -- Joerg Jaspert <joerg@debian.org>  Thu, 11 Nov 2004 00:14:02 +0100

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- changelog	9 Nov 2004 23:30:07 -0000	1.9
+++ changelog	11 Nov 2004 00:01:50 -0000	1.10
@@ -4,6 +4,7 @@
     - New Maintainer, nagios is now maintained by a team, via alioth.
     - Updated debian/control and debian/copyright for it.
     - Moved nagios to dpatch for its patches, converted them all.
+    - Added a few patches to move sed magic out of debian/rules.
     - Updated to Standards 3.6.1
     - Moved /var/log/nagios/rw/nagios.cmd to /var/run/nagios/nagios.cmd to
       follow the FHS. Updated 04_command_pipe_move.dpatch for this.
@@ -12,12 +13,11 @@
   	  (Yes, actually Piotr fixed the init-script for this with his NMU, but
   	  he forgot all the other things where it is mentioned. And var/run fits
       better IMO).
+      This includes some things in 07_fix_default_config.dpatch, to fix hardcoded
+      values in nagios binaries.
       Fixes "nagios: Nagios command fifo location violates FHS", thanks
       to Jeroen van Wolffelaar (Closes: #268230).
-    - Bug fix: "default nagios.cfg doesn't use new /var/cache paths", thanks
-      to Peter Palfrader (Closes: #276349).
-    - Bug fix: "wrong status.log path in init script", thanks to jan gregor
-      (Closes: #277049).
+      Also fixes: "nagios-text fails to start", thanks to James Clark (Closes: #276061).
     - Change debian/rules, first half is done, but still needs some work.
     - Try to clean the install-stamp: target a bit and do more things with
       dh_install, to get a more readable rules file.
@@ -37,6 +37,26 @@
     - 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.
+    - Bug fix: "default nagios.cfg doesn't use new /var/cache paths", thanks
+      to Peter Palfrader (Closes: #276349).
+    - Bug fix: "wrong status.log path in init script", thanks to jan gregor
+      (Closes: #277049).
+    - Bug fix: "nagios-pgsql: specified version does not install with
+      postgresql support, instead mysql support is installed.", thanks to
+      Greg Folkert (Closes: #274262).
+    - Bug fix: "nagios-text: nagiosadmin user had to be in contact configs,
+      else cgi acess denied", thanks to Alban Browaeys (Closes: #274179).
+    - Bug fix: "nagios-mysql: Cgi and init.d script can't read status info",
+      thanks to Ryszard Lach (Closes: #246372). Read README.Debian.
+      Added: check_nagios_db
+    - Alos fixes: "nagios-pgsql /etc/init.d/nagios script reload function is
+      broken", thanks to Philippe Lafoucrière (Closes: #272883).
+    - Bug fix: "init script does not work with a clean environment", thanks
+      to Peter Palfrader (Closes: #276421).
+    - Bug fix: "nagios-text: removing nagios does not clean Include line at
+      httpd.conf. Better use /etc/apache/conf.d", thanks to txemi (Closes: #273235).
+    - Bug fix: "nagios-text: typo in configure-script", thanks to Raoul
+      Borenius (Closes: #269568).
   * Sean Finney:
     - added danish and catalan debconf translations.  thanks go to 
       Claus Hindsgaul and Aleix Badia i Bosch respectively.  
@@ -44,7 +64,7 @@
     - adduser and debconf are now normal dependencies
     - added fix in init script for non-existant pidfile
 
- -- Joerg Jaspert <joerg@debian.org>  Wed, 10 Nov 2004 00:20:33 +0100
+ -- Joerg Jaspert <joerg@debian.org>  Thu, 11 Nov 2004 00:42:03 +0100
 
 nagios (2:1.2-3.6) unstable; urgency=high
 

Index: nagios-common.docs
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.docs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nagios-common.docs	9 Nov 2004 23:30:07 -0000	1.1
+++ nagios-common.docs	11 Nov 2004 00:01:50 -0000	1.2
@@ -3,3 +3,4 @@
 debian/README.mysql
 contrib/database/create_mysql
 contrib/database/create_pgsql
+debian/check_nagios_db

Index: nagios-common.init.d
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.init.d,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nagios-common.init.d	9 Nov 2004 23:30:07 -0000	1.1
+++ nagios-common.init.d	11 Nov 2004 00:01:50 -0000	1.2
@@ -30,7 +30,13 @@
 # start-stop-daemon should handle this work!
 #
 check_started () {
-    if [ -f /usr/lib/nagios/plugins/check_nagios ]; then
+    if [ -f /etc/nagios/check_nagios_db ]; then
+ 	if /etc/nagios/check_nagios_db > /dev/null; then
+ 	    return 0    # Is started
+ 	else
+ 	    return 1    # Isn't started
+ 	fi
+    elif [ -f /usr/lib/nagios/plugins/check_nagios ]; then
 	if /usr/lib/nagios/plugins/check_nagios -F /var/cache/nagios/status.log -e 5 -C 'nagios' > /dev/null; then
 	    return 0    # Is started
 	else
@@ -98,8 +104,8 @@
 
 	    if check_config; then
 		rm -f $NAMEDPIPE		
-		nice -$NICENESS \
-		    start-stop-daemon --start --quiet \
+	    start-stop-daemon --start --quiet \
+			--nicelevel $NICENESS \
 		    --pidfile $PIDFILE \
 		    --make-pidfile --background --exec $DAEMON -- $CONFIG
 		echo "$NAME."

Index: nagios-common.install
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.install,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nagios-common.install	9 Nov 2004 23:30:07 -0000	1.2
+++ nagios-common.install	11 Nov 2004 00:01:50 -0000	1.3
@@ -9,8 +9,7 @@
 html/docs/images/* usr/share/nagios/htdocs/docs/images
 html/images/*.gif html/images/*.jpg html/images/*.png usr/share/nagios/htdocs/images
 html/images/logos/*.* usr/share/nagios/htdocs/images/logos
-sample-config/resource.cfg etc/nagios/
-sample-config/template-object/*.cfg etc/nagios/
+sample-config/*.cfg etc/nagios/
 debian/apache.conf etc/nagios/
 debian/update-nagios usr/sbin/
 debian/upgrade-netsaint2nagios usr/sbin/

Index: nagios-common.postinst
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.postinst,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nagios-common.postinst	9 Nov 2004 23:30:07 -0000	1.1
+++ nagios-common.postinst	11 Nov 2004 00:01:50 -0000	1.2
@@ -42,7 +42,7 @@
 configapache () {
 	removeoldapache
     for apache in $webservers; do
-	if [ -d "/etc/$apache/conf.d" ]; then
+	if [ -d "/etc/$apache/conf.d" -a ! -e "/etc/$apache/conf.d/nagios" ]; then
 		ln -s /etc/nagios/apache.conf /etc/$apache/conf.d/nagios
 	fi
     done
@@ -60,18 +60,18 @@
 	    conf=httpd.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
+	if grep -qs "^Include /etc/nagios/apache.conf" /etc/$apache/$conf; then
+		mv -f /etc/$apache/$conf /etc/$apache/$conf.old.nagios
+		grep -v "^Include /etc/nagios/apache.conf" /etc/$apache/$conf.old.nagios \
+			> /etc/$apache/$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
+	if ! grep -qs "^Include /etc/$apache/conf.d" /etc/$apache/$conf; then
+		cp -f /etc/$apache/$conf /etc/$apache/$conf.old.nagios
+		echo "Include /etc/$apache/conf.d" >> /etc/$apache/$conf
+		mkdir -p /etc/$apache/$conf
 	fi
-	if [ -f /etc/$webserver/$conf.old.nagios ]; then
-		mv -f /etc/$webserver/$conf.old.nagios /etc/$webserver/$conf.old
+	if [ -f /etc/$apache/$conf.old.nagios ]; then
+		mv -f /etc/$apache/$conf.old.nagios /etc/$apache/$conf.old
 	fi
     done
 }

Index: rules
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/rules,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rules	9 Nov 2004 23:30:08 -0000	1.8
+++ rules	11 Nov 2004 00:01:50 -0000	1.9
@@ -40,10 +40,13 @@
 DEPENDS		= XSDC=xsddb.c XSDH=xsddb.h XCDC=xcddb.c XCDH=xcddb.h XEDC=xeddb.c \
 		  XEDH=xeddb.h XDDC=xdddb.c XDDH=xdddb.h XRDC=xrddb.c XRDH=xrddb.h
 
+CONFIGUREPG = $(CONFIGURE) --with-pgsql-comments --with-pgsql-downtime \
+                --with-pgsql-extinfo --with-pgsql-retention \
+                --with-pgsql-status --with-pgsql-xdata
 
-FLAGS_text	= EXTRAFLAGS="-DUSE_XSDDEFAULT -DUSE_XCDDEFAULT -DUSE_XEDTEMPLATE -DUSE_XRDDEFAULT -DUSE_XODTEMPLATE -DUSE_XPDDEFAULT -DUSE_XDDDEFAULT"
-FLAGS_pgsql	= LDFLAGS=-lpq EXTRAFLAGS="-DUSE_XSDDB -DUSE_XSDPGSQL -DUSE_XCDDB -DUSE_XCDPGSQL -DUSE_XEDDB -DUSE_XEDPGSQL -DUSE_XRDDB -DUSE_XRDPGSQL -DUSE_XDDDB -DUSE_XDDPGSQL -DUSE_XODTEMPLATE"
-FLAGS_mysql	= LDFLAGS=-lmysqlclient EXTRAFLAGS="-DUSE_XSDDB -DUSE_XSDMYSQL -DUSE_XCDDB -DUSE_XCDMYSQL -DUSE_XEDDB -DUSE_XEDMYSQL -DUSE_XRDDB -DUSE_XRDMYSQL -DUSE_XDDDB -DUSE_XDDMYSQL -DUSE_XODTEMPLATE"
+CONFIGUREMY = $(CONFIGURE) --with-mysql-comments --with-mysql-downtime \
+                --with-mysql-extinfo --with-mysql-retention \
+                --with-mysql-status --with-mysql-xdata
 
 # --------- CLEAN TARGETS
 
@@ -70,19 +73,12 @@
 	$(CONFIGURE)
 	touch configure-stamp
 
-patch-no-defaults: patch-no-defaults-stamp
-patch-no-defaults-stamp:
-# FIXME: Delete this thing.
-	@echo "Doing $@"
-	cat $(maindir)/debian/patches/chk-001_config.h-no_defaults | patch -p2
-	touch patch-no-defaults-stamp
-
 binary-nagios-text: configure binary-nagios-text-stamp
 binary-nagios-text-stamp:
 	dh_testdir -a
-
 	@echo "Doing $@"
-	$(MAKE) all $(FLAGS_text) && \
+
+	$(MAKE) all && \
 	  (cd base && mv nagios nagios.text); \
 	  (cd cgi && \
 	   for bin in $(CGIBINS); do \
@@ -90,40 +86,35 @@
 	   done);
 	touch binary-nagios-text-stamp
 
-binary-nagios-pgsql: binary-nagios-text patch-no-defaults binary-nagios-pgsql-stamp
+binary-nagios-pgsql: binary-nagios-pgsql-stamp
 binary-nagios-pgsql-stamp:
 	dh_testdir -a
-
 	@echo "Doing $@"
-	rm -f base/sretention.o; \
-	$(MAKE) -C base sretention.o CC="gcc -DUSE_XRDDB -DUSE_XRDPGSQL"; \
-	$(MAKE) -C base nagios $(FLAGS_pgsql) $(DEPENDS); \
-	rm -f cgi/edata.o; \
-	$(MAKE) -C cgi edata.o CC="gcc -DUSE_XEDDB -DUSE_XEDPGSQL"; \
-	$(MAKE) -C cgi cgis $(FLAGS_pgsql) $(DEPENDS); \
-	 (cd base && mv nagios nagios.pgsql); \
-	 (cd cgi && \
-	  for bin in $(CGIBINS); do \
-	    mv $$bin.cgi $$bin.cgi.pgsql; \
-	  done);
+
+	-make clean;
+	$(CONFIGUREPG)
+	$(MAKE) all && \
+	  (cd base && mv nagios nagios.pgsql); \
+	  (cd cgi && \
+	   for bin in $(CGIBINS); do \
+	     mv $$bin.cgi $$bin.cgi.pgsql; \
+	   done);
+
 	touch binary-nagios-pgsql-stamp
 
-binary-nagios-mysql: binary-nagios-text patch-no-defaults binary-nagios-mysql-stamp
+binary-nagios-mysql: binary-nagios-mysql-stamp
 binary-nagios-mysql-stamp:
 	dh_testdir -a
-
 	@echo "Doing $@"
-	rm -f base/sretention.o; \
-	$(MAKE) -C base sretention.o CC="gcc -DUSE_XRDDB -DUSE_XRDMYSQL"; \
-	$(MAKE) -C base nagios $(FLAGS_mysql) $(DEPENDS); \
-	rm -f cgi/edata.o; \
-	$(MAKE) -C cgi edata.o CC="gcc -DUSE_XEDDB -DUSE_XEDMYSQL"; \
-	$(MAKE) -C cgi cgis $(FLAGS_mysql) $(DEPENDS); \
-	(cd base && mv nagios nagios.mysql); \
-	(cd cgi && \
-	  for bin in $(CGIBINS); do \
-	    mv $$bin.cgi $$bin.cgi.mysql; \
-	  done);
+
+	make clean;
+	$(CONFIGUREMY)
+	$(MAKE) all && \
+	  (cd base && mv nagios nagios.mysql); \
+	  (cd cgi && \
+	   for bin in $(CGIBINS); do \
+	     mv $$bin.cgi $$bin.cgi.mysql; \
+	   done);
 	touch binary-nagios-mysql-stamp
 
 build: build-stamp
@@ -211,39 +202,8 @@
 	rm -f $(maindir)/debian/$@/etc/nagios/checkcommands.cfg
 	chmod +x $(maindir)/debian/nagios-common/usr/lib/nagios/plugins/check-imap
 	chmod +x $(maindir)/debian/nagios-common/usr/lib/cgi-bin/nagios/traceroute.cgi
-	cat sample-config/nagios.cfg | \
-	sh $(maindir)/debian/scripts/addpluginseg | \
-	sed -e 's@command_file=/var/log/nagios/rw@command_file=/var/run/nagios@' \
-	    -e 's@temp_file=/var/log@temp_file=/var/cache@' \
-	    -e 's@state_retention_file=/var/log@state_retention_file=/var/cache@' \
-	    -e 's@status_file=/var/log@status_file=/var/cache@' \
-	    -e 's@^nagios_check_command@#nagios_check_command@' \
-	    > $(maindir)/debian/$@/etc/nagios/nagios.cfg.new;
-	cat sample-config/cgi.cfg | \
-	     sed -e "s@^#authorized_for_\(.*\)=.*@authorized_for_\1=nagiosadmin@" \
-	     > $(maindir)/debian/$@/etc/nagios/cgi.cfg.new;
-	cd $(maindir)/debian/$@/etc/nagios && \
-	mv nagios.cfg.new nagios.cfg && \
-	mv cgi.cfg.new cgi.cfg;
 	chmod 660 $(maindir)/debian/nagios-common/etc/nagios/resource.cfg
 
-	cd $(maindir)/debian/$@/usr/share/nagios/htdocs/docs/; \
-	for file in *.html; do \
-		echo -n "Modifying htdoc: $$file"; \
-		cat $$file | sed -e 's@/etc/rc.d/init.d/nagios@/etc/init.d/nagios@i' \
-						 -e 's@ etc/ @ /etc/nagios/ @i' \
-					  	 -e 's@/usr/local/nagios/etc@/etc/nagios@i' \
-					  	 -e 's@/usr/local/nagios/libexec@/usr/lib/nagios/plugins@i' \
-				  		 -e 's@/usr/local/nagios/bin@/usr/sbin@i' \
-				  		 -e 's@/usr/local/nagios/sbin@/usr/lib/cgi-bin/nagios@i' \
-				  		 -e 's@/usr/local/nagios/share@/usr/share/nagios/htdocs@i' \
-				  		 -e 's@/usr/local/nagios/share/ssi@/usr/share/nagios/htdocs/ssi@i' \
-				  		 -e 's@/usr/local/nagios/var@/var/log/nagios@i' \
-				  		 -e 's@/usr/local/nagios@/usr@i' \
-			      		> $$file.new && mv $$file.new $$file; \
-		echo; \
-	done;
-
 	dh_link              -p$@ -P$(b)/$@
 	dh_strip             -p$@ -P$(b)/$@
 	dh_compress          -p$@ -P$(b)/$@
@@ -261,7 +221,7 @@
 	dh_testroot -a
 # Wah, lets simply do the install bit ourself - its not much magic and makes our live with the
 # splitted packages easier. And we already redo most of the stuff from upstreams makefile to
-# seperate it for the splits...
+# seperate it for the splits... Hint: Most of it is done with dh_install...
 	touch $(maindir)/install-stamp
 
 debian/po/templates.pot: debian/templates