diff --git a/.env b/.env index 6234c78..88d2958 100644 --- a/.env +++ b/.env @@ -77,19 +77,6 @@ MINIO_ROOT_USER= # Required: no MINIO_ROOT_PASSWORD= # Description: The URL must be accessible from wherever you are running the Notesnook clients. It'll be used by the Notesnook clients for uploading/downloading attachments. -# You can also set it to a URL for a third-party S3 service like Wasabi S3 or Cloudflare R2. # Required: no # Example: https://attachments.notesnook.com S3_SERVICE_URL= -# Description: The bucket name you want to use for storing your attachments. -# Required: yes -S3_BUCKET_NAME=attachments -# Description: If you want to host your attachments on a third party service like Cloudflare R2 or Wasabi S3 instead of the self-hosted Minio instance, you can use put the S3 API AccessKey here. -# Required: no -S3_ACCESS_KEY= -# Description: If you want to host your attachments on a third party service like Cloudflare R2 or Wasabi S3 instead of the self-hosted Minio instance, you can use put the S3 API AccessKeyId here. -# Required: no -S3_ACCESS_KEY_ID= -# Description: If you want to host your attachments on a third party service like Cloudflare R2 or Wasabi S3 instead of the self-hosted Minio instance, you can use put the S3 API Region here. -# Required: no -S3_REGION= diff --git a/docker-compose.yml b/docker-compose.yml index 93ddb46..244cb8a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -66,7 +66,7 @@ services: until mc alias set minio http://notesnook-s3:9000 ${MINIO_ROOT_USER:-minioadmin} ${MINIO_ROOT_PASSWORD:-minioadmin}; do sleep 1; done; - mc mb minio/$$S3_BUCKET_NAME -p + mc mb minio/attachments -p identity-server: image: streetwriters/identity:latest @@ -110,12 +110,12 @@ services: MONGODB_CONNECTION_STRING: mongodb://notesnook-db:27017/?replSet=rs0 MONGODB_DATABASE_NAME: notesnook S3_INTERNAL_SERVICE_URL: "${S3_SERVICE_URL:-http://notesnook-s3:9000}" - S3_INTERNAL_BUCKET_NAME: "${S3_BUCKET_NAME}" - S3_ACCESS_KEY_ID: "${S3_ACCESS_KEY_ID:-${MINIO_ROOT_USER:-minioadmin}}" - S3_ACCESS_KEY: "${S3_ACCESS_KEY:-${MINIO_ROOT_PASSWORD:-minioadmin}}" + S3_INTERNAL_BUCKET_NAME: "attachments" + S3_ACCESS_KEY_ID: "${MINIO_ROOT_USER:-minioadmin}" + S3_ACCESS_KEY: "${MINIO_ROOT_PASSWORD:-minioadmin}" S3_SERVICE_URL: "${S3_SERVICE_URL:-http://localhost:9000}" - S3_REGION: "${S3_REGION:-us-east-1}" - S3_BUCKET_NAME: "${S3_BUCKET_NAME}" + S3_REGION: "us-east-1" + S3_BUCKET_NAME: "attachments" sse-server: image: streetwriters/sse:latest