From 163cd79b825d5aa6f03181a5cb95c6dcf127a49d Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Fri, 19 Jul 2013 20:45:57 +0000
Subject: [PATCH] Apache 2.4 changes

---
 lam-packaging/debian/postinst | 17 +++++++++++++----
 lam-packaging/debian/postrm   |  2 ++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/lam-packaging/debian/postinst b/lam-packaging/debian/postinst
index fed4e994..17d2be7f 100755
--- a/lam-packaging/debian/postinst
+++ b/lam-packaging/debian/postinst
@@ -80,12 +80,21 @@ if [ "$1" = "configure" ]; then
                        fi
                    fi
                fi
+               if [ -d /etc/$server/conf.d -a ! -e /etc/$server/conf.d/ldap-account-manager ]; then
+                   ln -s /etc/ldap-account-manager/apache.conf /etc/$server/conf.d/ldap-account-manager
+                   restart="$restart $server"
+               fi
+               if [ -d /etc/$server/conf-available ]; then
+                   if [ ! -e /etc/$server/conf-available/ldap-account-manager ]; then
+                       ln -s /etc/ldap-account-manager/apache.conf /etc/$server/conf-available/ldap-account-manager
+                   fi
+                   if [ ! -e /etc/$server/conf-enabled/ldap-account-manager ]; then
+                       ln -s ../conf-available/ldap-account-manager /etc/$server/conf-enabled/ldap-account-manager
+                   fi
+                   restart="$restart $server"
+               fi
                ;;
        esac
-       if [ ! -f /etc/$server/conf.d/ldap-account-manager -a ! -h /etc/$server/conf.d/ldap-account-manager ]; then
-           ln -s /etc/ldap-account-manager/apache.conf /etc/$server/conf.d/ldap-account-manager
-	    restart="$restart $server"
-       fi
    done
    db_get "ldap-account-manager/restart-webserver"
    if [ "$RET" = "true" ]; then
diff --git a/lam-packaging/debian/postrm b/lam-packaging/debian/postrm
index 5a3c37bc..5f43352a 100755
--- a/lam-packaging/debian/postrm
+++ b/lam-packaging/debian/postrm
@@ -22,6 +22,8 @@ if [ -f /usr/share/debconf/confmodule ]; then
 				case "$server" in
 						apache2)
 								rm -f /etc/$server/conf.d/ldap-account-manager
+								rm -f /etc/$server/conf-available/ldap-account-manager
+								rm -f /etc/$server/conf-enabled/ldap-account-manager
 								test -x /usr/sbin/$server || continue
 								restart="$restart $server"
 								;;