Changed APP_TRUSTED_PROXIES to TRUSTED_PROXIES (#521)

ezsystems · Apr 2, 2020 · 070fdde · 070fdde
1 parent fb2ca1b
commit 070fdde
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 10 deletions.
diff --git a/bin/vhost.sh b/bin/vhost.sh
@@ -12,7 +12,7 @@ declare -a option_vars=(
     %APP_ENV%
     %APP_DEBUG%
     %APP_HTTP_CACHE%
-    %APP_TRUSTED_PROXIES%
+    %TRUSTED_PROXIES%
     %BODY_SIZE_LIMIT%
     %TIMEOUT%
     %FASTCGI_PASS%

diff --git a/doc/apache2/vhost.template b/doc/apache2/vhost.template
@@ -56,15 +56,15 @@
     # Optional: Whether to use Symfony's builtin HTTP Caching Proxy.
     # Disable it if you are using an external reverse proxy (e.g. Varnish)
     # Possible values: 0, 1 or ""
-    # Defaults to disabled if APP_ENV is set to "dev" or APP_TRUSTED_PROXIES is set,
+    # Defaults to disabled if APP_ENV is set to "dev" or TRUSTED_PROXIES is set,
     # and if this env value is omitted or empty
     #if[APP_HTTP_CACHE] SetEnv APP_HTTP_CACHE "%APP_HTTP_CACHE%"
 
     # Optional: Defines the proxies to trust
     # Needed when using Varnish as proxy, if so disable APP_HTTP_CACHE.
     # Separate entries by a comma, example: "ip1,ip2"
     # Defaults to not be set if env value is omitted or empty
-    #if[APP_TRUSTED_PROXIES] SetEnv APP_TRUSTED_PROXIES "%APP_TRUSTED_PROXIES%"
+    #if[TRUSTED_PROXIES] SetEnv TRUSTED_PROXIES "%TRUSTED_PROXIES%"
 
     # TIP: There are many more environment variables supported by eZ Platform. However unlike those listed above
     #      they should in most cases rather be set in the environment then in vhost config to make sure cronjobs

diff --git a/doc/docker/base-dev.yml b/doc/docker/base-dev.yml
@@ -16,7 +16,7 @@ services:
      - APP_ENV=${APP_ENV-dev}
      - APP_DEBUG
      - APP_HTTP_CACHE
-     - APP_TRUSTED_PROXIES
+     - TRUSTED_PROXIES
      - DATABASE_USER
      - DATABASE_PASSWORD
      - DATABASE_NAME

diff --git a/doc/docker/base-prod.yml b/doc/docker/base-prod.yml
@@ -17,7 +17,7 @@ services:
      - APP_ENV=${APP_ENV-prod}
      - APP_DEBUG
      - APP_HTTP_CACHE
-     - APP_TRUSTED_PROXIES
+     - TRUSTED_PROXIES
      - DATABASE_USER
      - DATABASE_PASSWORD
      - DATABASE_NAME

diff --git a/doc/docker/distribution.yml b/doc/docker/distribution.yml
@@ -23,7 +23,7 @@ services:
      - APP_ENV=${APP_ENV-prod}
      - APP_DEBUG
      - APP_HTTP_CACHE
-     - APP_TRUSTED_PROXIES
+     - TRUSTED_PROXIES
      - DATABASE_USER
      - DATABASE_PASSWORD
      - DATABASE_NAME

diff --git a/doc/docker/my-ez-app-stack.yml b/doc/docker/my-ez-app-stack.yml
@@ -25,15 +25,14 @@ services:
      - APP_ENV=prod
      - APP_DEBUG
      - APP_HTTP_CACHE
-     - APP_TRUSTED_PROXIES
      - DATABASE_USER=ezp
      - DATABASE_PASSWORD=SetYourOwnPassword
      - DATABASE_NAME=ezp
      - DATABASE_HOST=db
      - CUSTOM_CACHE_POOL=singleredis
      - CACHE_HOST=redis
      - APP_HTTP_CACHE=0
-     - APP_TRUSTED_PROXIES=varnish
+     - TRUSTED_PROXIES=varnish
      - HTTPCACHE_PURGE_SERVER=http://varnish
      - HTTPCACHE_PURGE_TYPE=http
      - PHP_INI_ENV_session.save_handler=redis

diff --git a/doc/docker/varnish.yml b/doc/docker/varnish.yml
@@ -9,7 +9,7 @@ services:
   app:
     environment:
      - APP_HTTP_CACHE=0
-     - APP_TRUSTED_PROXIES=varnish
+     - TRUSTED_PROXIES=varnish
      - HTTPCACHE_PURGE_SERVER=http://varnish
      - HTTPCACHE_PURGE_TYPE=varnish
 

diff --git a/doc/nginx/vhost.template b/doc/nginx/vhost.template
@@ -58,7 +58,7 @@ server {
             # Needed when using Varnish as proxy, if so disable APP_HTTP_CACHE.
             # Separate entries by a comma, example: "ip1,ip2"
             # Defaults to not be set if env value is omitted or empty
-            #if[APP_TRUSTED_PROXIES] fastcgi_param APP_TRUSTED_PROXIES "%APP_TRUSTED_PROXIES%";
+            #if[TRUSTED_PROXIES] fastcgi_param TRUSTED_PROXIES "%TRUSTED_PROXIES%";
 
             # TIP: There are many more environment variables supported by eZ Platform. However unlike those listed above
             #      they should in most cases rather be set in the environment then in vhost config to make sure cronjobs