summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--25/apache/Dockerfile6
-rw-r--r--26/apache/Dockerfile6
-rwxr-xr-xupdate.sh2
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
diff --git a/update.sh b/update.sh
index c933b2cd..3e85ef84 100755
--- a/update.sh
+++ b/update.sh
@@ -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]=''
)