Merge pull request #830 from mossroy/replace-RemoteIPTrustedProxy-by-…

…RemoteIPInternalProxy Replace RemoteIPTrustedProxy by RemoteIPInternalProxy in remoteip.conf
docker-library · Jun 5, 2023 · d0c948b · d0c948b
2 parents 68ba8ed + a0aacf3
commit d0c948b
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 35 deletions.
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -165,11 +165,11 @@ RUN set -eux; \
 	{ \
 		echo 'RemoteIPHeader X-Forwarded-For'; \
 # these IP ranges are reserved for "private" use and should thus *usually* be safe inside Docker
-		echo 'RemoteIPTrustedProxy 10.0.0.0/8'; \
-		echo 'RemoteIPTrustedProxy 172.16.0.0/12'; \
-		echo 'RemoteIPTrustedProxy 192.168.0.0/16'; \
-		echo 'RemoteIPTrustedProxy 169.254.0.0/16'; \
-		echo 'RemoteIPTrustedProxy 127.0.0.0/8'; \
+		echo 'RemoteIPInternalProxy 10.0.0.0/8'; \
+		echo 'RemoteIPInternalProxy 172.16.0.0/12'; \
+		echo 'RemoteIPInternalProxy 192.168.0.0/16'; \
+		echo 'RemoteIPInternalProxy 169.254.0.0/16'; \
+		echo 'RemoteIPInternalProxy 127.0.0.0/8'; \
 	} > /etc/apache2/conf-available/remoteip.conf; \
 	a2enconf remoteip; \
 # https://github.com/docker-library/wordpress/issues/383#issuecomment-507886512

diff --git a/beta/php8.0/apache/Dockerfile b/beta/php8.0/apache/Dockerfile
diff --git a/beta/php8.1/apache/Dockerfile b/beta/php8.1/apache/Dockerfile
diff --git a/beta/php8.2/apache/Dockerfile b/beta/php8.2/apache/Dockerfile
diff --git a/latest/php8.0/apache/Dockerfile b/latest/php8.0/apache/Dockerfile
diff --git a/latest/php8.1/apache/Dockerfile b/latest/php8.1/apache/Dockerfile
diff --git a/latest/php8.2/apache/Dockerfile b/latest/php8.2/apache/Dockerfile