[debian-edu-commits] debian-edu/ 01/01: Fix apache userdir configuration.

[Holger Levsen]

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

holger pushed a commit to branch jessie
in repository debian-edu-config.

commit 8edaf4575bfa54f2a57d4313936ce2cc9f1a395d
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Fri Jan 13 12:42:36 2017 +0100

    Fix apache userdir configuration.
    
    Enable the right module (debian-edu-userdir instead of stock userdir.
    Adjust configuration file to be compliant with apache 2.4.
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 cf/cf.apache2                                      | 2 +-
 etc/apache2/mods-available/debian-edu-userdir.conf | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cf/cf.apache2 b/cf/cf.apache2
index 5873d77..7898f8f 100644
--- a/cf/cf.apache2
+++ b/cf/cf.apache2
@@ -7,7 +7,7 @@ shellcommands:
       # Generate the snakeoil selfsigned certificate using the make-ssl-cert tool
       "/usr/sbin/make-ssl-cert generate-default-snakeoil"
       # Enabeling userdir, create a directory ~/public_html to make it awailable on web as http://tjener.intern/~username. 
-      "/usr/sbin/a2enmod userdir"
+      "/usr/sbin/a2enmod debian-edu-userdir"
       # Enableing ssl
       "/usr/sbin/a2enmod ssl"
       # Use our own default site configuration, and ssl site configuration. 
diff --git a/etc/apache2/mods-available/debian-edu-userdir.conf b/etc/apache2/mods-available/debian-edu-userdir.conf
index 21726d6..03e5c41 100644
--- a/etc/apache2/mods-available/debian-edu-userdir.conf
+++ b/etc/apache2/mods-available/debian-edu-userdir.conf
@@ -5,6 +5,12 @@
         <Directory /skole/tjener/home*/*/public_html>
                 AllowOverride FileInfo AuthConfig Limit
                 Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
+		<Limit GET POST OPTIONS>
+			Require all granted
+		</Limit>
+		<LimitExcept GET POST OPTIONS>
+			Require all denied
+		</LimitExcept>
         </Directory>
 </IfModule>
 

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