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
446cfdb8
Commit
446cfdb8
authored
Aug 17, 2020
by
ale
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'buster' into 'master'
Upgrade to Buster See merge request
!3
parents
b754cb4c
6d82aabb
Pipeline
#7483
passed with stages
in 1 minute and 55 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
Dockerfile
Dockerfile
+1
-1
build.sh
build.sh
+5
-1
conf/apache2/conf-available/logging.conf
conf/apache2/conf-available/logging.conf
+1
-1
No files found.
Dockerfile
View file @
446cfdb8
FROM
registry.git.autistici.org/ai3/docker/chaperone-base:
ma
ster
FROM
registry.git.autistici.org/ai3/docker/chaperone-base:
bu
ster
COPY
conf /tmp/conf
COPY
build.sh /tmp/build.sh
...
...
build.sh
View file @
446cfdb8
...
...
@@ -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
...
...
conf/apache2/conf-available/logging.conf
View file @
446cfdb8
LogFormat
"%{Host}i %h %l %u %t \"
%
r
\
" %>s %b \"
%{
Referer
}
i
\
" \"
%{
User
-
Agent
}
i
\
""
http_host_combined
CustomLog
"|/usr/bin/logger
-t apache
-p local4.info"
http_host_combined
CustomLog
"|/usr/bin/logger -p local4.info
-t ${APACHE_SYSLOG_TAG}
"
http_host_combined
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