Commit 465e8747 authored by godog's avatar godog

Introduce APACHE_LOG_PROGRAM

parent 94b36b9b
Pipeline #7415 passed with stage
in 1 minute and 6 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_LOG_PROGRAM_DEFAULT=apache
echo "export APACHE_LOG_PROGRAM=\${APACHE_LOG_PROGRAM:-${APACHE_LOG_PROGRAM_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_LOG_PROGRAM}"@' /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