Commit 3933267c authored by Wolfgang Schweer's avatar Wolfgang Schweer
Browse files

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'.
parent a1a80ff6
Loading
Loading
Loading
Loading
+10 −2
Original line number Diff line number Diff line
@@ -33,12 +33,20 @@ commands:
    "/usr/sbin/dpkg-reconfigure squid"
      contain => in_shell;

  # Update Squid to use all the available space (aka 80% of the partition)
  # (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'.

  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
+9 −0
Original line number Diff line number Diff line
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@debian.org>  Sun, 14 Oct 2018 09:40:23 +0100

debian-edu-config (2.10.40) unstable; urgency=medium