Verified Commit e4beda71 authored by Wolfgang Schweer's avatar Wolfgang Schweer
Browse files

Drop workaround now that Squid bug #911325 has been fixed 



Remove share/debian-edu-config/squid.resolvconf
Adjust Makefile and cf3/cf.workarounds.

Signed-off-by: default avatarWolfgang Schweer <wschweer@arcor.de>
parent f2e4a778

Makefile

+0 −1
Original line number Diff line number Diff line
@@ -342,7 +342,6 @@ install: install-testsuite 
		share/debian-edu-config/tools/improve-desktop-l10n \

		share/debian-edu-config/tools/install-task-pkgs \

		share/debian-edu-config/ltspfs-mounter-kde \

		share/debian-edu-config/squid.resolvconf \

		share/firefox-esr/distribution/policies.json \

		share/ltsp/get-ldap-ltsp-config \

		share/initramfs-tools/scripts/nfs-bottom/before-ltsp \

cf3/cf.workarounds

+0 −8
Original line number Diff line number Diff line
@@ -3,14 +3,6 @@ bundle agent workarounds 


files:



  # Provide valid squid resolv.conf, remove linking the edu file

  # once bug #911325 is fixed.

  debian.squidcache.installation::



    "/etc/resolvconf/update-libc.d/squid"

      link_from => ln_s("/usr/share/debian-edu-config/squid.resolvconf"),

      move_obstructions => "true";



   # Provide Debian Edu RootCA pub key file for download.



  debian.server.installation::

debian/changelog

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ debian-edu-config (2.11.9) UNRELEASED; urgency=medium 
      + share/debian-edu-config/tools/update-cert-dbs

      + ldap-tools/ldap-debian-edu-install

    - Adjust Makefile.

  * Drop workaround now that Squid bug #911325 has been fixed:

    - Remove share/debian-edu-config/squid.resolvconf

    - Adjust Makefile and cf3/cf.workarounds.



 -- Wolfgang Schweer <wschweer@arcor.de>  Fri, 08 Nov 2019 19:50:17 +0100

share/debian-edu-config/squid.resolvconf

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
#!/bin/sh



PATH="/usr/sbin:/usr/bin:/sbin:/bin"



# Make squid aware of changes to resolv.conf

# Avoid reload before squid.pid is available

if  [ -d /run/systemd/system ] && systemctl -q is-active squid || [ -f /var/run/squid.pid ] ; then

   invoke-rc.d squid reload

fi