Merge b6ed00278b into 69c1e4a000

Update cache policy to match documentation (fix #2313 ) (#2369 )
feat(s3_config): add support for S3 session token configuration
2025-07-21 14:48:05 +02:00 · 2025-02-07 14:19:26 +01:00 · 2025-02-07 02:04:45 +00:00 · 2025-02-06 12:31:57 +01:00
5 changed files with 12 additions and 4 deletions
--- a/.config/s3.config.php
+++ b/.config/s3.config.php
@ -40,6 +40,14 @@ if (getenv('OBJECTSTORE_S3_BUCKET')) {
    $CONFIG['objectstore']['arguments']['secret'] = '';
  }

+  if (getenv('OBJECTSTORE_S3_SESSION_TOKEN_FILE')) {
+    $CONFIG['objectstore']['arguments']['session_token'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SESSION_TOKEN_FILE')));
+  } elseif (getenv('OBJECTSTORE_S3_SESSION_TOKEN')) {
+    $CONFIG['objectstore']['arguments']['session_token'] = getenv('OBJECTSTORE_S3_SESSION_TOKEN');
+  } else {
+    $CONFIG['objectstore']['arguments']['session_token'] = '';
+  }
+
  if (getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')) {
    $CONFIG['objectstore']['arguments']['sse_c_key'] = trim(file_get_contents(getenv('OBJECTSTORE_S3_SSE_C_KEY_FILE')));
  } elseif (getenv('OBJECTSTORE_S3_SSE_C_KEY')) {
--- a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
+++ b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf
@ -183,7 +183,7 @@ http {
            }
        }

-        location ~ \.woff2?$ {
+        location ~ \.(otf|woff2?)$ {
            try_files $uri /index.php$request_uri;
            expires 7d;         # Cache-Control policy borrowed from `.htaccess`
            access_log off;     # Optional: Don't log access to assets
--- a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
+++ b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf
@ -183,7 +183,7 @@ http {
            }
        }

-        location ~ \.woff2?$ {
+        location ~ \.(otf|woff2?)$ {
            try_files $uri /index.php$request_uri;
            expires 7d;         # Cache-Control policy borrowed from `.htaccess`
            access_log off;     # Optional: Don't log access to assets
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf
@ -183,7 +183,7 @@ http {
            }
        }

-        location ~ \.woff2?$ {
+        location ~ \.(otf|woff2?)$ {
            try_files $uri /index.php$request_uri;
            expires 7d;         # Cache-Control policy borrowed from `.htaccess`
            access_log off;     # Optional: Don't log access to assets
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf
@ -183,7 +183,7 @@ http {
            }
        }

-        location ~ \.woff2?$ {
+        location ~ \.(otf|woff2?)$ {
            try_files $uri /index.php$request_uri;
            expires 7d;         # Cache-Control policy borrowed from `.htaccess`
            access_log off;     # Optional: Don't log access to assets
Author	SHA1	Message	Date
Hector Manuel	56945a8bf8	Merge `b6ed00278b` into `69c1e4a000`	2025-02-07 14:19:26 +01:00
J0WI	69c1e4a000	Update cache policy to match documentation (fix #2313 ) (#2369 )	2025-02-07 02:04:45 +00:00
Hector Valcarcel	b6ed00278b	feat(s3_config): add support for S3 session token configuration - Introduced logic to handle S3 session token using environment variables. - Supports session token from both a file and direct environment variable. - Defaults to an empty token if no value is provided. Signed-off-by: Hector Valcarcel <hmvalcarcel@gmail.com>	2025-02-06 12:31:57 +01:00