Update name for apache httpd access log

ESSolutions · Nov 26, 2023 · 138d35d · 138d35d
1 parent 50c73c7
commit 138d35d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/docker/templates/config/httpd-essarch.conf b/docker/templates/config/httpd-essarch.conf
@@ -4,8 +4,8 @@
     ServerName essarch.org
 
     # Logs
-    ErrorLog "|/usr/bin/tee -a ${ESSARCH_DIR}/log/httpd_error_essarch.log"
-    CustomLog "|/usr/bin/tee -a ${ESSARCH_DIR}/log/httpd_access_essarch.log" common_ess
+    ErrorLog "|/usr/bin/tee -a ${ESSARCH_DIR}/log/httpd_essarch_error.log"
+    CustomLog "|/usr/bin/tee -a ${ESSARCH_DIR}/log/httpd_essarch_access.log" common_ess
 
     # WS (websocket)
     ProxyPass "/ws/" "${DAPHNE_URL}/ws/" upgrade=websocket
@@ -37,8 +37,8 @@
     ServerName essarch.org
 
     # Logs
-    ErrorLog "|/usr/bin/tee -a ${ESSARCH_DIR}/log/httpd_error_essarch.log"
-    CustomLog "|/usr/bin/tee -a ${ESSARCH_DIR}/log/httpd_access_essarch.log" common_ess
+    ErrorLog "|/usr/bin/tee -a ${ESSARCH_DIR}/log/httpd_essarch_error.log"
+    CustomLog "|/usr/bin/tee -a ${ESSARCH_DIR}/log/httpd_essarch_access.log" common_ess
 
     # SSL
     SSLEngine on

diff --git a/docker/templates/config/httpd.conf b/docker/templates/config/httpd.conf
@@ -31,7 +31,10 @@ Group arch
 
 ErrorLogFormat "[%{cu}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] %M% ,\ referer\ %{Referer}i"
 LogFormat "%h %l %u %t \"%r\" %>s %b" common
-LogFormat "[%{%Y-%m-%d %T}t,%{msec_frac}t: %{X-Forwarded-For}i %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x %b] %r" common_ess
+LogFormat "[%{%Y-%m-%d %T}t.%{usec_frac}t] [%{X-Forwarded-For}i %h] [%B %D] %r" common_ess
+LogFormat "[%{%Y-%m-%d %T}t,%{msec_frac}t:] [%{X-Forwarded-For}i %h] [%B %D] %r" common_ess_python
+LogFormat "[%{%Y-%m-%d %T}t.%{usec_frac}t] [%{X-Forwarded-For}i %h] [%B %D] [%{SSL_PROTOCOL}x %{SSL_CIPHER}x] %r" common_ess_ssl
+LogFormat "[%{%Y-%m-%d %T}t.%{usec_frac}t] [%{X-Forwarded-For}i %h] [%B %D] [%{User-Agent}i] %r" common_ess_agent
 CustomLog ${ESSARCH_DIR}/log/httpd_access.log common_ess
 
 ErrorLog ${ESSARCH_DIR}/log/httpd_error.log