← Back to branch summary

~ubuntu-branches/ubuntu/trusty/apache2/trusty

« back to all changes in this revision

Viewing changes to debian/apache2.2-common.postinst

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2010-05-05 01:28:04 UTC
  • mfrom: (14.3.15 sid)
  • Revision ID: james.westby@ubuntu.com-20100505012804-vbouq0xs3tu2vvij
Tags: 2.2.15-5ubuntu1
https://launchpad.net/bugs/456381
* Merge from debian unstable.  Remaining changes:
  - debian/{control, rules}: Enable PIE hardening.
  - debian/{control, rules, apache2.2-common.ufw.profile}: Add ufw profiles.
  - debian/control: Add bzr tag and point it to our tree.
  - debian/apache2-2.common.apache2.init: Add graceful restart (LP: #456381)
  + Dropped:
    - debian/patches/206-fix-potential-memory-leaks.dpatch: No longer needed.
    - debian/patches/206-report-max-client-mpm-worker.dpatch: No longer needed.
    - debian/config-dir/apache2.conf: Merged back from debian.
    - mod-reqtimeout functionality: Merge back from debian.
    - debian/patches/204_CVE-2010-0408.dpatch: No longer needed.
    - debian/patches/205_CVE-2010-0434.dpatch: No longer needed.
    - debian/patches/203_fix-ab-segfault.dpatch: No longer needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/apache2.2-common.postinst
43
43
 
44
44
fi
45
45
 
46
 
if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.2.4-2; then
47
 
        echo -n activating new config files ...
48
 
        for a in actions alias autoindex info mime negotiation setenvif status ; do 
 
46
if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.2.15-4~ ; then
 
47
        echo activating new config files ...
 
48
        for a in ldap proxy_balancer proxy_ftp ; do 
49
49
                if mod_is_enabled $a && [ ! -e /etc/apache2/mods-enabled/$a.conf ] ; then
50
 
                        ln -sf  ../mods-available/$a.conf /etc/apache2/mods-enabled/$a.conf
51
 
                        echo -n " $a.conf"
 
50
                        a2enmod -q $a
52
51
                fi
53
52
        done
54
53
        echo " done."
77
76
        a2enmod -q reqtimeout
78
77
fi
79
78
 
 
79
# The definition of other_vhost_access.log has been moved.
 
80
# Disable the new definition if the admin has changed the old
 
81
# one (as determined by preinst).
 
82
if [ -e /etc/apache2/disable-other-vhost-access-log.dpkg-apache2.2-common ] ; then
 
83
        echo "Disabling /etc/apache2/conf.d/other-vhosts-access-log"
 
84
        perl -p -i -e 's/^(CustomLog.*)$/#$1/' /etc/apache2/conf.d/other-vhosts-access-log
 
85
        rm  /etc/apache2/disable-other-vhost-access-log.dpkg-apache2.2-common
 
86
fi
80
87
 
81
88
rm -f /etc/apache2/ports.conf.dpkg-apache2.2-common.old
82
89
rm -f /etc/default/apache2.dpkg-apache2.2-common.old