From f2d9643a4168568c2f376b9807e591be86ebb16a Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 19 Jul 2013 21:06:13 +0000 Subject: [PATCH] Apache 2.4 changes --- lam-packaging/debian/postinst | 6 +++--- lam-packaging/debian/postrm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lam-packaging/debian/postinst b/lam-packaging/debian/postinst index 17d2be7f..56d0f3fa 100755 --- a/lam-packaging/debian/postinst +++ b/lam-packaging/debian/postinst @@ -86,10 +86,10 @@ if [ "$1" = "configure" ]; then 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 + 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 ]; then - ln -s ../conf-available/ldap-account-manager /etc/$server/conf-enabled/ldap-account-manager + if [ ! -e /etc/$server/conf-enabled/ldap-account-manager.conf ]; then + ln -s ../conf-available/ldap-account-manager.conf /etc/$server/conf-enabled/ldap-account-manager.conf fi restart="$restart $server" fi diff --git a/lam-packaging/debian/postrm b/lam-packaging/debian/postrm index 5f43352a..16d3fdba 100755 --- a/lam-packaging/debian/postrm +++ b/lam-packaging/debian/postrm @@ -22,8 +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 + 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" ;;