[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Drop workaround now that Squid bug #911325 has been fixed

[WolfgangSchweer]

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


Commits:
e4beda71 by Wolfgang Schweer at 2019-11-10T22:31:30Z
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: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


4 changed files:

- Makefile
- cf3/cf.workarounds
- debian/changelog
- − share/debian-edu-config/squid.resolvconf


Changes:

=====================================
Makefile
=====================================
@@ -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
=====================================
@@ -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
=====================================
@@ -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 at arcor.de>  Fri, 08 Nov 2019 19:50:17 +0100
 


=====================================
share/debian-edu-config/squid.resolvconf deleted
=====================================
@@ -1,9 +0,0 @@
-#!/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



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

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/e4beda71afb2949c77402a00a6909f4c19ceb404
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/20191110/7f1006c3/attachment-0001.html>