[Pkg-nagios-changes] [SCM] Debian packaging for Nagios3 branch, master, updated. 3.2.0-5-16-g5f09c23
Alexander Wirt
formorer at debian.org
Thu Mar 18 15:25:36 UTC 2010
The following commit has been merged in the master branch:
commit 5f09c23826d725d900d17eb7cdc426cdf8aad106
Author: Alexander Wirt <formorer at debian.org>
Date: Thu Mar 18 16:25:18 2010 +0100
Remove more gateway stuff
diff --git a/debian/gateway.cfg b/debian/gateway.cfg
deleted file mode 100644
index fbb8810..0000000
--- a/debian/gateway.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# a host definition for the gateway of the default route
-define host {
- host_name gateway
- alias Default Gateway
- address GW
- use generic-host
- }
diff --git a/debian/nagios3-cgi.postinst b/debian/nagios3-cgi.postinst
index 8eea1ff..3cb6bde 100644
--- a/debian/nagios3-cgi.postinst
+++ b/debian/nagios3-cgi.postinst
@@ -57,21 +57,6 @@ case "$1" in
ucf --debconf-ok /usr/share/doc/nagios3-common/examples/apache2.conf $apacheconf
fi
- # and do some voodoo to detect default gw and make a host of it
- tmpgw=$(mktemp)
- set -- $(route -n 2>/dev/null| grep '^0.0.0.0' | head -n1)
- DEFAULTGW=$2
- if [ -z "$DEFAULTGW" ]; then
- echo "WARN: no default gateway found (/proc not mounted?). Selecting 127.0.0.1 as default gatway"
- DEFAULTGW="127.0.0.1"
- fi
- sed -e "s,GW,$DEFAULTGW," $usn/debian/gateway.cfg > $tmpgw
- chmod 644 $tmpgw
- ucf --debconf-ok $tmpgw $enc/host-gateway_nagios3.cfg
-
- # this is where the debconf-ized external command support would go
- #ucf $usn/debian/extcommands.cfg $enc/extcommands-nagios3.cfg
-
# configure the web servers, if it is desired
if [ "$servers" ]; then
if wc_httpd_apache_include $apacheconf nagios3 $servers; then
diff --git a/debian/nagios3-common.postinst b/debian/nagios3-common.postinst
index 470ce85..95e45bb 100644
--- a/debian/nagios3-common.postinst
+++ b/debian/nagios3-common.postinst
@@ -35,21 +35,6 @@ case "$1" in
--disabled-login --force-badname nagios > /dev/null
fi
- # and do some voodoo to detect default gw and make a host of it
- tmpgw=$(mktemp)
- set -- $(route -n 2>/dev/null| grep '^0.0.0.0' | head -n1)
- DEFAULTGW=$2
- if [ -z "$DEFAULTGW" ]; then
- echo "WARN: no default gateway found (/proc not mounted?). Selecting 127.0.0.1 as default gatway"
- DEFAULTGW="127.0.0.1"
- fi
- sed -e "s,GW,$DEFAULTGW," $usn/debian/gateway.cfg > $tmpgw
- chmod 644 $tmpgw
- ucf --debconf-ok $tmpgw $enc/host-gateway_nagios3.cfg
-
- # this is where the debconf-ized external command support would go
- #ucf $usn/debian/extcommands.cfg $enc/extcommands-nagios3.cfg
-
# explicitly set permissions on some files that are dependent
# on the uid/gid of the nagios user, which is dynamically created.
setperm root nagios 0640 $en/resource.cfg
--
Debian packaging for Nagios3
More information about the Pkg-nagios-changes
mailing list