Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
ai3
docker
apache2-base
Commits
73fdad52
Commit
73fdad52
authored
Aug 14, 2020
by
godog
Browse files
Options
Browse Files
Download
Plain Diff
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
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
build.sh
build.sh
+5
-1
No files found.
build.sh
View file @
73fdad52
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment