[shibboleth-sp2] 02/02: Move a2enmod handling to libapache2-mod-shib2

[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 f1ff4bef5a7524668aefdcd71cf81d7c256bf529
Author: Russ Allbery <rra at debian.org>
Date:   Thu Nov 27 18:34:50 2014 -0800

    Move a2enmod handling to libapache2-mod-shib2
    
    For any future backport, run a2enmod in the postinst script of
    libapache2-mod-shib2, instead of shibboleth-sp2-utils.  This
    matches prerm handling and avoids the need to check for a2enmod.
    Add a dependency on apache2.2-common to ensure a2enmod is
    available, which shouldn't be an issue for the Apache module.
---
 debian/changelog                     |  8 ++++++++
 debian/control                       |  2 +-
 debian/libapache2-mod-shib2.postinst | 14 ++++++++++++++
 debian/shibboleth-sp2-utils.postinst |  8 --------
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14e618a..d1617e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+shibboleth-sp2 (2.5.3+dfsg-1~bpo70+3) UNRELEASED; urgency=medium
+
+  * Move enabling of the Apache module from the postinst script of
+    shibboleth-sp2-utils to libapache2-mod-shib2, which is only used with
+    Apache, and add a dependency on apache2.2-common.
+
+ -- Russ Allbery <rra at debian.org>  Thu, 27 Nov 2014 18:34:30 -0800
+
 shibboleth-sp2 (2.5.3+dfsg-1~bpo70+2) wheezy-backports; urgency=medium
 
   * shibboleth-sp2-utils: check before enabling Apache module
diff --git a/debian/control b/debian/control
index 53668c5..729866a 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-shibboleth/shibboleth-sp2.g
 Package: libapache2-mod-shib2
 Section: httpd
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache2.2-common,
  libshibsp-plugins (= ${binary:Version}), shibboleth-sp2-utils (>= 2.5)
 Recommends: apache2
 Description: Federated web single sign-on system (Apache module)
diff --git a/debian/libapache2-mod-shib2.postinst b/debian/libapache2-mod-shib2.postinst
new file mode 100755
index 0000000..3b25979
--- /dev/null
+++ b/debian/libapache2-mod-shib2.postinst
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+# Enable the module by default on new installs.
+if [ "$1" = "configure" ] && [ -z "$2" ] ; then
+    if [ ! -e /etc/apache2/mods-enabled/shib2.load ] ; then
+        a2enmod shib2
+    fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/shibboleth-sp2-utils.postinst b/debian/shibboleth-sp2-utils.postinst
index e4eeaa4..8eaad2d 100755
--- a/debian/shibboleth-sp2-utils.postinst
+++ b/debian/shibboleth-sp2-utils.postinst
@@ -18,14 +18,6 @@ if [ "$1" = "configure" ] ; then
             invoke-rc.d apache2 restart
         fi
     fi
-
-    # Enable the module by default on new installs.
-    A2ENMOD="`which a2enmod || echo ''`"
-    if [ -z "$2" ] && [ -n "$A2ENMOD" ] && [ -x "$A2ENMOD" ] \
-        && [ -e /etc/apache2/mods-available/shib2.load ] \
-        && [ ! -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