Merge branch 'master' into custom-xdebug-host-ip

spryker · Nov 20, 2023 · 385744a · 385744a
2 parents 3ca2f40 + 448cc23
commit 385744a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/docs/07-deploy-file/02-deploy.file.reference.v1.md b/docs/07-deploy-file/02-deploy.file.reference.v1.md
@@ -771,7 +771,7 @@ groups:
 
 #### Define allowlisted IP addresses
 
-* `docker: maintenance: whitelist: ips:` - defines the allowlisted IP addresses from which the applications in the maintenance mode can be accessed.
+* `docker: maintenance: whitelist: ips:` - defines the allowlisted IP addresses or a CIDR IP from which the applications in the maintenance mode can be accessed.
 
 ```yaml
 version: 1.0

diff --git a/generator/src/templates/nginx/conf.d/frontend.default.conf.twig b/generator/src/templates/nginx/conf.d/frontend.default.conf.twig
@@ -3,7 +3,7 @@ server_tokens off;
 
 large_client_header_buffers 4 32k;
 
-map $remote_addr $is_whitelisted_ip {
+geo $is_whitelisted_ip {
      default         "0";
 {% if docker['maintenance']['whitelist']['ips'] is defined %}
 {% for ip in docker['maintenance']['whitelist']['ips'] | default([]) %}