From b6d8f995bcf76998a95618701a4dabce45fdca1c Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sun, 10 Nov 2013 10:06:22 +0000
Subject: [PATCH] Apache 2.4 support

---
 lam-packaging/RPM/lam.apache.conf           |  2 +-
 lam-packaging/RPM/ldap-account-manager.spec |  1 +
 lam-packaging/debian/lam.apache.conf        | 63 ++++++++++++++++-----
 3 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/lam-packaging/RPM/lam.apache.conf b/lam-packaging/RPM/lam.apache.conf
index faf8aa6e..31699bbe 100644
--- a/lam-packaging/RPM/lam.apache.conf
+++ b/lam-packaging/RPM/lam.apache.conf
@@ -13,7 +13,7 @@ Alias /lam /usr/share/ldap-account-manager
   Options -Indexes
 </Directory>
 
-<Directory /var/lib/ldap-account-manager/internal>
+<Directory /var/lib/ldap-account-manager/tmp/internal>
   Options -Indexes
   Order allow,deny
   Deny from all
diff --git a/lam-packaging/RPM/ldap-account-manager.spec b/lam-packaging/RPM/ldap-account-manager.spec
index 48dda5fc..753be093 100644
--- a/lam-packaging/RPM/ldap-account-manager.spec
+++ b/lam-packaging/RPM/ldap-account-manager.spec
@@ -95,6 +95,7 @@ if [ ! -f /var/lib/%{lam_dir}/config/config.cfg ]; then
 	fi
 fi
 %if %is_suse
+/usr/sbin/a2enmod version > /dev/null
 /etc/init.d/apache2 reload
 %endif
 %if %is_fedora
diff --git a/lam-packaging/debian/lam.apache.conf b/lam-packaging/debian/lam.apache.conf
index 31699bbe..9041a3a1 100644
--- a/lam-packaging/debian/lam.apache.conf
+++ b/lam-packaging/debian/lam.apache.conf
@@ -4,8 +4,13 @@ Alias /lam /usr/share/ldap-account-manager
 <Directory /usr/share/ldap-account-manager>
   Options +FollowSymLinks
   AllowOverride All
-  Order allow,deny
-  Allow from all
+  <IfVersion < 2.3>
+    Order allow,deny
+    Allow from all
+  </IfVersion>
+  <IfVersion >= 2.3>
+    Require all granted
+  </IfVersion>
   DirectoryIndex index.html
 </Directory>
 
@@ -15,37 +20,67 @@ Alias /lam /usr/share/ldap-account-manager
 
 <Directory /var/lib/ldap-account-manager/tmp/internal>
   Options -Indexes
-  Order allow,deny
-  Deny from all
+  <IfVersion < 2.3>
+    Order allow,deny
+    Deny from all
+  </IfVersion>
+  <IfVersion >= 2.3>
+    Require all denied
+  </IfVersion>
 </Directory>
 
 <Directory /var/lib/ldap-account-manager/sess>
   Options -Indexes
-  Order allow,deny
-  Deny from all
+  <IfVersion < 2.3>
+    Order allow,deny
+    Deny from all
+  </IfVersion>
+  <IfVersion >= 2.3>
+    Require all denied
+  </IfVersion>
 </Directory>
 
 <Directory /var/lib/ldap-account-manager/config>
   Options -Indexes
-  Order allow,deny
-  Deny from all
+  <IfVersion < 2.3>
+    Order allow,deny
+    Deny from all
+  </IfVersion>
+  <IfVersion >= 2.3>
+    Require all denied
+  </IfVersion>
 </Directory>
 
 <Directory /usr/share/ldap-account-manager/lib>
   Options -Indexes
-  Order allow,deny
-  Deny from all
+  <IfVersion < 2.3>
+    Order allow,deny
+    Deny from all
+  </IfVersion>
+  <IfVersion >= 2.3>
+    Require all denied
+  </IfVersion>
 </Directory>
 
 <Directory /usr/share/ldap-account-manager/help>
   Options -Indexes
-  Order allow,deny
-  Deny from all
+  <IfVersion < 2.3>
+    Order allow,deny
+    Deny from all
+  </IfVersion>
+  <IfVersion >= 2.3>
+    Require all denied
+  </IfVersion>
 </Directory>
 
 <Directory /usr/share/ldap-account-manager/locale>
   Options -Indexes
-  Order allow,deny
-  Deny from all
+  <IfVersion < 2.3>
+    Order allow,deny
+    Deny from all
+  </IfVersion>
+  <IfVersion >= 2.3>
+    Require all denied
+  </IfVersion>
 </Directory>