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

Introduce APACHE_SYSLOG_TAG

See merge request !2

build.sh

@@ -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