[debian-edu-commits] debian-edu/ 01/01: squid3 to squid renaming: replace share-/d-e-c/squid3.conf with share-/d-e-c/squid.conf, adjust share-/d-e-c/tools/webcache/squid-update-cachedir, adjust Makefile.

Thu Apr 21 18:56:24 UTC 2016

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 142bee69daf68851a39935c72b65f910d9dc3408
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Apr 21 20:57:45 2016 +0200

    squid3 to squid renaming: replace share-/d-e-c/squid3.conf with share-/d-e-c/squid.conf, adjust share-/d-e-c/tools/webcache/squid-update-cachedir, adjust Makefile.
---
 Makefile                                           |  2 +-
 debian/changelog                                   |  4 ++++
 .../debian-edu-config/{squid3.conf => squid.conf}  | 14 +++++++-------
 .../debian-edu-config/tools/squid-update-cachedir  | 10 +++++-----
 testsuite/webcache                                 | 22 +++++++++++-----------
 5 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/Makefile b/Makefile
index b20642c..d41cbe3 100644
--- a/Makefile
+++ b/Makefile
@@ -453,7 +453,7 @@ install: install-testsuite
 	set -e ; for f in \
 		share/debian-edu-config/rsyslog-collector \
 		share/debian-edu-config/iceweacel-networked-prefs.js \
-		share/debian-edu-config/squid3.conf \
+		share/debian-edu-config/squid.conf \
 		share/iceweasel/defaults/preferences/debian-edu.js \
 		share/pam-configs/edu-group \
 		share/pam-configs/edu-umask \
diff --git a/debian/changelog b/debian/changelog
index e5c2fc4..1874535 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,10 @@ debian-edu-config (1.901) UNRELEASED; urgency=medium
     - add param '--auto-remove' to all apt-get purge commands
       in cf/cf.ldapclient (Closes: #779646).
   * Fix /var/lib/dovecot removal code in postrm purge. (Closes: #820075).
+  * squid3 to squid renaming:
+    - replace share-/d-e-c/squid3.conf with share-/d-e-c/squid.conf.
+    - adjust share-/d-e-c/tools/webcache/squid-update-cachedir.
+    - adjust Makefile.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 14 Apr 2016 23:32:10 +0200
 
diff --git a/share/debian-edu-config/squid3.conf b/share/debian-edu-config/squid.conf
similarity index 84%
rename from share/debian-edu-config/squid3.conf
rename to share/debian-edu-config/squid.conf
index 2e074e1..8a4b44d 100644
--- a/share/debian-edu-config/squid3.conf
+++ b/share/debian-edu-config/squid.conf
@@ -1,10 +1,10 @@
 # Squid version 3 configuration file
 #
-# Created using the default configuration, applying the patch found in
-# bug #763867 and doing
-#   grep -v '^#' /etc/squid3/squid.conf |grep -v '^$'
-# and finally adding a apt related refresh_pattern and
-# maximum_object_size, append_domain and cache_dir settings.
+# Created using the default configuration and doing
+#   grep -v '^#' /etc/squid/squid.conf |grep -v '^$'
+# and finally adding http and htcp allow statements for localnet,
+# an apt related refresh_pattern and maximum_object_size,
+# append_domain and cache_dir settings.
 
 acl SSL_ports port 443
 
@@ -40,7 +40,7 @@ htcp_access deny all
 
 http_port 3128
 
-coredump_dir /var/spool/squid3
+coredump_dir /var/spool/squid
 
 
 
@@ -62,4 +62,4 @@ append_domain .intern
 # Adjust cache size to fit size of /var/spool/squid, the capasity is
 # dynamically updated using
 # /usr/share/debian-edu-config/tools/squid-update-cachedir
-cache_dir ufs /var/spool/squid3 100 16 256
+cache_dir ufs /var/spool/squid 100 16 256
diff --git a/share/debian-edu-config/tools/squid-update-cachedir b/share/debian-edu-config/tools/squid-update-cachedir
index 8a678ba..9532af3 100755
--- a/share/debian-edu-config/tools/squid-update-cachedir
+++ b/share/debian-edu-config/tools/squid-update-cachedir
@@ -5,9 +5,9 @@
 LC_ALL=C
 export LC_ALL
 
-CONFIG=/etc/squid3/squid.conf
+CONFIG=/etc/squid/squid.conf
 
-[ ! -f /etc/default/squid3 ] || . /etc/default/squid3
+[ ! -f /etc/default/squid ] || . /etc/default/squid
 
 if [ "$1" ] ; then
     squidconf="$1"
@@ -21,7 +21,7 @@ else
     fillpercent=80
 fi
 
-defaultcachedir=/var/spool/squid3
+defaultcachedir=/var/spool/squid
 
 cachedir="$(grep '^cache_dir ufs ' $squidconf | awk '{print $3}')"
 if [ -z "$cachedir" ] ; then
@@ -47,9 +47,9 @@ fi
 
 if $newconf ; then
     if [ -x /usr/sbin/invoke-rc.d ] ; then
-	invoke-rc.d squid3 reload
+	invoke-rc.d squid reload
     else
-	/etc/init.d/squid3 reload
+	/etc/init.d/squid reload
     fi
 else
     echo "info: Squid configuration not changed"
diff --git a/testsuite/webcache b/testsuite/webcache
index b56d46b..9714424 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/squid3 ; then 
-    SQUIDOWNER=$(find /var/spool/squid3 -maxdepth 0 -printf %u)
+if test -d /var/spool/squid ; then
+    SQUIDOWNER=$(find /var/spool/squid -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/squid3 ; then
-        echo "success: $0: Binary /usr/sbin/squid3 is present."
+    if test -x /usr/sbin/squid ; then
+        echo "success: $0: Binary /usr/sbin/squid is present."
     else
-        echo "error: $0: Binary /usr/sbin/squid3 is missing."
+        echo "error: $0: Binary /usr/sbin/squid is missing."
     fi
 
-    if pidof squid3 > /dev/null ; then
-        echo "success: $0: squid3 is running."
+    if pidof squid > /dev/null ; then
+        echo "success: $0: squid is running."
     else
-        echo "error: $0: squid3 is not running."
+        echo "error: $0: squid is not running."
         exit 1
     fi
 
-    if egrep -q '^refresh_pattern \(Release\|Package\(.gz\)\*\)$' /etc/squid3/squid.conf
+    if egrep -q '^refresh_pattern \(Release\|Package\(.gz\)\*\)$' /etc/squid/squid.conf
     then
-        echo "error: $0: squid3 typo causing APT problem is present (#591839)."
+        echo "error: $0: squid typo causing APT problem is present (#591839)."
     else
-        echo "success: $0: squid3 typo causing APT problem is not present (#591839)."
+        echo "success: $0: squid 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

