removed support for Apache 1

This commit is contained in:
Roland Gruber 2009-07-27 20:08:07 +00:00
parent c28abe8278
commit 63d224fc4c
3 changed files with 6 additions and 23 deletions

View File

@ -66,23 +66,6 @@ if [ "$1" = "configure" ]; then
server=${server%,} server=${server%,}
test -x /usr/sbin/$server || continue test -x /usr/sbin/$server || continue
case "$server" in 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) apache2)
if [ -d /etc/$server/mods-enabled ]; then if [ -d /etc/$server/mods-enabled ]; then
if [ ! -f /etc/$server/mods-enabled/actions.load -a ! -h /etc/$server/mods-enabled/actions.load ]; then if [ ! -f /etc/$server/mods-enabled/actions.load -a ! -h /etc/$server/mods-enabled/actions.load ]; then

View File

@ -12,7 +12,7 @@ if [ -f /usr/share/debconf/confmodule ]; then
for server in $webservers; do for server in $webservers; do
server=${server%,} server=${server%,}
case "$server" in case "$server" in
apache|apache-perl|apache-ssl|apache2) apache2)
rm -f /etc/$server/conf.d/ldap-account-manager rm -f /etc/$server/conf.d/ldap-account-manager
test -x /usr/sbin/$server || continue test -x /usr/sbin/$server || continue
restart="$restart $server" restart="$restart $server"

View File

@ -1,11 +1,11 @@
Template: ldap-account-manager/config-webserver Template: ldap-account-manager/config-webserver
Type: multiselect Type: multiselect
Choices: apache, apache-ssl, apache-perl, apache2 Choices: apache2
Default: apache, apache-ssl, apache-perl, apache2 Default: apache2
_Description: Web server configuration: _Description: Web server configuration:
LDAP Account Manager supports any webserver that supports PHP4, but this LDAP Account Manager supports any webserver that supports PHP5, but this
automatic configuration process only supports Apache and Apache2. automatic configuration process only supports Apache2.
If you choose to configure Apache(2) LAM can be accessed at http(s)://localhost/lam If you choose to configure Apache2 then LAM can be accessed at http(s)://localhost/lam
Template: ldap-account-manager/alias Template: ldap-account-manager/alias
Type: string Type: string