Merge branch 'main' into develop

Author: rimi-itk

.docker/nginx.conf

@@ -17,9 +17,7 @@ http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
-    set_real_ip_from 172.16.0.0/16;
-    real_ip_recursive on;
-    real_ip_header X-Forwarded-For;
+    # 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" '

.docker/templates/default.conf.template

@@ -6,11 +6,20 @@ server {
 
     client_max_body_size ${NGINX_MAX_BODY_SIZE};
 
-    # This also needs to be set in the single server tag and not only in http.
     set_real_ip_from 172.16.0.0/16;
+    set_real_ip_from 192.168.39.0/24;
     real_ip_recursive on;
     real_ip_header X-Forwarded-For;
 
+    location = /cron-metrics {
+        # Proxy to supercronic metrics
+        proxy_pass http://${NGINX_CRON_METRICS}/metrics;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+
     location = /favicon.ico {
         log_not_found off;
         access_log off;

.github/workflows/composer.yaml

@@ -26,7 +26,7 @@
 name: Composer
 
 env:
-  COMPOSE_USER: root
+  COMPOSE_USER: runner
 
 on:
   pull_request:

.github/workflows/php.yaml

@@ -34,7 +34,7 @@
 name: PHP
 
 env:
-  COMPOSE_USER: root
+  COMPOSE_USER: runner
 
 on:
   pull_request:

.github/workflows/pr.yaml

@@ -43,7 +43,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.4
           extensions: ctype, dom, iconv, json, zip, gd, soap
           coverage: none
           tools: composer:v2
@@ -112,7 +112,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.4
           extensions: ctype, dom, iconv, json, zip, gd, soap
           coverage: none
           tools: composer:v2

.github/workflows/site.yaml

@@ -19,7 +19,7 @@
 name: Drupal
 
 env:
-  COMPOSE_USER: root
+  COMPOSE_USER: runner
 
 on:
   pull_request:

.github/workflows/twig.yaml

@@ -24,7 +24,7 @@
 name: Twig
 
 env:
-  COMPOSE_USER: root
+  COMPOSE_USER: runner
 
 on:
   pull_request:

.gitignore

@@ -93,7 +93,6 @@
 /web/autoload.php
 /web/example.gitignore
 /web/index.php
-/web/robots.txt
 /web/update.php
 /web/web.config
 /web/modules/README.txt
@@ -169,7 +168,6 @@
 /web/INSTALL.txt
 /web/LICENSE.txt
 /web/README.txt
-/web/robots.txt
 /web/update.php
 /web/web.config
 

.phpcs.xml.dist

@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!-- This file is copied from config/drupal/php/.phpcs.xml.dist in https://github.com/itk-dev/devops_itkdev-docker. -->
+<!-- Feel free to edit the file, but consider making a pull request if you find a general issue with the file. -->
+
+<ruleset name="PHP_CodeSniffer">
+  <description>The coding standard.</description>
+
+  <file>web/modules/custom/</file>
+  <file>web/themes/custom/</file>
+
+  <!-- Exclude generated files -->
+  <exclude-pattern>node_modules</exclude-pattern>
+  <exclude-pattern>vendor</exclude-pattern>
+  <exclude-pattern>web/*/custom/*/build/</exclude-pattern>
+  <exclude-pattern>*.css</exclude-pattern>
+  <exclude-pattern>*.js</exclude-pattern>
+
+  <arg value="p"/>
+
+  <arg name="extensions" value="php,module,inc,install,test,profile,theme,css,info,txt,yml"/>
+
+  <config name="drupal_core_version" value="11"/>
+
+  <rule ref="Drupal">
+    <!-- <exclude name="Drupal.Files.TxtFileLineLength.TooLong"/> -->
+    <!-- We want to be able to use "package" and "version" in our custom modules -->
+    <exclude name="Drupal.InfoFiles.AutoAddedKeys.Project"/>
+    <exclude name="Drupal.InfoFiles.AutoAddedKeys.Version"/>
+    <exclude name="Drupal.NamingConventions.ValidEnumCase.NoUpperAcronyms" />
+    <exclude name="Drupal.NamingConventions.ValidEnumCase.NoUnderscores" />
+  </rule>
+   <rule ref="Squiz.Strings.DoubleQuoteUsage.NotRequired"/>
+</ruleset>