Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
apache2-base
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ai3
docker
apache2-base
Commits
17797a52
Commit
17797a52
authored
3 years ago
by
ale
Browse files
Options
Downloads
Patches
Plain Diff
Make LogLevel configurable from env (2nd attempt)
parent
4cf1e526
No related branches found
No related tags found
No related merge requests found
Pipeline
#59436
failed
1 year ago
Changes
1
Pipelines
6
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
build.sh
+4
-1
4 additions, 1 deletion
build.sh
with
4 additions
and
1 deletion
build.sh
+
4
−
1
View file @
17797a52
...
@@ -60,9 +60,12 @@ rsync -a /tmp/conf/ /etc/
...
@@ -60,9 +60,12 @@ rsync -a /tmp/conf/ /etc/
# Set the Apache syslog program
# Set the Apache syslog program
APACHE_SYSLOG_TAG_DEFAULT
=
apache
APACHE_SYSLOG_TAG_DEFAULT
=
apache
echo
"export APACHE_SYSLOG_TAG=
\$
{APACHE_SYSLOG_TAG:-
${
APACHE_SYSLOG_TAG_DEFAULT
}
}"
>>
/etc/apache2/envvars
echo
"export APACHE_SYSLOG_TAG=
\$
{APACHE_SYSLOG_TAG:-
${
APACHE_SYSLOG_TAG_DEFAULT
}
}"
>>
/etc/apache2/envvars
echo
"export APACHE_LOG_LEVEL=
\$
{APACHE_LOG_LEVEL:-warn}"
>>
/etc/apache2/envvars
# Fix Apache error logging.
# Fix Apache error logging.
sed
-i
-e
's@^ErrorLog.*$@ErrorLog "|/usr/bin/logger -p daemon.error -t \${APACHE_SYSLOG_TAG}"@'
/etc/apache2/apache2.conf
sed
-i
-e
's@^ErrorLog.*$@ErrorLog "|/usr/bin/logger -p daemon.error -t \${APACHE_SYSLOG_TAG}"@'
\
-e
's,^LogLevel .*,LogLevel ${APACHE_LOG_LEVEL},'
\
/etc/apache2/apache2.conf
# Make APACHE_RUN_USER externally configurable (defaults to www-data if unset)
# Make APACHE_RUN_USER externally configurable (defaults to www-data if unset)
# and fix some paths used by apache2 to be container-friendly.
# and fix some paths used by apache2 to be container-friendly.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment