vikarti.anatra/main
1
0
Fork 0
mirror of https://github.com/manualdousuario/marreta.git synced 2025-09-01 18:20:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

s3_proxy para s3_folder, para facilitar configuração

Browse source
This commit is contained in:
Renan Bernordi 2024-11-28 15:41:45 -03:00
parent c9a8d6a558
commit 93a29296d4
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/.env.sample
View file

@ -25,6 +25,6 @@ S3_ACCESS_KEY=
S3_SECRET_KEY= S3_SECRET_KEY=
S3_BUCKET= S3_BUCKET=
S3_REGION=us-east-1 S3_REGION=us-east-1
S3_PREFIX=cache/ S3_FOLDER=cache/
S3_ACL=private S3_ACL=private
S3_ENDPOINT= S3_ENDPOINT=

2
app/config.php
View file

@ -39,7 +39,7 @@ if (S3_CACHE_ENABLED) {
define('S3_SECRET_KEY', $_ENV['S3_SECRET_KEY'] ?? ''); define('S3_SECRET_KEY', $_ENV['S3_SECRET_KEY'] ?? '');
define('S3_BUCKET', $_ENV['S3_BUCKET'] ?? ''); define('S3_BUCKET', $_ENV['S3_BUCKET'] ?? '');
define('S3_REGION', $_ENV['S3_REGION'] ?? 'us-east-1'); 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_ACL', $_ENV['S3_ACL'] ?? 'private');
define('S3_ENDPOINT', $_ENV['S3_ENDPOINT'] ?? null); define('S3_ENDPOINT', $_ENV['S3_ENDPOINT'] ?? null);
} }

2
app/inc/Cache.php
View file

@ -33,7 +33,7 @@ class Cache
'secret' => S3_SECRET_KEY, 'secret' => S3_SECRET_KEY,
'bucket' => S3_BUCKET, 'bucket' => S3_BUCKET,
'region' => S3_REGION ?? 'us-east-1', 'region' => S3_REGION ?? 'us-east-1',
'prefix' => S3_PREFIX ?? 'cache/', 'prefix' => S3_FOLDER ?? 'cache/',
'acl' => S3_ACL ?? 'private', 'acl' => S3_ACL ?? 'private',
'endpoint' => defined('S3_ENDPOINT') ? S3_ENDPOINT : null 'endpoint' => defined('S3_ENDPOINT') ? S3_ENDPOINT : null
]); ]);

2
docker-compose.yml
View file

@ -19,7 +19,7 @@ services:
- S3_SECRET_KEY=${S3_SECRET_KEY:-} - S3_SECRET_KEY=${S3_SECRET_KEY:-}
- S3_BUCKET=${S3_BUCKET:-} - S3_BUCKET=${S3_BUCKET:-}
- S3_REGION=${S3_REGION:-us-east-1} - S3_REGION=${S3_REGION:-us-east-1}
- S3_PREFIX=${S3_PREFIX:-cache/} - S3_FOLDER=${S3_FOLDER:-cache/}
- S3_ACL=${S3_ACL:-private} - S3_ACL=${S3_ACL:-private}
- S3_ENDPOINT=${S3_ENDPOINT:-} - S3_ENDPOINT=${S3_ENDPOINT:-}
user: "${UID:-1000}:${GID:-1000}" user: "${UID:-1000}:${GID:-1000}"

4
docker-entrypoint.sh
View file

@ -73,8 +73,8 @@ if [ -n "${S3_REGION}" ]; then
echo "S3_REGION=${S3_REGION}" >> /app/.env echo "S3_REGION=${S3_REGION}" >> /app/.env
fi fi
if [ -n "${S3_PREFIX}" ]; then if [ -n "${S3_FOLDER}" ]; then
echo "S3_PREFIX=${S3_PREFIX}" >> /app/.env echo "S3_FOLDER=${S3_FOLDER}" >> /app/.env
fi fi
if [ -n "${S3_ACL}" ]; then if [ -n "${S3_ACL}" ]; then