[shibboleth-sp2] 02/03: Enable the module by default on new installs

[Russ Allbery]

This is an automated email from the git hooks/post-receive script.

rra pushed a commit to branch wheezy-backports
in repository shibboleth-sp2.

commit 8b6f7edd5a056110367aa14531b4a805e15cf155
Author: Russ Allbery <rra at debian.org>
Date:   Sun Apr 6 18:22:03 2014 -0700

    Enable the module by default on new installs
    
    We previously didn't enable the module by default, but this is now
    the expected behavior under Apache 2.4.  Echo that behavior in the
    backport.
---
 debian/libapache2-mod-shib2.postinst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/libapache2-mod-shib2.postinst b/debian/libapache2-mod-shib2.postinst
index fa74521..171365b 100755
--- a/debian/libapache2-mod-shib2.postinst
+++ b/debian/libapache2-mod-shib2.postinst
@@ -12,11 +12,17 @@ if [ "$1" = "configure" ] ; then
 
     # The new shibd (which is about to be started) requires the corresponding
     # Apache module, otherwise strange, hard to debug error messages result.
+    # Restart Apache if the module was previously loaded.
     if [ -f /etc/apache2/mods-enabled/shib2.load ] ; then
         if invoke-rc.d apache2 status >/dev/null 2>&1 ; then
             invoke-rc.d apache2 restart
         fi
     fi
+
+    # Enable the module by default on new installs.
+    if [ -z "$2" ] && [ ! -e /etc/apache2/mods-enabled/shib2.load ] ; then
+        a2enmod shib2
+    fi
 fi
 
 # Create the cache directory owned by the shibd user.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git