diff options
| author | Jean-Michel Vourgère <nirgal@debian.org> | 2015-07-20 15:29:40 +0200 |
|---|---|---|
| committer | Jean-Michel Vourgère <nirgal@debian.org> | 2015-07-20 15:29:40 +0200 |
| commit | 60dfe3d656aaecad281288e77d45e0fee9b3d919 (patch) | |
| tree | 8c7ac3b6e6e4e43a07a30ebd12ad8e182356ba8b | |
| parent | 03ea86ee1d1718aa4f1ac57964524dc2d86178b7 (diff) | |
| download | apache2-60dfe3d656aaecad281288e77d45e0fee9b3d919.tar.gz | |
Fixed tests on deferred mpm switch (#789914)
| -rw-r--r-- | debian/apache2.postinst | 14 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/debian/apache2.postinst b/debian/apache2.postinst index e4863bd4..1342a743 100644 --- a/debian/apache2.postinst +++ b/debian/apache2.postinst @@ -151,21 +151,21 @@ execute_deferred_actions () esac ;; apache2_switch_mpm) - local MPM="mpm_$ARG1" + local MPM="$ARG1" local CUR_MPM="$(ls /etc/apache2/mods-enabled/mpm_*.load)" CUR_MPM="${CUR_MPM##*/mpm_}" CUR_MPM="${CUR_MPM%.load}" - if [ ! -e /etc/apache2/mods-available/$MPM.load ] ; then - msg "error" "$MPM not found in 'apache2_switch_mpm $ARG1' for package $PACKAGE" + if [ ! -e /etc/apache2/mods-available/mpm_$MPM.load ] ; then + msg "error" "mpm $MPM not found in 'apache2_switch_mpm $ARG1' for package $PACKAGE" error=true - elif [ ! -e /etc/apache2/mods-enabled/$MPM.load ] ; then - msg "info" "$MPM: No action required" + elif [ -e /etc/apache2/mods-enabled/mpm_$MPM.load ] ; then + msg "info" "Switch to mpm $MPM for package $PACKAGE: No action required" else - msg "info" "Switch to $MPM for package $PACKAGE" + msg "info" "Switch to mpm $MPM for package $PACKAGE" if ! a2dismod -m -q "mpm_$CUR_MPM" || ! a2enmod -m -q "mpm_$MPM" then - msg "error" "Switching to $MPM failed" + msg "error" "Switching to mpm $MPM failed" error=true fi fi diff --git a/debian/changelog b/debian/changelog index c7b7a54d..a273fcf2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ apache2 (2.4.12-3) UNRELEASED; urgency=medium links there for dynamic loading. * Upgrade security.conf comments to 2.4 auth format. Thanks Werner Detter. Closes: #789788 + * apache2.postinst: Fixed tests on deferred mpm switch. Closes: + #789914 -- Jean-Michel Vourgère <nirgal@debian.org> Thu, 28 May 2015 16:20:59 +0200 |