diff --git a/.env.sample b/.env.sample index d3d66a4..db54492 100644 --- a/.env.sample +++ b/.env.sample @@ -9,12 +9,12 @@ LETS_ENCRYPT_ENV=production # –––––––––––––––– REQUIRED –––––––––––––––– SECRET_DB_PASSWORD_VERSION=v1 -SECRET_SECRET_KEY_VERSION=v1 # length=32 -SECRET_UTILS_SECRET_VERSION=v1 # length=32 +SECRET_SECRET_KEY_VERSION=v1 # length=64 +SECRET_UTILS_SECRET_VERSION=v1 # length=64 SECRET_AWS_SECRET_KEY=v1 SECRET_OIDC_CLIENT_SECRET_VERSION=v1 -AWS_ACCESS_KEY_ID= +AWS_SECRET_ACCESS_KEY= AWS_REGION= AWS_S3_UPLOAD_BUCKET_URL= AWS_S3_UPLOAD_BUCKET_NAME= diff --git a/compose.yml b/compose.yml index e4d4f83..f2e0ea9 100644 --- a/compose.yml +++ b/compose.yml @@ -20,13 +20,14 @@ services: volumes: - outline_data:/opt/outline environment: - - AWS_ACCESS_KEY_ID - AWS_REGION - AWS_S3_ACL - AWS_S3_FORCE_PATH_STYLE - AWS_S3_UPLOAD_BUCKET_NAME - AWS_S3_UPLOAD_BUCKET_URL - AWS_S3_UPLOAD_MAX_SIZE + - AWS_SDK_LOAD_CONFIG=0 + - AWS_SECRET_ACCESS_KEY - AWS_SECRET_KEY_FILE=/run/secrets/aws_secret_key - DATABASE_PASSWORD_FILE=/run/secrets/db_password - FORCE_HTTPS=true @@ -41,6 +42,7 @@ services: - PGSSLMODE=disable - REDIS_URL=redis://${STACK_NAME}_redis:6379 - SECRET_KEY_FILE=/run/secrets/secret_key + - STACK_NAME - TEAM_LOGO - URL=https://$DOMAIN - UTILS_SECRET_FILE=/run/secrets/utils_secret