Skip to content

Commit 3697f45

Browse files
authored
Merge pull request #1238 from camptocamp/ghci/backport/1133-to-8.4-gdal3.10
[Backport 8.4-gdal3.10] Be able to override ErrorLogFormat
2 parents 63e42c7 + be93bde commit 3697f45

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ RUN a2enmod fcgid headers status \
104104
s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
105105
' '{}' ';' \
106106
&& sed -ri 's!LogFormat "(.*)" combined!LogFormat "%{us}T %{X-Request-Id}i \1" combined!g' /etc/apache2/apache2.conf \
107-
&& echo 'ErrorLogFormat "%{X-Request-Id}i [%l] [pid %P] %M"' >> /etc/apache2/apache2.conf \
107+
&& echo 'ErrorLogFormat "%{X-Request-Id}i [%l] [pid %P] %M"' > /etc/apache2/conf-enabled/000-error-log-format.conf \
108108
&& sed -i -e 's/<VirtualHost \*:80>/<VirtualHost *:8080>/' /etc/apache2/sites-available/000-default.conf \
109109
&& sed -i -e 's/Listen 80$/Listen 8080/' /etc/apache2/ports.conf \
110110
&& rm -rf /etc/apache2/conf-enabled/other-vhosts-access-log.conf

0 commit comments

Comments
 (0)