From 1c9b8c479ee18a1cf3357b7229396a5d7d193281 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Thu, 28 Mar 2024 19:16:20 -0600 Subject: [PATCH] Remove sentence on s3-compatible storage being required (#6733) --- .env.sample | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/.env.sample b/.env.sample index b05ca77a4..ecdaacd08 100644 --- a/.env.sample +++ b/.env.sample @@ -36,23 +36,6 @@ PORT=3000 # server, for normal operation this does not need to be set. COLLABORATION_URL= -# To support uploading of images for avatars and document attachments an -# s3-compatible storage must be provided. AWS S3 is recommended for redundancy -# however if you want to keep all file storage local an alternative such as -# minio (https://github.com/minio/minio) can be used. - -# A more detailed guide on setting up S3 is available here: -# => https://wiki.generaloutline.com/share/125de1cc-9ff6-424b-8415-0d58c809a40f -# -AWS_ACCESS_KEY_ID=get_a_key_from_aws -AWS_SECRET_ACCESS_KEY=get_the_secret_of_above_key -AWS_REGION=xx-xxxx-x -AWS_S3_ACCELERATE_URL= -AWS_S3_UPLOAD_BUCKET_URL=http://s3:4569 -AWS_S3_UPLOAD_BUCKET_NAME=bucket_name_here -AWS_S3_FORCE_PATH_STYLE=true -AWS_S3_ACL=private - # Specify what storage system to use. Possible value is one of "s3" or "local". # For "local", the avatar images and document attachments will be saved on local disk. FILE_STORAGE=local @@ -73,6 +56,17 @@ FILE_STORAGE_IMPORT_MAX_SIZE= # and the files are temporary being automatically deleted after a period of time. FILE_STORAGE_WORKSPACE_IMPORT_MAX_SIZE= +# To support uploading of images for avatars and document attachments in a distributed +# architecture an s3-compatible storage can be configured if FILE_STORAGE=s3 above. +AWS_ACCESS_KEY_ID=get_a_key_from_aws +AWS_SECRET_ACCESS_KEY=get_the_secret_of_above_key +AWS_REGION=xx-xxxx-x +AWS_S3_ACCELERATE_URL= +AWS_S3_UPLOAD_BUCKET_URL=http://s3:4569 +AWS_S3_UPLOAD_BUCKET_NAME=bucket_name_here +AWS_S3_FORCE_PATH_STYLE=true +AWS_S3_ACL=private + # –––––––––––––– AUTHENTICATION –––––––––––––– # Third party signin credentials, at least ONE OF EITHER Google, Slack, @@ -205,4 +199,4 @@ RATE_LIMITER_DURATION_WINDOW=60 # Iframely API config IFRAMELY_URL= -IFRAMELY_API_KEY= \ No newline at end of file +IFRAMELY_API_KEY=