cf/cf.apache2

 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"

debian/changelog

+debian-edu-config (1.929+deb9u2) UNRELEASED; urgency=medium
+
+  * 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).
+  * Re-enable offline installation of a combi server including diskless
+    workstation support. (Closes: #867271, #904331).
+    - 015-edu-apt-source: fix apt-get options to be able to use a repo of
+      type 'file://'. As 'media/cdrom/' in the LTSP chroot is treated as
+      such a repo, add 'acquire::check-valid-until=0' to APT_GET_OPTS;
+      otherwise installation fails because the Release file is expired.
+    - 032-edu-pkgs: Move all diskless workstation installation parts to
+      the finalization stage of LTSP chroot installation.
+
+ -- Wolfgang Schweer <wschweer@arcor.de>  Mon, 29 Oct 2018 19:07:55 +0100
+
 debian-edu-config (1.929+deb9u1) stretch; urgency=medium
 
   [ Wolfgang Schweer ]

debian/debian-edu-config.postinst

@@ -127,6 +127,18 @@ fi
 
 case "$1" in
 configure)
+    if dpkg --compare-versions "$2" le "1.929+deb9u2" && 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

share/ltsp/plugins/ltsp-build-client/Debian-custom/015-edu-apt-source

@@ -7,7 +7,7 @@ case "$MODE" in
             echo "Detected CD install, disabling APT repository checking."
             LTSP_CDROM_INSTALL=true
             APT_GET_OPTS="$APT_GET_OPTS \
-                           --allow-unauthenticated"
+                           --allow-unauthenticated -o acquire::check-valid-until=0"
             # Make sure LTSP use a local repository if it is used by
             # the system too.  FIXME Should really check the CD for list
             # of components.

share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs

@@ -432,24 +432,14 @@ case "$MODE" in
         cat > $ROOT/etc/dpkg/dpkg.cfg.d/force-unsafe-io <<EOF
 force-unsafe-io
 EOF
-        if [ -n "$option_diskless_edu_workstation_value" ]; then
-            install_diskless_workstation
-        fi
-        ;;
-    after-install)
-        # This part myst run in after-install instead of configure to
-        # install packages after common/010-mount-proc is executed to
-        # make sure /proc is available when asking tasksel/apt to
-        # install Java packages.
-        if [ -n "$option_diskless_edu_workstation_value" ]; then
-            after_install_diskless_workstation
-        fi
         ;;
     finalization)
         # Run final setup in finalization step and not in
         # after-install to make sure boot system modifications are
         # done after the ones done in LTSP by default.
         if [ -n "$option_diskless_edu_workstation_value" ]; then
+            install_diskless_workstation
+            after_install_diskless_workstation
             finalization_diskless_workstation
             if [ "true" = "$LTSP_CDROM_INSTALL" ]; then
                 rm -f $ROOT/etc/apt/apt.conf.d/90ltsp-build-client