[debian-edu-commits] debian-edu/ 01/01: Change wpad-extract to use IP when testing, instead of www.debian.org which require access to the global DNS system.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-config.

commit d5932630e7ffffefd0cee4b7954336d2246655c3
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Oct 10 13:12:03 2014 +0200

    Change wpad-extract to use IP when testing, instead of www.debian.org which require access to the global DNS system.
---
 debian/changelog                           | 2 ++
 share/debian-edu-config/tools/wpad-extract | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0c2b5e4..0dcc19d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ debian-edu-config (1.810) UNRELEASED; urgency=high
     installed.
   * Make sure to restart nagios during first boot after the new config
     is generated on the main server.
+  * Change wpad-extract to use IP when testing, instead of
+    www.debian.org which require access to the global DNS system.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 07 Oct 2014 12:47:06 +0200
 
diff --git a/share/debian-edu-config/tools/wpad-extract b/share/debian-edu-config/tools/wpad-extract
index f7c23b8..07890e1 100755
--- a/share/debian-edu-config/tools/wpad-extract
+++ b/share/debian-edu-config/tools/wpad-extract
@@ -14,9 +14,11 @@
 # Trick the KDE4 config backend to use the settings there to load the
 # WPAD setting.  See also bug #644373.
 
+# Look up one of the www.debian.org IP addresses to avoid hanging on
+# DNS if the skolelinux machines are not connected to the Internet.
 proxy_url=$(KDE_FULL_SESSION=foo \
    KDEDIRS=/usr/share/debian-edu/networked-kde3 \
-   proxy http://www.debian.org 2>/dev/null | cut -d" " -f1)
+   proxy http://130.89.148.14 2>/dev/null | cut -d" " -f1)
 
 # make sure direct:// urls do not make it through to the system config
 case "$proxy_url" in

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git