Fixed nginx set_real_ip_from conf

Author: rimi-itk

.github/workflows/pr.yaml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version:
+        version: &template_version
           - drupal-7
           - drupal-8
           - drupal-9
@@ -32,3 +32,25 @@ jobs:
           [ -z "$DC" ] || { echo $DC; exit 1; }
           DC=$(COMPOSE_SERVER_DOMAIN=test.itkdev.dk docker compose --file templates/${{ matrix.version }}/docker-compose.server.yml --file templates/${{ matrix.version }}/docker-compose.redirect.yml config --quiet 2>&1)
           [ -z "$DC" ] || { echo $DC; exit 1; }
+
+  validate-nginx-conf:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        version: *template_version
+        compose_file:
+          - docker-compose.yml
+          - docker-compose.server.yml
+
+    name: Validate nginx conf (${{ matrix.version }}/${{ matrix.compose_file}})
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Create docker network
+        run: |
+          docker network create frontend
+
+      - name: Validate nginx conf
+        run: |
+          COMPOSE_DOMAIN=test.itkdev.dk docker compose --file templates/${{ matrix.version }}/${{ matrix.compose_file}} run --no-deps --rm nginx nginx -t

templates/drupal-10/.docker/nginx.conf

@@ -17,7 +17,7 @@ http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
-    # Note: set_real_ip_from is only set in the server block to make i configurable
+    # Note: set_real_ip_from is set in the server block
 
     log_format  main  '$http_x_real_ip - $remote_user [$time_local] "$request" '
                       '$status $body_bytes_sent "$http_referer" '

templates/drupal-10/.docker/templates/default.conf.template

@@ -7,7 +7,7 @@ server {
     client_max_body_size ${NGINX_MAX_BODY_SIZE};
 
     set_real_ip_from 172.16.0.0/16;
-    set_real_ip_from ${NGINX_SET_REAL_IP_FROM:-192.168.39.0/24};
+    set_real_ip_from 192.168.39.0/24;
     real_ip_recursive on;
     real_ip_header X-Forwarded-For;
 

templates/drupal-11/.docker/nginx.conf

@@ -17,7 +17,7 @@ http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
-    # Note: set_real_ip_from is only set in the server block to make i configurable
+    # Note: set_real_ip_from is set in the server block
 
     log_format  main  '$http_x_real_ip - $remote_user [$time_local] "$request" '
                       '$status $body_bytes_sent "$http_referer" '

templates/drupal-11/.docker/templates/default.conf.template

@@ -7,7 +7,7 @@ server {
     client_max_body_size ${NGINX_MAX_BODY_SIZE};
 
     set_real_ip_from 172.16.0.0/16;
-    set_real_ip_from ${NGINX_SET_REAL_IP_FROM:-192.168.39.0/24};
+    set_real_ip_from 192.168.39.0/24;
     real_ip_recursive on;
     real_ip_header X-Forwarded-For;
 

templates/drupal-7/.docker/nginx.conf

@@ -17,7 +17,7 @@ http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
-    # Note: set_real_ip_from is only set in the server block to make i configurable
+    # Note: set_real_ip_from is set in the server block
 
     log_format  main  '$http_x_real_ip - $remote_user [$time_local] "$request" '
                       '$status $body_bytes_sent "$http_referer" '

templates/drupal-7/.docker/templates/default.conf.template

@@ -7,7 +7,7 @@ server {
     client_max_body_size ${NGINX_MAX_BODY_SIZE};
 
     set_real_ip_from 172.16.0.0/16;
-    set_real_ip_from ${NGINX_SET_REAL_IP_FROM:-192.168.39.0/24};
+    set_real_ip_from 192.168.39.0/24;
     real_ip_recursive on;
     real_ip_header X-Forwarded-For;
 

templates/drupal-8/.docker/nginx.conf

@@ -17,7 +17,7 @@ http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
-    # Note: set_real_ip_from is only set in the server block to make i configurable
+    # Note: set_real_ip_from is set in the server block
 
     log_format  main  '$http_x_real_ip - $remote_user [$time_local] "$request" '
                       '$status $body_bytes_sent "$http_referer" '

templates/drupal-8/.docker/templates/default.conf.template

@@ -7,7 +7,7 @@ server {
     client_max_body_size ${NGINX_MAX_BODY_SIZE};
 
     set_real_ip_from 172.16.0.0/16;
-    set_real_ip_from ${NGINX_SET_REAL_IP_FROM:-192.168.39.0/24};
+    set_real_ip_from 192.168.39.0/24;
     real_ip_recursive on;
     real_ip_header X-Forwarded-For;
 

templates/drupal-9/.docker/nginx.conf

@@ -17,7 +17,7 @@ http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
-    # Note: set_real_ip_from is only set in the server block to make i configurable
+    # Note: set_real_ip_from is set in the server block
 
     log_format  main  '$http_x_real_ip - $remote_user [$time_local] "$request" '
                       '$status $body_bytes_sent "$http_referer" '