Skip to content

Fix client IP logging in Watcher API VirtualHost #398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fmount wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −9
Open

Fix client IP logging in Watcher API VirtualHost #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions templates/watcherapi/config/10-watcher-wsgi-main.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
## Logging
ErrorLog /dev/stdout
ServerSignature Off
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
CustomLog /dev/stdout combined env=!forwarded
CustomLog /dev/stdout proxy env=forwarded
## set watcher log level to debug
Expand Down
15 changes: 6 additions & 9 deletions templates/watcherapi/config/httpd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,12 @@ AccessFileName .htaccess
Include "/etc/httpd/conf.modules.d/*.conf"
Include "/etc/httpd/conf.d/*.conf"

LogFormat "%a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
LogFormat "%a %l %u %t \"%r\" %>s %b" common
LogFormat "%{Referer}i -> %U" referer
LogFormat "%{User-agent}i" agent
LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %s %b \"%{Referer}i\" \"%{User-agent}i\"" forwarded

ErrorLog /dev/stderr
TransferLog /dev/stdout
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\"" proxy

SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
ErrorLog /dev/stdout
CustomLog /dev/stdout combined env=!forwarded
CustomLog /dev/stdout proxy env=!forwarded
CustomLog /dev/stdout proxy env=forwarded
## set default apache log level to infor from warning
LogLevel info
Loading