From c5a47f16918ef767a6ab4dbe10b875021c72dbd4 Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Mon, 17 Apr 2017 11:52:18 +0200
Subject: [PATCH] do not enable PHP by default (done by PHP package itself)

---
 lam-packaging/debian/postinst | 23 ++++-------------------
 lam-packaging/debian/postrm   |  3 +--
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/lam-packaging/debian/postinst b/lam-packaging/debian/postinst
index b56ab727..3d5a9fe1 100755
--- a/lam-packaging/debian/postinst
+++ b/lam-packaging/debian/postinst
@@ -59,31 +59,16 @@ if [ "$1" = "configure" ]; then
                if [ -h /etc/$server/conf.d/ldap-account-manager ]; then
                    rm -f /etc/$server/conf.d/ldap-account-manager
                fi
-
-               if [ -d /etc/$server/mods-enabled ] && [ -d /etc/$server/mods-available ]; then
-                   if [ -f /etc/$server/mods-available/php5.load ]; then
-                       if [ ! -f /etc/$server/mods-enabled/php5.load -a ! -h /etc/$server/mods-enabled/php5.load ]; then
-                           ln -s /etc/$server/mods-available/php5.load /etc/$server/mods-enabled/php5.load
-                       fi
-                   fi
-                   if [ -f /etc/$server/mods-available/php5.conf ]; then
-                       if [ ! -f /etc/$server/mods-enabled/php5.conf -a ! -h /etc/$server/mods-enabled/php5.conf ]; then
-                           ln -s /etc/$server/mods-available/php5.conf /etc/$server/mods-enabled/php5.conf
-                       fi
-                   fi
-               fi
-               if [ -d /etc/$server/conf-available ] && [ -d /etc/$server/conf-enabled ]; then
+               if [ -d /etc/$server/conf-available ] ]; then
                    if [ ! -e /etc/$server/conf-available/ldap-account-manager.conf ]; then
                        if [ -h /etc/$server/conf-available/ldap-account-manager.conf ]; then
                            rm /etc/$server/conf-available/ldap-account-manager.conf
                        fi
                        ln -s /etc/ldap-account-manager/apache.conf /etc/$server/conf-available/ldap-account-manager.conf
                    fi
-                   if [ ! -e /etc/$server/conf-enabled/ldap-account-manager.conf ]; then
-                       if [ -h /etc/$server/conf-enabled/ldap-account-manager.conf ]; then
-                           rm /etc/$server/conf-enabled/ldap-account-manager.conf
-                       fi
-                       ln -s ../conf-available/ldap-account-manager.conf /etc/$server/conf-enabled/ldap-account-manager.conf
+                   a2query -q -c ldap-account-manager
+                   if [ $? -ne 0 ]; then
+                       a2enconf -q ldap-account-manager
                    fi
                    restart="$restart $server"
                fi
diff --git a/lam-packaging/debian/postrm b/lam-packaging/debian/postrm
index 03c91bbc..961178bb 100755
--- a/lam-packaging/debian/postrm
+++ b/lam-packaging/debian/postrm
@@ -20,9 +20,8 @@ if [ -f /usr/share/debconf/confmodule ]; then
 				server=${server%,}
 				case "$server" in
 						apache2)
-								rm -f /etc/$server/conf.d/ldap-account-manager
+								a2disconf -q ldap-account-manager
 								rm -f /etc/$server/conf-available/ldap-account-manager.conf
-								rm -f /etc/$server/conf-enabled/ldap-account-manager.conf
 								test -x /usr/sbin/$server || continue
 								restart="$restart $server"
 								;;