From 63d224fc4cec3aaf17d020d9c0bfc29eedf7cb6f Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Mon, 27 Jul 2009 20:08:07 +0000
Subject: [PATCH] removed support for Apache 1

---
 lam-packaging/debian/postinst  | 17 -----------------
 lam-packaging/debian/postrm    |  2 +-
 lam-packaging/debian/templates | 10 +++++-----
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/lam-packaging/debian/postinst b/lam-packaging/debian/postinst
index c3c40937..1c4b5c99 100755
--- a/lam-packaging/debian/postinst
+++ b/lam-packaging/debian/postinst
@@ -66,23 +66,6 @@ if [ "$1" = "configure" ]; then
        server=${server%,}
        test -x /usr/sbin/$server || continue
        case "$server" in
-           apache|apache-perl|apache-ssl)
-               if [ -x /usr/sbin/modules-config ]; then
-                   if [ -f /usr/lib/apache/1.3/libphp5.so ]; then
-                       if ! grep "^LoadModule php5_module " /etc/$server/modules.conf > /dev/null 2>&1; then
-                           modules-config $server enable mod_php5
-                       fi
-                   fi
-               fi
-               if ! grep "^Include /etc/$server/conf.d" /etc/$server/httpd.conf > /dev/null 2>&1; then
-                   cp -f /etc/$server/httpd.conf /etc/$server/httpd.conf.old.ldap-account-manager
-                   echo "Include /etc/$server/conf.d" >> /etc/$server/httpd.conf
-               fi
-               if [ -f /etc/$server/httpd.conf.old.ldap-account-manager -a ! -f /etc/$server/httpd.conf.old ]; then
-                   mv -f /etc/$server/httpd.conf.old.ldap-account-manager /etc/$server/httpd.conf.old
-               fi
-               mkdir -p /etc/$server/conf.d
-               ;;
            apache2)
                if [ -d /etc/$server/mods-enabled ]; then
                    if [ ! -f /etc/$server/mods-enabled/actions.load -a ! -h /etc/$server/mods-enabled/actions.load ]; then
diff --git a/lam-packaging/debian/postrm b/lam-packaging/debian/postrm
index 7c3e819f..49a128e0 100755
--- a/lam-packaging/debian/postrm
+++ b/lam-packaging/debian/postrm
@@ -12,7 +12,7 @@ if [ -f /usr/share/debconf/confmodule ]; then
 	for server in $webservers; do
 			 server=${server%,}
 			 case "$server" in
-					 apache|apache-perl|apache-ssl|apache2)
+					 apache2)
 							 rm -f /etc/$server/conf.d/ldap-account-manager
 							 test -x /usr/sbin/$server || continue
 							 restart="$restart $server"
diff --git a/lam-packaging/debian/templates b/lam-packaging/debian/templates
index a6dfb224..6e4e8810 100644
--- a/lam-packaging/debian/templates
+++ b/lam-packaging/debian/templates
@@ -1,11 +1,11 @@
 Template: ldap-account-manager/config-webserver
 Type: multiselect
-Choices: apache, apache-ssl, apache-perl, apache2
-Default: apache, apache-ssl, apache-perl, apache2
+Choices: apache2
+Default: apache2
 _Description: Web server configuration:
- LDAP Account Manager supports any webserver that supports PHP4, but this
- automatic configuration process only supports Apache and Apache2.
- If you choose to configure Apache(2) LAM can be accessed at http(s)://localhost/lam
+ LDAP Account Manager supports any webserver that supports PHP5, but this
+ automatic configuration process only supports Apache2.
+ If you choose to configure Apache2 then LAM can be accessed at http(s)://localhost/lam
 
 Template: ldap-account-manager/alias
 Type: string