diff options
| author | Mossroy <mossroy@mossroy.fr> | 2023-08-20 23:19:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-20 21:19:13 +0000 |
| commit | 04e4138db58a1bfaccf3340c2df3d46df04beb08 (patch) | |
| tree | 161fa8bb7348ce23eb6a4cb18e58914146a4dbc3 | |
| parent | c4966442a623e04bdc438a2023b8bdb640c4408a (diff) | |
Replace RemoteIPTrustedProxy by RemoteIPInternalProxy in remoteip.conf (#2004)
Else the internal IP ranges are ignored
See https://httpd.apache.org/docs/2.4/en/mod/mod_remoteip.html#remoteiptrustedproxy and https://httpd.apache.org/docs/2.4/en/mod/mod_remoteip.html#remoteipinternalproxy
Signed-off-by: Mossroy <mossroy@mossroy.fr>
| -rw-r--r-- | 25/apache/Dockerfile | 6 | ||||
| -rw-r--r-- | 26/apache/Dockerfile | 6 | ||||
| -rwxr-xr-x | update.sh | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/25/apache/Dockerfile b/25/apache/Dockerfile index f252c5dd..927d23ba 100644 --- a/25/apache/Dockerfile +++ b/25/apache/Dockerfile @@ -124,9 +124,9 @@ VOLUME /var/www/html RUN a2enmod headers rewrite remoteip ;\ {\ echo RemoteIPHeader X-Real-IP ;\ - echo RemoteIPTrustedProxy 10.0.0.0/8 ;\ - echo RemoteIPTrustedProxy 172.16.0.0/12 ;\ - echo RemoteIPTrustedProxy 192.168.0.0/16 ;\ + echo RemoteIPInternalProxy 10.0.0.0/8 ;\ + echo RemoteIPInternalProxy 172.16.0.0/12 ;\ + echo RemoteIPInternalProxy 192.168.0.0/16 ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip diff --git a/26/apache/Dockerfile b/26/apache/Dockerfile index c2ba4d5f..e67973a8 100644 --- a/26/apache/Dockerfile +++ b/26/apache/Dockerfile @@ -125,9 +125,9 @@ VOLUME /var/www/html RUN a2enmod headers rewrite remoteip ;\ {\ echo RemoteIPHeader X-Real-IP ;\ - echo RemoteIPTrustedProxy 10.0.0.0/8 ;\ - echo RemoteIPTrustedProxy 172.16.0.0/12 ;\ - echo RemoteIPTrustedProxy 192.168.0.0/16 ;\ + echo RemoteIPInternalProxy 10.0.0.0/8 ;\ + echo RemoteIPInternalProxy 172.16.0.0/12 ;\ + echo RemoteIPInternalProxy 192.168.0.0/16 ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip @@ -29,7 +29,7 @@ declare -A base=( ) declare -A extras=( - [apache]='\nRUN a2enmod headers rewrite remoteip ;\\\n {\\\n echo RemoteIPHeader X-Real-IP ;\\\n echo RemoteIPTrustedProxy 10.0.0.0/8 ;\\\n echo RemoteIPTrustedProxy 172.16.0.0/12 ;\\\n echo RemoteIPTrustedProxy 192.168.0.0/16 ;\\\n } > /etc/apache2/conf-available/remoteip.conf;\\\n a2enconf remoteip' + [apache]='\nRUN a2enmod headers rewrite remoteip ;\\\n {\\\n echo RemoteIPHeader X-Real-IP ;\\\n echo RemoteIPInternalProxy 10.0.0.0/8 ;\\\n echo RemoteIPInternalProxy 172.16.0.0/12 ;\\\n echo RemoteIPInternalProxy 192.168.0.0/16 ;\\\n } > /etc/apache2/conf-available/remoteip.conf;\\\n a2enconf remoteip' [fpm]='' [fpm-alpine]='' ) |