From ec1f70df7ae6659cb5d06bc235a9304fb6f8cbf0 Mon Sep 17 00:00:00 2001
From: diegolamaral <diego.arruda.amaral@gmail.com>
Date: Sun, 6 Oct 2024 12:32:05 +0000
Subject: [PATCH] Change variable names

---
 core/files/entrypoint.sh | 16 ++++++++--------
 docker-compose.yml       | 18 +++++++++---------
 template.env             | 22 +++++++++++-----------
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/core/files/entrypoint.sh b/core/files/entrypoint.sh
index d5eb5eb..fda8682 100755
--- a/core/files/entrypoint.sh
+++ b/core/files/entrypoint.sh
@@ -45,14 +45,14 @@ export PHP_UPLOAD_MAX_FILESIZE=${PHP_UPLOAD_MAX_FILESIZE:-50M}
 export PHP_POST_MAX_SIZE=${PHP_POST_MAX_SIZE:-50M}
 export PHP_MAX_INPUT_TIME=${PHP_MAX_INPUT_TIME:-300}
 
-export PHP_TIMEOUT=${PHP_TIMEOUT:-60}
-export PHP_COOKIE_TIMEOUT=${PHP_COOKIE_TIMEOUT:-10080}
-export PHP_DEFAULTS=${PHP_DEFAULTS:-php}
-export PHP_AUTO_REGENERATE=${PHP_AUTO_REGENERATE:-false}
-export PHP_CHECK_AGENT=${PHP_CHECK_AGENT:-false}
-export PHP_COOKIE_SECURE=${PHP_COOKIE_SECURE:-true}
-export PHP_COOKIE_DOMAIN=${PHP_COOKIE_DOMAIN:}
-export PHP_COOKIE_SAMESITE=${PHP_COOKIE_SAMESITE:-Lax}
+export PHP_SESSION_TIMEOUT=${PHP_SESSION_TIMEOUT:-60}
+export PHP_SESSION_COOKIE_TIMEOUT=${PHP_SESSION_COOKIE_TIMEOUT:-10080}
+export PHP_SESSION_DEFAULTS=${PHP_SESSION_DEFAULTS:-php}
+export PHP_SESSION_AUTO_REGENERATE=${PHP_SESSION_AUTO_REGENERATE:-false}
+export PHP_SESSION_CHECK_AGENT=${PHP_SESSION_CHECK_AGENT:-false}
+export PHP_SESSION_COOKIE_SECURE=${PHP_SESSION_COOKIE_SECURE:-true}
+export PHP_SESSION_COOKIE_DOMAIN=${PHP_SESSION_COOKIE_DOMAIN:}
+export PHP_SESSION_COOKIE_SAMESITE=${PHP_SESSION_COOKIE_SAMESITE:-Lax}
 
 export NGINX_X_FORWARDED_FOR=${NGINX_X_FORWARDED_FOR:-false}
 export NGINX_SET_REAL_IP_FROM=${NGINX_SET_REAL_IP_FROM}
diff --git a/docker-compose.yml b/docker-compose.yml
index b2d8d9f..ca3092f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -193,19 +193,19 @@ services:
       - "PHP_UPLOAD_MAX_FILESIZE=${PHP_UPLOAD_MAX_FILESIZE:-50M}"
       - "PHP_POST_MAX_SIZE=${PHP_POST_MAX_SIZE:-50M}"
       - "PHP_MAX_INPUT_TIME:${PHP_MAX_INPUT_TIME:-300}"
+      # Additional PHP settings
+      - "PHP_SESSION_TIMEOUT=${PHP_SESSION_TIMEOUT:-60}"
+      - "PHP_SESSION_COOKIE_TIMEOUT=${PHP_SESSION_COOKIE_TIMEOUT:-10080}"
+      - "PHP_SESSION_DEFAULTS=${PHP_SESSION_DEFAULTS:-php}"
+      - "PHP_SESSION_AUTO_REGENERATE=${PHP_SESSION_AUTO_REGENERATE:-false}"
+      - "PHP_SESSION_CHECK_AGENT=${PHP_SESSION_CHECK_AGENT:-false}"
+      - "PHP_SESSION_COOKIE_SECURE=${PHP_SESSION_COOKIE_SECURE:-true}"
+      - "PHP_SESSION_COOKIE_DOMAIN=${PHP_SESSION_COOKIE_DOMAIN}"
+      - "PHP_SESSION_COOKIE_SAMESITE=${PHP_SESSION_COOKIE_SAMESITE:-Lax}"
       # Security Settings
       - "HSTS_MAX_AGE=${HSTS_MAX_AGE}"
       - "X_FRAME_OPTIONS=${X_FRAME_OPTIONS}"
       - "CONTENT_SECURITY_POLICY=${CONTENT_SECURITY_POLICY}"
-      # Additional PHP settings
-      - "PHP_TIMEOUT=${PHP_TIMEOUT:-60}"
-      - "PHP_COOKIE_TIMEOUT=${PHP_COOKIE_TIMEOUT:-10080}"
-      - "PHP_DEFAULTS=${PHP_DEFAULTS:-php}"
-      - "PHP_AUTO_REGENERATE=${PHP_AUTO_REGENERATE:-false}"
-      - "PHP_CHECK_AGENT=${PHP_CHECK_AGENT:-false}"
-      - "PHP_COOKIE_SECURE=${PHP_COOKIE_SECURE:-true}"
-      - "PHP_COOKIE_DOMAIN=${PHP_COOKIE_DOMAIN:}"
-      - "PHP_COOKIE_SAMESITE=${PHP_COOKIE_SAMESITE:-Lax}"
 
   misp-modules:
     image: ghcr.io/misp/misp-docker/misp-modules:${MODULES_RUNNING_TAG:-latest}
diff --git a/template.env b/template.env
index e746122..9d9d114 100644
--- a/template.env
+++ b/template.env
@@ -178,9 +178,9 @@ SYNCSERVERS_1_PULL_RULES=
 # FASTCGI_SEND_TIMEOUT=300s
 # FASTCGI_CONNECT_TIMEOUT=300s
 
-# PHP FPM Configuration
+# PHP FPM configuration
 
-## Basic PHP Settings
+## Basic PHP settings
 # Maximum memory a PHP script can use.
 # PHP_MEMORY_LIMIT=2048M
 # Maximum execution time for a PHP script in seconds.
@@ -192,23 +192,23 @@ SYNCSERVERS_1_PULL_RULES=
 # Maximum time PHP spends parsing input data in seconds.
 # PHP_MAX_INPUT_TIME=300
 
-## Additional PHP Settings
+## Additional PHP settings
 # Timeout (in minutes) for user session inactivity.
-# PHP_TIMEOUT=60
+# PHP_SESSION_TIMEOUT=60
 # Session cookie validity period in minutes.
-# PHP_COOKIE_TIMEOUT=10080
+# PHP_SESSION_COOKIE_TIMEOUT=10080
 # Default PHP configurations.
-# PHP_DEFAULTS=php
+# PHP_SESSION_DEFAULTS=php
 # Automatically regenerate session ID on each request.
-# PHP_AUTO_REGENERATE=false
+# PHP_SESSION_AUTO_REGENERATE=false
 # Check user agent on each request for security.
-# PHP_CHECK_AGENT=false
+# PHP_SESSION_CHECK_AGENT=false
 # Only send session cookies over HTTPS.
-# PHP_COOKIE_SECURE=true
+# PHP_SESSION_COOKIE_SECURE=true
 # Domain for session cookie validity (leave empty for current domain).
-# PHP_COOKIE_DOMAIN=
+# PHP_SESSION_COOKIE_DOMAIN=
 # SameSite policy for cookies ("Lax" allows top-level navigation).
-# PHP_COOKIE_SAMESITE=Lax
+# PHP_SESSION_COOKIE_SAMESITE=Lax
 
 # MariaSQL/MySQL (InnoDB) configuration
 # INNODB_BUFFER_POOL_SIZE=2048M