[debian-edu-commits] debian-edu/ 01/01: Add support for squid to squid3 migration: - Add share/debian-edu-config/tools/migrate-squid-to-squid3. - Adjust cf/cf.squid to run this script. (Closes: #779469).

[Wolfgang Schweer]

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

schweer-guest pushed a commit to branch squid-related
in repository debian-edu-config.

commit 5640db013e66df3cf5eacd5a2e9a2181aeedd5f2
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Apr 9 15:19:52 2015 +0200

    Add support for squid to squid3 migration:
    - Add share/debian-edu-config/tools/migrate-squid-to-squid3.
    - Adjust cf/cf.squid to run this script.
    (Closes: #779469).
---
 cf/cf.squid                                           |  2 ++
 debian/changelog                                      |  8 ++++++++
 share/debian-edu-config/tools/migrate-squid-to-squid3 | 11 +++++++++++
 3 files changed, 21 insertions(+)

diff --git a/cf/cf.squid b/cf/cf.squid
index a411725..c46b436 100644
--- a/cf/cf.squid
+++ b/cf/cf.squid
@@ -36,6 +36,8 @@ shellcommands:
 
     # Update Squid to use all the available space (aka 80% of the partition)
     "/usr/share/debian-edu-config/tools/squid-update-cachedir /etc/squid3/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 cd15708..b6fd119 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-edu-config (1.818) UNRELEASED; urgency=medium
+
+  * Add support for squid to squid3 migration:
+    - Add share/debian-edu-config/tools/migrate-squid-to-squid3.
+    - Adjust cf/cf.squid to run this script. (Closes: #779469).
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 09 Apr 2015 15:13:53 +0200
+
 debian-edu-config (1.817) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/share/debian-edu-config/tools/migrate-squid-to-squid3 b/share/debian-edu-config/tools/migrate-squid-to-squid3
new file mode 100755
index 0000000..984fcfc
--- /dev/null
+++ b/share/debian-edu-config/tools/migrate-squid-to-squid3
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+if [ "$(dpkg -l squid)" != "" ] &&  [ "$(dpkg -l 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