aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetter Reinholdtsen <pere@hungry.com>2008-06-13 15:06:53 +0000
committerPetter Reinholdtsen <pere@hungry.com>2008-06-13 15:06:53 +0000
commitd3ae73ecfab48eea121b91c6d37684d79061a19f (patch)
tree494398619774118341037315f0f6d3fac8af60a7
parent8def26dc0ae946d296dec1386da1a6687b64a577 (diff)
downloadsitesummary-d3ae73ecfab48eea121b91c6d37684d79061a19f.tar.gz
sitesummary-d3ae73ecfab48eea121b91c6d37684d79061a19f.tar.bz2
sitesummary-d3ae73ecfab48eea121b91c6d37684d79061a19f.tar.xz
* Make sure to read /etc/environment in init.d/sitesummary-client
script, to activate the common http proxy settings.
-rw-r--r--debian/changelog7
-rw-r--r--debian/sitesummary-client.init6
2 files changed, 13 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c36557d..6fc9b2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sitesummary (0.0.42) UNRELEASED; urgency=low
+
+ * Make sure to read /etc/environment in init.d/sitesummary-client
+ script, to activate the common http proxy settings.
+
+ -- Petter Reinholdtsen <pere@debian.org> Sat, 7 Jun 2008 12:50:17 +0200
+
sitesummary (0.0.41) unstable; urgency=low
* Accept nagios3 clients as nagios clients.
diff --git a/debian/sitesummary-client.init b/debian/sitesummary-client.init
index c9f2dac..30108d1 100644
--- a/debian/sitesummary-client.init
+++ b/debian/sitesummary-client.init
@@ -14,6 +14,12 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
CLIENT=/usr/sbin/sitesummary-client
REPORTDELAY=300
+# Use proxy setting if present
+if [ -f /etc/environment ] ; then
+ . /etc/environment
+ export http_proxy
+fi
+
[ -f /etc/default/sitesummary-client ] && . /etc/default/sitesummary-client
test -x $CLIENT || exit 0