aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-03-15 19:05:09 +01:00
Code Activity

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Dan Mateas 2023-08-20 23:37:27 +00:00
commit 026950f0a2
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
25/apache/Dockerfile
View file

@ -124,9 +124,9 @@ VOLUME /var/www/html
RUN a2enmod headers rewrite remoteip ;\ RUN a2enmod headers rewrite remoteip ;\
{\ {\
echo RemoteIPHeader X-Real-IP ;\ echo RemoteIPHeader X-Real-IP ;\
echo RemoteIPTrustedProxy 10.0.0.0/8 ;\ echo RemoteIPInternalProxy 10.0.0.0/8 ;\
echo RemoteIPTrustedProxy 172.16.0.0/12 ;\ echo RemoteIPInternalProxy 172.16.0.0/12 ;\
echo RemoteIPTrustedProxy 192.168.0.0/16 ;\ echo RemoteIPInternalProxy 192.168.0.0/16 ;\
} > /etc/apache2/conf-available/remoteip.conf;\ } > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip a2enconf remoteip

6
26/apache/Dockerfile
View file

@ -125,9 +125,9 @@ VOLUME /var/www/html
RUN a2enmod headers rewrite remoteip ;\ RUN a2enmod headers rewrite remoteip ;\
{\ {\
echo RemoteIPHeader X-Real-IP ;\ echo RemoteIPHeader X-Real-IP ;\
echo RemoteIPTrustedProxy 10.0.0.0/8 ;\ echo RemoteIPInternalProxy 10.0.0.0/8 ;\
echo RemoteIPTrustedProxy 172.16.0.0/12 ;\ echo RemoteIPInternalProxy 172.16.0.0/12 ;\
echo RemoteIPTrustedProxy 192.168.0.0/16 ;\ echo RemoteIPInternalProxy 192.168.0.0/16 ;\
} > /etc/apache2/conf-available/remoteip.conf;\ } > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip a2enconf remoteip

6
27/apache/Dockerfile
View file

@ -125,9 +125,9 @@ VOLUME /var/www/html
RUN a2enmod headers rewrite remoteip ;\ RUN a2enmod headers rewrite remoteip ;\
{\ {\
echo RemoteIPHeader X-Real-IP ;\ echo RemoteIPHeader X-Real-IP ;\
echo RemoteIPTrustedProxy 10.0.0.0/8 ;\ echo RemoteIPInternalProxy 10.0.0.0/8 ;\
echo RemoteIPTrustedProxy 172.16.0.0/12 ;\ echo RemoteIPInternalProxy 172.16.0.0/12 ;\
echo RemoteIPTrustedProxy 192.168.0.0/16 ;\ echo RemoteIPInternalProxy 192.168.0.0/16 ;\
} > /etc/apache2/conf-available/remoteip.conf;\ } > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip a2enconf remoteip

2
update.sh
View file

@ -29,7 +29,7 @@ declare -A base=(
) )
declare -A extras=( 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]=''
[fpm-alpine]='' [fpm-alpine]=''
) )