diff options
| author | Stefan Fritsch <sf@sfritsch.de> | 2015-10-24 22:04:04 +0200 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2015-10-24 22:04:04 +0200 |
| commit | 5b11ffcaa11cd72e8a80beaa23d90c27bbb11f9b (patch) | |
| tree | f4ea679b4c4ce22c036240e71f364420ac8dcd24 | |
| parent | e99908cf4895df9519303df909b10bd124f52be0 (diff) | |
| download | apache2-5b11ffcaa11cd72e8a80beaa23d90c27bbb11f9b.tar.gz | |
Don't treat mpm_itk as MPM module in deferred actions
| -rw-r--r-- | debian/apache2.postinst | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/apache2.postinst b/debian/apache2.postinst index 1342a743..95884aa2 100644 --- a/debian/apache2.postinst +++ b/debian/apache2.postinst @@ -152,7 +152,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 diff --git a/debian/changelog b/debian/changelog index 7489db8e..97c18453 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ apache2 (2.4.17-1) UNRELEASED; urgency=medium * Conflict with apache2.2-common and apache2.2-bin to get the transitional packages removed. Closes: #768815 * Don't treat mpm_itk as MPM module in a2query. Closes: #791902 + * Don't treat mpm_itk as MPM module in deferred actions in postinst. + Hopefully really closes: #789914 * Don't treat mpm_itk as MPM module in a2enmod. [ Jean-Michel Vourgère ] |