[debian-edu-commits] debian-edu/ 01/01: Fix configuration file location in cfengine rule for squid; now located in /etc/squid3/.

[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 f671190fbab90fea50557ed6e3bbffb30bb5374a
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Fri Sep 26 14:17:05 2014 +0200

    Fix configuration file location in cfengine rule for squid; now located in /etc/squid3/.
---
 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 3b55ee9..ba53fbc 100644
--- a/cf/cf.squid
+++ b/cf/cf.squid
@@ -14,7 +14,7 @@ editfiles:
 
    debian.server::
 
-    { /etc/squid/squid.conf
+    { /etc/squid3/squid.conf
 
       LocateLineMatching "# INSERT YOUR OWN RULE\(S\) HERE TO ALLOW ACCESS FROM YOUR CLIENTS"
       IncrementPointer   "2"
diff --git a/debian/changelog b/debian/changelog
index 5470a64..dcc0d6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ debian-edu-config (1.806) UNRELEASED; urgency=low
   [ Wolfgang Schweer ]
   * sbin/debian-edu-pxeinstall: replace d-i version 7.0 with 8.0 to fix
     pxe installations.
+  * Fix configuration file location in cfengine rule for squid; now
+    located in /etc/squid3/.
 
   [ Petter Reinholdtsen ]
   * Extend testsuite/taskpkgs to also check that the correct desktop

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