diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2020-10-16 09:25:43 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-10-16 09:25:43 +0200 |
| commit | 9ab05c7f67a04409245b97c7c22a746b32e07847 (patch) | |
| tree | 12d8d0ffa5eedc459e5a88a3f822e507f1a5cd73 | |
| parent | c6b843e04eff863cbf687e4ecbaa4e0ec989418d (diff) | |
Docker: Use Apache remoteip (#3226)
#fix https://github.com/FreshRSS/FreshRSS/issues/3224
Log the client remote IP instead of the local proxy IP
https://httpd.apache.org/docs/2.4/mod/mod_remoteip.html
| -rw-r--r-- | Docker/Dockerfile | 2 | ||||
| -rw-r--r-- | Docker/Dockerfile-Alpine | 2 | ||||
| -rw-r--r-- | Docker/Dockerfile-QEMU-ARM | 2 | ||||
| -rw-r--r-- | Docker/FreshRSS.Apache.conf | 5 |
4 files changed, 7 insertions, 4 deletions
diff --git a/Docker/Dockerfile b/Docker/Dockerfile index b347aac09..1ff83c2fd 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -35,7 +35,7 @@ LABEL \ org.opencontainers.image.version="$FRESHRSS_VERSION" RUN a2dismod -f alias autoindex negotiation status && \ - a2enmod deflate expires headers mime setenvif && \ + a2enmod deflate expires headers mime remoteip setenvif && \ a2disconf '*' && \ a2dissite '*' && \ a2ensite 'FreshRSS*' diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpine index d58e6e346..d634d766d 100644 --- a/Docker/Dockerfile-Alpine +++ b/Docker/Dockerfile-Alpine @@ -34,7 +34,7 @@ RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ /etc/apache2/conf.d/status.conf /etc/apache2/conf.d/userdir.conf && \ sed -r -i "/^\s*LoadModule .*mod_(alias|autoindex|negotiation|status).so$/s/^/#/" \ /etc/apache2/httpd.conf && \ - sed -r -i "/^\s*#\s*LoadModule .*mod_(deflate|expires|headers|mime|setenvif).so$/s/^\s*#//" \ + sed -r -i "/^\s*#\s*LoadModule .*mod_(deflate|expires|headers|mime|remoteip|setenvif).so$/s/^\s*#//" \ /etc/apache2/httpd.conf && \ sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" \ /etc/apache2/httpd.conf && \ diff --git a/Docker/Dockerfile-QEMU-ARM b/Docker/Dockerfile-QEMU-ARM index 6f541d8b7..836a00650 100644 --- a/Docker/Dockerfile-QEMU-ARM +++ b/Docker/Dockerfile-QEMU-ARM @@ -41,7 +41,7 @@ LABEL \ org.opencontainers.image.version="$FRESHRSS_VERSION" RUN a2dismod -f alias autoindex negotiation status && \ - a2enmod deflate expires headers mime setenvif && \ + a2enmod deflate expires headers mime remoteip setenvif && \ a2disconf '*' && \ a2dissite '*' && \ a2ensite 'FreshRSS*' diff --git a/Docker/FreshRSS.Apache.conf b/Docker/FreshRSS.Apache.conf index 6621ff16f..004c6c8e2 100644 --- a/Docker/FreshRSS.Apache.conf +++ b/Docker/FreshRSS.Apache.conf @@ -1,7 +1,10 @@ ServerName freshrss.localhost Listen 0.0.0.0:80 DocumentRoot /var/www/FreshRSS/p/ -CustomLog /dev/stdout combined +RemoteIPHeader X-Forwarded-For +RemoteIPTrustedProxy 10.0.0.1/8 172.16.0.1/12 192.168.0.1/16 +LogFormat "%a %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined_proxy +CustomLog /dev/stdout combined_proxy ErrorLog /dev/stderr AllowEncodedSlashes On ServerTokens OS |