Commit 73fdad52 authored by godog's avatar godog

Merge branch 'apache-log-program' into 'buster'

Introduce APACHE_SYSLOG_TAG

See merge request !2
parents 94b36b9b 21198e98
Pipeline #7417 passed with stage
in 1 minute and 7 seconds
......@@ -56,8 +56,12 @@ install_packages ${BUILD_PACKAGES} ${PACKAGES}
chmod -R go-w /tmp/conf
rsync -a /tmp/conf/ /etc/
# Set the Apache syslog program
APACHE_SYSLOG_TAG_DEFAULT=apache
echo "export APACHE_SYSLOG_TAG=\${APACHE_SYSLOG_TAG:-${APACHE_SYSLOG_TAG_DEFAULT}}" >> /etc/apache2/envvars
# Fix Apache error logging.
sed -i -e 's@^ErrorLog.*$@ErrorLog "|/usr/bin/logger -p daemon.error -t apache"@' /etc/apache2/apache2.conf
sed -i -e 's@^ErrorLog.*$@ErrorLog "|/usr/bin/logger -p daemon.error -t \${APACHE_SYSLOG_TAG}"@' /etc/apache2/apache2.conf
# Make APACHE_RUN_USER externally configurable (defaults to www-data if unset).
sed -i -e 's/^\(export APACHE_RUN_USER=\).*$/\1${APACHE_RUN_USER:-www-data}/' /etc/apache2/envvars
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment