[apache2] 04/06: Don't treat mpm_itk as MPM module in deferred actions

[Stefan Fritsch]

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

sf pushed a commit to branch jessie
in repository apache2.

commit e9d99e20940bf59941a890672e007342eb5e27ae
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sat Oct 24 22:04:04 2015 +0200

    Don't treat mpm_itk as MPM module in deferred actions
---
 debian/apache2.postinst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index 6b82373..fc12108 100644
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -433,7 +433,7 @@ execute_deferred_actions ()
 			;;
 		apache2_switch_mpm)
 			local MPM="$ARG1"
-			local CUR_MPM="$(ls /etc/apache2/mods-enabled/mpm_*.load)"
+			local CUR_MPM="$(ls /etc/apache2/mods-enabled/mpm_*.load | grep -e event -e prefork -e worker)"
 			CUR_MPM="${CUR_MPM##*/mpm_}"
 			CUR_MPM="${CUR_MPM%.load}"
 			if [ ! -e /etc/apache2/mods-available/mpm_$MPM.load ] ; then

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