Bug#868861: Mitigation

[Michiel Hazelhof <michiel@hazelhof.nl>]

Made two small tweaks to hopefully mitigate this behaviour:

ln -s /usr/sbin/apache2 /usr/sbin/apache2-instancename

edit /usr/sbin/apache2ctl:

change:

SUFFIX="${APACHE_CONFDIR##/etc/apache2-}"
case "$SUFFIX" in
        /etc/apache2)
                SUFFIX=""
                ;;
        *)
                SUFFIX="@$SUFFIX"
                ;;
esac

to:

EXTRA=""
SUFFIX="${APACHE_CONFDIR##/etc/apache2-}"
case "$SUFFIX" in
        /etc/apache2)
                SUFFIX=""
                ;;
        *)
                EXTRA="-$SUFFIX"
                SUFFIX="@$SUFFIX"
                ;;
esac


change:

HTTPD=${APACHE_HTTPD:-/usr/sbin/apache2}

to:

HTTPD=${APACHE_HTTPD:-/usr/sbin/apache2$EXTRA}


This at least gets it running with a different "name", lets hope this
resolves the "There are processes named 'apache2' running which do not
match your pid file which are left untouched in the name of safety," issue.

With regards,

Michiel Hazelhof.

Attachment: OpenPGP_signature
Description: OpenPGP digital signature