[debian-edu-commits] debian-edu/ 01/01: Adjust testsuite/webcache to reflect that now squid3 ist installed.

[Wolfgang Schweer]

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

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

commit d8485a2b6d253154dc9706eac7899391cae8d584
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sat Aug 23 23:44:44 2014 +0200

    Adjust testsuite/webcache to reflect that now squid3 ist installed.
---
 debian/changelog   |  4 ++++
 testsuite/webcache | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fdcfb03..a9b36ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 debian-edu-config (1.721) UNRELEASED; urgency=low
 
+  [ Petter Reinholdtsen ]
   * Update Standards-Version from 3.9.4 to 3.9.5.  No changes needed.
 
   * Updated web page translations:
@@ -15,6 +16,9 @@ debian-edu-config (1.721) UNRELEASED; urgency=low
     for network manager.
   * Switch Vcs-Browser URL to the cgit interface.
 
+  [ Wolfgang Schweer ]
+  * Adjust testsuite/webcache cause squid3 replaces squid.
+
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 23 Aug 2014 10:47:02 +0200
 
 debian-edu-config (1.720) unstable; urgency=high
diff --git a/testsuite/webcache b/testsuite/webcache
index 14860a3..9cb105b 100755
--- a/testsuite/webcache
+++ b/testsuite/webcache
@@ -16,8 +16,8 @@ fi
 server=webcache
 
 # Test ownership of the squid cache directory
-if test -d /var/spool/squid ; then 
-    SQUIDOWNER=$(find /var/spool/squid -maxdepth 0 -printf %u)
+if test -d /var/spool/squid3 ; then 
+    SQUIDOWNER=$(find /var/spool/squid3 -maxdepth 0 -printf %u)
     if [ "$SQUIDOWNER" = "proxy" ] ;  then 
         echo "success: $0: SquidOwner is $SQUIDOWNER"
     else
@@ -39,24 +39,24 @@ HEADOPTS="-t 10"
 
 if echo "$PROFILE" | egrep -q 'Main-Server' ; then
     # Test that the binary exist
-    if test -x /usr/sbin/squid ; then
-        echo "success: $0: Binary /usr/sbin/squid is present."
+    if test -x /usr/sbin/squid3 ; then
+        echo "success: $0: Binary /usr/sbin/squid3 is present."
     else
-        echo "error: $0: Binary /usr/sbin/squid is missing."
+        echo "error: $0: Binary /usr/sbin/squid3 is missing."
     fi
 
-    if pidof squid > /dev/null ; then
-        echo "success: $0: squid is running."
+    if pidof squid3 > /dev/null ; then
+        echo "success: $0: squid3 is running."
     else
-        echo "error: $0: squid is not running."
+        echo "error: $0: squid3 is not running."
         exit 1
     fi
 
-    if egrep -q '^refresh_pattern \(Release\|Package\(.gz\)\*\)$' /etc/squid/squid.conf
+    if egrep -q '^refresh_pattern \(Release\|Package\(.gz\)\*\)$' /etc/squid3/squid.conf
     then
-        echo "error: $0: squid typo causing APT problem is present (#591839)."
+        echo "error: $0: squid3 typo causing APT problem is present (#591839)."
     else
-        echo "success: $0: squid typo causing APT problem is not present (#591839)."
+        echo "success: $0: squid3 typo causing APT problem is not present (#591839)."
     fi
 fi
 

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