diff --git a/app/.env.sample b/app/.env.sample index b112dd4..6667371 100644 --- a/app/.env.sample +++ b/app/.env.sample @@ -25,6 +25,6 @@ S3_ACCESS_KEY= S3_SECRET_KEY= S3_BUCKET= S3_REGION=us-east-1 -S3_PREFIX=cache/ +S3_FOLDER=cache/ S3_ACL=private S3_ENDPOINT= \ No newline at end of file diff --git a/app/config.php b/app/config.php index c664683..185d70f 100644 --- a/app/config.php +++ b/app/config.php @@ -39,7 +39,7 @@ if (S3_CACHE_ENABLED) { define('S3_SECRET_KEY', $_ENV['S3_SECRET_KEY'] ?? ''); define('S3_BUCKET', $_ENV['S3_BUCKET'] ?? ''); define('S3_REGION', $_ENV['S3_REGION'] ?? 'us-east-1'); - define('S3_PREFIX', $_ENV['S3_PREFIX'] ?? 'cache/'); + define('S3_FOLDER', $_ENV['S3_FOLDER'] ?? 'cache/'); define('S3_ACL', $_ENV['S3_ACL'] ?? 'private'); define('S3_ENDPOINT', $_ENV['S3_ENDPOINT'] ?? null); } diff --git a/app/inc/Cache.php b/app/inc/Cache.php index e1d45f6..3c7f108 100644 --- a/app/inc/Cache.php +++ b/app/inc/Cache.php @@ -33,7 +33,7 @@ class Cache 'secret' => S3_SECRET_KEY, 'bucket' => S3_BUCKET, 'region' => S3_REGION ?? 'us-east-1', - 'prefix' => S3_PREFIX ?? 'cache/', + 'prefix' => S3_FOLDER ?? 'cache/', 'acl' => S3_ACL ?? 'private', 'endpoint' => defined('S3_ENDPOINT') ? S3_ENDPOINT : null ]); diff --git a/docker-compose.yml b/docker-compose.yml index 20d621c..fa972c6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: - S3_SECRET_KEY=${S3_SECRET_KEY:-} - S3_BUCKET=${S3_BUCKET:-} - S3_REGION=${S3_REGION:-us-east-1} - - S3_PREFIX=${S3_PREFIX:-cache/} + - S3_FOLDER=${S3_FOLDER:-cache/} - S3_ACL=${S3_ACL:-private} - S3_ENDPOINT=${S3_ENDPOINT:-} user: "${UID:-1000}:${GID:-1000}" diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 9074b42..1505391 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -73,8 +73,8 @@ if [ -n "${S3_REGION}" ]; then echo "S3_REGION=${S3_REGION}" >> /app/.env fi -if [ -n "${S3_PREFIX}" ]; then - echo "S3_PREFIX=${S3_PREFIX}" >> /app/.env +if [ -n "${S3_FOLDER}" ]; then + echo "S3_FOLDER=${S3_FOLDER}" >> /app/.env fi if [ -n "${S3_ACL}" ]; then