[debian-edu-commits] debian-edu/ 02/03: Fix configuration of personal web pages. (Closes: #866228).

[Wolfgang Schweer]

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

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

commit 44934c5fb5b7de0943fce596133fc584d92453ae
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Jul 13 16:17:41 2017 +0200

    Fix configuration of personal web pages. (Closes: #866228).
    
     Set right order of linking in cf/cf.apache2.
     Add conditional code to d/d-e-c.postinst to fix the wrong
     configuration generated via the cfengine run during main server
     installation (introduced in version 1.926).
---
 cf/cf.apache2                     |  7 +++++--
 debian/debian-edu-config.postinst | 12 ++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/cf/cf.apache2 b/cf/cf.apache2
index 6296ea1..9b5191a 100644
--- a/cf/cf.apache2
+++ b/cf/cf.apache2
@@ -1,13 +1,16 @@
 links:
   debian.server.installation::
     /etc/php/apache2/php.ini ->! /etc/php/apache2/php-debian-edu.ini
-    /etc/apache2/mods-available/userdir.load ->! /etc/apache2/mods-available/debian-edu-userdir.load
+    /etc/apache2/mods-available/debian-edu-userdir.load ->! /etc/apache2/mods-available/userdir.load
 
 shellcommands:
   debian.server.installation::
       # Generate the snakeoil selfsigned certificate using the make-ssl-cert tool
       "/usr/sbin/make-ssl-cert generate-default-snakeoil"
-      # Enabling userdir, create a directory ~/public_html to make it available on web as http://tjener.intern/~username.
+      # Disable default userdir.
+      "/usr/sbin/a2dismod userdir"
+      # Enabling debian-edu-userdir; create a directory ~/public_html
+      # to make it available as https://www/~<username>.
       "/usr/sbin/a2enmod debian-edu-userdir"
       # Enabling ssl
       "/usr/sbin/a2enmod ssl"
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index 1703bd3..d3354b1 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -127,6 +127,18 @@ 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
+	a2enmod debian-edu-userdir
+        service apache2 restart
+    fi
+
     if dpkg --compare-versions "$2" le "1.818+deb8u1" && [ -L /usr/bin/firefox-esr ] ; then
 	if [ -L /etc/iceweasel/pref/debian-edu-networked.js ] ; then
 	    rm /etc/iceweasel/pref/debian-edu-networked.js

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