Commit 14d0147b authored by Wolfgang Schweer's avatar Wolfgang Schweer
Browse files

Drop etc/apt/apt.conf.d/90squid 

The workaround is obsolete, the related bug has been fixed in 2015.
Adjust d/debian-edu-config.maintscript and Makefile.
parent 890d8ae3

Makefile

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ CF3FILES = \ 


# Files to install in /etc/

SYSCONFFILES = \

	apt/apt.conf.d/90squid \

	apt/apt.conf.d/99-edu-prefer-firefox \

	bind/named.conf.ldap2zone \

	bind/db.intern \

debian/changelog

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ debian-edu-config (2.10.37) UNRELEASED; urgency=medium 
      /etc/default/squid, adjust the code to be systemd compliant.

  * www/index.html.*: Use relative links whenever possible. (Closes: #906467).

  * cf3/cf.desktop-networked: Replace 'apt' with 'apt-get' in shell command.

  * Drop etc/apt/apt.conf.d/90squid:

    - The workaround is obsolete, the related bug has been fixed in 2015.

    - Adjust d/debian-edu-config.maintscript and Makefile.



 -- Wolfgang Schweer <wschweer@arcor.de>  Wed, 19 Sep 2018 10:17:02 +0200

debian/debian-edu-config.maintscript

+1 −0
Original line number Diff line number Diff line
@@ -16,3 +16,4 @@ rm_conffile /etc/ldap/slapd-lenny_debian-edu.conf 1.911 
rm_conffile /etc/cfengine3/debian-edu/cf.pki 2.10.19

rm_conffile /etc/cfengine3/debian-edu/cf.thunderbird 2.10.19

rm_conffile /etc/desktop-profiles/debian-edu-config.listing 2.10.22

rm_conffile /etc/apt/apt.conf.d/90squid 2.10.36

etc/apt/apt.conf.d/90squid

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
// Avoid Squid handing out corrupt packages, solves Skolelinux bug

// #1419.

Acquire::http::Pipeline-Depth 0;