[debian-edu-commits] debian-edu/ 01/01: Adjust cf.squid, make sure to run squid-update-cachedir on the squid3 config file.

[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 4222dab1428fac540f9f6e325ccd4c8f214c0684
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Mon Oct 13 15:50:59 2014 +0200

    Adjust cf.squid, make sure to run squid-update-cachedir on the squid3 config file.
---
 cf/cf.squid      | 2 +-
 debian/changelog | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cf/cf.squid b/cf/cf.squid
index 56d196a..a411725 100644
--- a/cf/cf.squid
+++ b/cf/cf.squid
@@ -35,7 +35,7 @@ shellcommands:
    debian.server::
 
     # Update Squid to use all the available space (aka 80% of the partition)
-    "/usr/share/debian-edu-config/tools/squid-update-cachedir /etc/squid/squid.conf"
+    "/usr/share/debian-edu-config/tools/squid-update-cachedir /etc/squid3/squid-debian-edu.conf"
 
    debian.!server.!standalone.fifthpass::
 
diff --git a/debian/changelog b/debian/changelog
index 50c6dbc..cf7a33f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,8 @@ debian-edu-config (1.810) UNRELEASED; urgency=high
     Debian, and explain why the kerberos id is checked when using SMTP.
   * Improve messages from dnsd testsuite check, making it more obvious
     that the DNS server name is hardcoded.
+  * Adjust cf.squid, make sure to run squid-update-cachedir on the
+    squid3 config file.
 
   [ Holger Levsen ]
   * debian/rules: Convert to dh9 style rules.

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