Modify LogFormat (#337)

* Modify LogFormat modify LogFormat to include the client ip and explicitly highlight -combined vs -forwarded * Update salt/hg/config/remoteip.apache.conf.jinja Co-authored-by: Ee Durbin <ee@python.org> * Update salt/hg/config/remoteip.apache.conf.jinja Co-authored-by: Ee Durbin <ee@python.org> --------- Co-authored-by: Ee Durbin <ee@python.org>
python · Jan 18, 2024 · d633151 · d633151
1 parent e93bdf1
commit d633151
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/salt/hg/config/remoteip.apache.conf.jinja b/salt/hg/config/remoteip.apache.conf.jinja
@@ -5,8 +5,8 @@ LoadModule remoteip_module modules/mod_remoteip.so
 SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
 
 # Define 'combined' and 'forwarded' log formats
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" forwarded
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" |%h|%a|%{X-Forwarded-For}i| -combined" combined
+LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" |%h|%a|%{X-Forwarded-For}i| -forwarded " forwarded
 
 # Specify location of error log file
 ErrorLog ${APACHE_LOG_DIR}/error.log