[debian-edu-commits] debian-edu/ 01/01: re-order chronologically

[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 8d8782dd42c8786785563c3f44590e53336774ca
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Jan 25 17:04:38 2018 +0000

    re-order chronologically
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/debian-edu-config.postinst | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index 53ce8f5..1812d58 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -127,6 +127,20 @@ fi
 
 case "$1" in
 configure)
+    if dpkg --compare-versions "$2" le "1.929" && dpkg --compare-versions "$2" ge "1.926" && \
+        egrep -q "(Main-Server)" /etc/debian-edu/config ; then
+	rm /etc/apache2/mods-available/userdir.load
+	cp /etc/apache2/mods-available/status.load /etc/apache2/mods-available/userdir.load
+	sed -i 's/status/userdir/g' /etc/apache2/mods-available/userdir.load
+	if ! [ -L /etc/apache2/mods-available/debian-edu-userdir.load ] ; then
+	    ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load
+	fi
+        if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+             . /usr/share/apache2/apache2-maintscript-helper
+             apache2_invoke enmod debian-edu-userdir
+        fi
+    fi
+
     if dpkg --compare-versions "$2" le "1.933" && [ -f /etc/asound.conf ] ; then
 	rm /etc/asound.conf
     fi
@@ -183,20 +197,6 @@ configure)
 	rm /usr/share/man/man1/.1.gz
     fi
 
-    if dpkg --compare-versions "$2" le "1.929" && dpkg --compare-versions "$2" ge "1.926" && \
-        egrep -q "(Main-Server)" /etc/debian-edu/config ; then
-	rm /etc/apache2/mods-available/userdir.load
-	cp /etc/apache2/mods-available/status.load /etc/apache2/mods-available/userdir.load
-	sed -i 's/status/userdir/g' /etc/apache2/mods-available/userdir.load
-	if ! [ -L /etc/apache2/mods-available/debian-edu-userdir.load ] ; then
-	    ln -s /etc/apache2/mods-available/userdir.load /etc/apache2/mods-available/debian-edu-userdir.load
-	fi
-        if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
-             . /usr/share/apache2/apache2-maintscript-helper
-             apache2_invoke enmod debian-edu-userdir
-        fi
-    fi
-
     # sssd refuses to read the file if it has any other mode
     chmod 600 /etc/sssd/sssd-debian-edu.conf
     chown root:root /etc/sssd/sssd-debian-edu.conf

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