diff --git a/templates/apache.conf b/templates/apache.conf index 374eadc75c6b28e38becdf0ff186379cd5abbe80..d7405e6a3635769afb13caabfe27521540d6d7e5 100644 --- a/templates/apache.conf +++ b/templates/apache.conf @@ -11,10 +11,13 @@ </Location> - ErrorLog ${APACHE_LOG_DIR}/error.log + SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded LogLevel warn +{% if apache_version == '2.4' %} + ErrorLogFormat "[%{u}t] [%l] [pid %P] [client\ %{X-Forwarded-For}i] %M% ,\ referer:\ %{Referer}i" +{% endif %} LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy - SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded + ErrorLog ${APACHE_LOG_DIR}/error.log CustomLog ${APACHE_LOG_DIR}/access.log combined env=!forwarded CustomLog ${APACHE_LOG_DIR}/access.log proxy env=forwarded </VirtualHost>