[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Revert "Adjust cf3/cf.squid"

[WolfgangSchweer]

WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-config


Commits:
a5adb6d1 by Wolfgang Schweer at 2018-10-18T17:46:14Z
Revert "Adjust cf3/cf.squid"

This reverts commit 3933267c568a942956d6bdd2b5aec5a723501a00.

This issue is due to a squid bug: #911325

- - - - -


2 changed files:

- cf3/cf.squid
- debian/changelog


Changes:

=====================================
cf3/cf.squid
=====================================
@@ -33,20 +33,12 @@ commands:
     "/usr/sbin/dpkg-reconfigure squid"
       contain => in_shell;
 
-  # (a) Update Squid to use all available space (aka 80% of the partition).
-  # (b) Rather rely on squid's built-in restart mechanism than on systemd; this
-  # is needed in case of separate partitions for /var and /var/spool/squid;
-  # 'ExecReload=/bin/kill -HUP $MAINPID' doesn't work because squid.pid is not
-  #  yet available. While 'systemctl reload squid' will fail, it's still
-  #  possible to use 'service squid reload', used by 'squid-update-cachedir'.
+  # Update Squid to use all the available space (aka 80% of the partition)
 
   debian.server.installation::
     "/usr/share/debian-edu-config/tools/squid-update-cachedir /etc/squid/squid.conf"
       contain => in_shell;
-    "/usr/bin/cp /lib/systemd/system/squid.service /etc/systemd/system/"
-      contain => in_shell;
-    "/usr/bin/sed -i '/ExecReload/d' /etc/systemd/system/squid.service"
-      contain => in_shell;
+
 }
 
 bundle agent editline_squid


=====================================
debian/changelog
=====================================
@@ -1,16 +1,7 @@
 debian-edu-config (2.10.41) UNRELEASED; urgency=medium
 
-  [ Holger Levsen ]
   * Use the new debhelper-compat(=11) notation and drop d/compat.
 
-  [ Wolfgang Schweer ]
-  * Adjust cf3/cf.squid:
-    - Rather rely on Squid's built-in restart mechanism than on systemd; this
-      is needed in case of separate partitions for /var and /var/spool/squid;
-      'ExecReload=/bin/kill -HUP $MAINPID' doesn't work because squid.pid is not
-      yet available. While 'systemctl reload squid' will fail, it's still
-      possible to use 'service squid reload', used by 'squid-update-cachedir'.
-
  -- Holger Levsen <holger at debian.org>  Sun, 14 Oct 2018 09:40:23 +0100
 
 debian-edu-config (2.10.40) unstable; urgency=medium



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/a5adb6d10bed29e20408bc9cafbc7033c6e8c8bd

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/a5adb6d10bed29e20408bc9cafbc7033c6e8c8bd
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20181018/d5f29019/attachment-0001.html>