[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Revert "cf3/apache2.cf: Symlink userdir.conf, not userdir.load."

[Mike Gabriel]

Mike Gabriel pushed to branch master at Debian Edu / debian-edu-config


Commits:
65f2dbd0 by Mike Gabriel at 2018-10-22T12:29:58Z
Revert "cf3/apache2.cf: Symlink userdir.conf, not userdir.load."

This reverts commit 52f2f4d4ef94571e87ac28f20ff8851146d3d165.

- - - - -


2 changed files:

- cf3/cf.apache2
- debian/changelog


Changes:

=====================================
cf3/cf.apache2
=====================================
@@ -8,8 +8,8 @@ files:
     "/etc/php/apache2/php.ini"
       link_from => ln_s("/etc/php/apache2/php-debian-edu.ini"),
       move_obstructions => "true";
-    "/etc/apache2/mods-available/debian-edu-userdir.conf"
-      link_from => ln_s("/etc/apache2/mods-available/userdir.conf"),
+    "/etc/apache2/mods-available/debian-edu-userdir.load"
+      link_from => ln_s("/etc/apache2/mods-available/userdir.load"),
       move_obstructions => "true";
 
 commands:


=====================================
debian/changelog
=====================================
@@ -4,7 +4,6 @@ debian-edu-config (2.10.41) UNRELEASED; urgency=medium
   * Use the new debhelper-compat(=11) notation and drop d/compat.
 
   [ Mike Gabriel ]
-  * cf3/apache2.cf: Symlink userdir.conf, not userdir.load.
   * etc/apache2/mods-available/debian-edu-userdir.conf: Make config
     snippet more generic, let it work on all hosts on the Debian Edu
     network by default.



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/65f2dbd00cdf0a69083e330b3d4546b85f5be715

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/65f2dbd00cdf0a69083e330b3d4546b85f5be715
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20181022/65865e5a/attachment.html>