[debian-edu-commits] debian-edu/ 01/01: Drop share/debian-edu-config/tools/migrate-squid-to-squid3 and drop (commented out) reference in cf/cf.squid as squid is back since Stretch.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-config.

commit ede7a7a3fdcfb75e8b9f74c666a77ae134085390
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Aug 14 11:55:34 2017 -0400

    Drop share/debian-edu-config/tools/migrate-squid-to-squid3 and drop (commented out) reference in cf/cf.squid as squid is back since Stretch.
---
 Makefile                                              |  1 -
 cf/cf.squid                                           |  2 --
 debian/changelog                                      |  2 ++
 share/debian-edu-config/tools/migrate-squid-to-squid3 | 14 --------------
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 9847bed..b9963a7 100644
--- a/Makefile
+++ b/Makefile
@@ -391,7 +391,6 @@ install: install-testsuite
 		share/debian-edu-config/tools/update-proxy-from-wpad \
 		share/debian-edu-config/tools/wpad-extract \
 		share/debian-edu-config/tools/debian-edu-dovecot-create-cert \
-		share/debian-edu-config/tools/migrate-squid-to-squid3 \
 		share/debian-edu-config/tools/ldap-server-getcert \
 		share/debian-edu-config/tools/exim4-create-cert \
 		share/debian-edu-config/tools/exim4-create-environment \
diff --git a/cf/cf.squid b/cf/cf.squid
index 78bda2e..f29ebda 100644
--- a/cf/cf.squid
+++ b/cf/cf.squid
@@ -40,8 +40,6 @@ shellcommands:
     "/usr/sbin/dpkg-reconfigure squid"
     # Update Squid to use all the available space (aka 80% of the partition)
     "/usr/share/debian-edu-config/tools/squid-update-cachedir /etc/squid/squid-debian-edu.conf"
-    # Migrate to squid3 when ugrading to jessie.
-    #"/usr/share/debian-edu-config/tools/migrate-squid-to-squid3"
 
    debian.!server.!standalone.fifthpass::
 
diff --git a/debian/changelog b/debian/changelog
index b47a2dc..24e9e45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ debian-edu-config (1.931) UNRELEASED; urgency=medium
     it is obsolete since LTSP version 5.5.4-1 and should have been removed for
     Stretch already.
   * cf/cf.apt: replace all occurrances of stretch with buster.
+  * Drop share/debian-edu-config/tools/migrate-squid-to-squid3 and drop
+   (commented out) reference in cf/cf.squid as squid is back since Stretch.
 
  -- Holger Levsen <holger at debian.org>  Sat, 05 Aug 2017 17:37:04 -0400
 
diff --git a/share/debian-edu-config/tools/migrate-squid-to-squid3 b/share/debian-edu-config/tools/migrate-squid-to-squid3
deleted file mode 100755
index c4dcca1..0000000
--- a/share/debian-edu-config/tools/migrate-squid-to-squid3
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-#
-# Takes effect after squid3 has been installed after upgrade from wheezy.
-# The existing cache is reused.
-#
-if [ -f /usr/sbin/squid ] && [ -f /usr/sbin/squid3 ] ; then
-    service squid3 stop
-    service squid stop
-    umount /var/spool/squid
-    sed -i 's#/var/spool/squid#/var/spool/squid3#' /etc/fstab
-    mount /var/spool/squid3
-    service squid3 start
-    apt-get -y purge squid squid-common
-fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git