forked from github/plane
dev: add overwrite configuration and configuration for self hosted version
This commit is contained in:
parent
edceef71b4
commit
dd760b4f38
@ -16,7 +16,8 @@ AWS_ACCESS_KEY_ID="access-key"
|
|||||||
AWS_SECRET_ACCESS_KEY="secret-key"
|
AWS_SECRET_ACCESS_KEY="secret-key"
|
||||||
AWS_S3_ENDPOINT_URL="http://plane-minio:9000"
|
AWS_S3_ENDPOINT_URL="http://plane-minio:9000"
|
||||||
# Changing this requires change in the nginx.conf for uploads if using minio setup
|
# Changing this requires change in the nginx.conf for uploads if using minio setup
|
||||||
AWS_S3_BUCKET_NAME="uploads"
|
AWS_PUBLIC_STORAGE_BUCKET_NAME="uploads"
|
||||||
|
AWS_PRIVATE_STORAGE_BUCKET_NAME="uploads-private"
|
||||||
# Maximum file upload limit
|
# Maximum file upload limit
|
||||||
FILE_SIZE_LIMIT=5242880
|
FILE_SIZE_LIMIT=5242880
|
||||||
|
|
||||||
|
@ -127,13 +127,10 @@ AWS_ACCESS_KEY_ID = os.environ.get("AWS_ACCESS_KEY_ID")
|
|||||||
AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY")
|
AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY")
|
||||||
AWS_REGION_NAME = os.environ.get("AWS_REGION")
|
AWS_REGION_NAME = os.environ.get("AWS_REGION")
|
||||||
AWS_S3_ADDRESSING_STYLE = os.environ.get("AWS_S3_ADDRESSING_STYLE")
|
AWS_S3_ADDRESSING_STYLE = os.environ.get("AWS_S3_ADDRESSING_STYLE")
|
||||||
|
AWS_S3_FILE_OVERWRITE = False
|
||||||
# Public S3 bucket settings
|
# Public S3 bucket settings
|
||||||
AWS_PUBLIC_STORAGE_BUCKET_NAME = os.environ.get("AWS_PUBLIC_STORAGE_BUCKET_NAME")
|
AWS_PUBLIC_STORAGE_BUCKET_NAME = os.environ.get("AWS_PUBLIC_STORAGE_BUCKET_NAME")
|
||||||
AWS_PUBLIC_DEFAULT_ACL = "public-read"
|
AWS_PUBLIC_DEFAULT_ACL = "public-read"
|
||||||
AWS_S3_PUBLIC_OBJECT_PARAMETERS = {
|
|
||||||
"CacheControl": "max-age=86400",
|
|
||||||
}
|
|
||||||
PUBLIC_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
|
PUBLIC_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
|
||||||
|
|
||||||
# Private S3 bucket settings
|
# Private S3 bucket settings
|
||||||
|
@ -101,7 +101,7 @@ AWS_ACCESS_KEY_ID = os.environ.get("AWS_ACCESS_KEY_ID")
|
|||||||
AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY")
|
AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY")
|
||||||
AWS_REGION_NAME = os.environ.get("AWS_REGION")
|
AWS_REGION_NAME = os.environ.get("AWS_REGION")
|
||||||
AWS_S3_ADDRESSING_STYLE = os.environ.get("AWS_S3_ADDRESSING_STYLE")
|
AWS_S3_ADDRESSING_STYLE = os.environ.get("AWS_S3_ADDRESSING_STYLE")
|
||||||
|
AWS_S3_FILE_OVERWRITE = False
|
||||||
# Public S3 bucket settings
|
# Public S3 bucket settings
|
||||||
AWS_PUBLIC_STORAGE_BUCKET_NAME = os.environ.get("AWS_PUBLIC_STORAGE_BUCKET_NAME")
|
AWS_PUBLIC_STORAGE_BUCKET_NAME = os.environ.get("AWS_PUBLIC_STORAGE_BUCKET_NAME")
|
||||||
AWS_PUBLIC_DEFAULT_ACL = "public-read"
|
AWS_PUBLIC_DEFAULT_ACL = "public-read"
|
||||||
|
@ -68,17 +68,14 @@ AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY", "secret-key")
|
|||||||
AWS_S3_ENDPOINT_URL = os.environ.get(
|
AWS_S3_ENDPOINT_URL = os.environ.get(
|
||||||
"AWS_S3_ENDPOINT_URL", "http://plane-minio:9000"
|
"AWS_S3_ENDPOINT_URL", "http://plane-minio:9000"
|
||||||
)
|
)
|
||||||
|
AWS_S3_FILE_OVERWRITE = False
|
||||||
# Public S3 bucket settings
|
# Public S3 bucket settings
|
||||||
AWS_PUBLIC_STORAGE_BUCKET_NAME = os.environ.get("AWS_PUBLIC_STORAGE_BUCKET_NAME")
|
AWS_PUBLIC_STORAGE_BUCKET_NAME = os.environ.get("AWS_PUBLIC_STORAGE_BUCKET_NAME")
|
||||||
AWS_PUBLIC_DEFAULT_ACL = "public-read"
|
AWS_PUBLIC_DEFAULT_ACL = "public-read"
|
||||||
AWS_S3_PUBLIC_OBJECT_PARAMETERS = {
|
|
||||||
"CacheControl": "max-age=86400",
|
|
||||||
}
|
|
||||||
PUBLIC_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
|
PUBLIC_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
|
||||||
|
|
||||||
# Private S3 bucket settings
|
# Private S3 bucket settings
|
||||||
AWS_PRIVATE_STORAGE_BUCKET_NAME = os.environ.get("AWS_PRIVATE_STORAGE_BUCKET_NAME")
|
AWS_PRIVATE_STORAGE_BUCKET_NAME = os.environ.get("AWS_PRIVATE_STORAGE_BUCKET_NAME")
|
||||||
AWS_S3_PRIVATE_FILE_OVERWRITE = False
|
|
||||||
AWS_PRIVATE_DEFAULT_ACL = "private"
|
AWS_PRIVATE_DEFAULT_ACL = "private"
|
||||||
PRIVATE_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
|
PRIVATE_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
|
||||||
## End Storage settings
|
## End Storage settings
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
"""Production settings and globals."""
|
"""Production settings and globals."""
|
||||||
from urllib.parse import urlparse
|
|
||||||
import ssl
|
import ssl
|
||||||
import certifi
|
import certifi
|
||||||
|
|
||||||
import dj_database_url
|
import dj_database_url
|
||||||
from urllib.parse import urlparse
|
|
||||||
|
|
||||||
import sentry_sdk
|
import sentry_sdk
|
||||||
from sentry_sdk.integrations.django import DjangoIntegration
|
from sentry_sdk.integrations.django import DjangoIntegration
|
||||||
@ -83,7 +81,7 @@ AWS_ACCESS_KEY_ID = os.environ.get("AWS_ACCESS_KEY_ID")
|
|||||||
AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY")
|
AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY")
|
||||||
AWS_REGION_NAME = os.environ.get("AWS_REGION")
|
AWS_REGION_NAME = os.environ.get("AWS_REGION")
|
||||||
AWS_S3_ADDRESSING_STYLE = os.environ.get("AWS_S3_ADDRESSING_STYLE")
|
AWS_S3_ADDRESSING_STYLE = os.environ.get("AWS_S3_ADDRESSING_STYLE")
|
||||||
|
AWS_S3_FILE_OVERWRITE = False
|
||||||
# Public S3 bucket settings
|
# Public S3 bucket settings
|
||||||
AWS_PUBLIC_STORAGE_BUCKET_NAME = os.environ.get("AWS_PUBLIC_STORAGE_BUCKET_NAME")
|
AWS_PUBLIC_STORAGE_BUCKET_NAME = os.environ.get("AWS_PUBLIC_STORAGE_BUCKET_NAME")
|
||||||
AWS_PUBLIC_DEFAULT_ACL = "public-read"
|
AWS_PUBLIC_DEFAULT_ACL = "public-read"
|
||||||
|
@ -7,7 +7,6 @@ class PublicS3Storage(S3Boto3Storage):
|
|||||||
"""Configuration for the Public bucket storage"""
|
"""Configuration for the Public bucket storage"""
|
||||||
bucket_name = settings.AWS_PUBLIC_STORAGE_BUCKET_NAME
|
bucket_name = settings.AWS_PUBLIC_STORAGE_BUCKET_NAME
|
||||||
default_acl = settings.AWS_PUBLIC_DEFAULT_ACL
|
default_acl = settings.AWS_PUBLIC_DEFAULT_ACL
|
||||||
object_parameters = settings.AWS_S3_PUBLIC_OBJECT_PARAMETERS
|
|
||||||
querystring_auth = False
|
querystring_auth = False
|
||||||
|
|
||||||
# For self hosted docker and minio
|
# For self hosted docker and minio
|
||||||
|
@ -150,7 +150,12 @@ services:
|
|||||||
createbuckets:
|
createbuckets:
|
||||||
image: minio/mc
|
image: minio/mc
|
||||||
entrypoint: >
|
entrypoint: >
|
||||||
/bin/sh -c " /usr/bin/mc config host add plane-minio http://plane-minio:9000 \$AWS_ACCESS_KEY_ID \$AWS_SECRET_ACCESS_KEY; /usr/bin/mc mb plane-minio/\$AWS_S3_BUCKET_NAME; /usr/bin/mc anonymous set download plane-minio/\$AWS_S3_BUCKET_NAME; exit 0; "
|
/bin/sh -c " /usr/bin/mc config host add plane-minio http://plane-minio:9000 \$AWS_ACCESS_KEY_ID \$AWS_SECRET_ACCESS_KEY;
|
||||||
|
/usr/bin/mc mb plane-minio/\$AWS_PUBLIC_STORAGE_BUCKET_NAME;
|
||||||
|
/usr/bin/mc anonymous set download plane-minio/\$AWS_PUBLIC_STORAGE_BUCKET_NAME; exit 0;
|
||||||
|
/usr/bin/mc config host add plane-minio http://plane-minio:9000 \$AWS_ACCESS_KEY_ID \$AWS_SECRET_ACCESS_KEY;
|
||||||
|
/usr/bin/mc mb plane-minio/\$AWS_PRIVATE_STORAGE_BUCKET_NAME;
|
||||||
|
"
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
depends_on:
|
depends_on:
|
||||||
|
@ -111,7 +111,12 @@ services:
|
|||||||
createbuckets:
|
createbuckets:
|
||||||
image: minio/mc
|
image: minio/mc
|
||||||
entrypoint: >
|
entrypoint: >
|
||||||
/bin/sh -c " /usr/bin/mc config host add plane-minio http://plane-minio:9000 \$AWS_ACCESS_KEY_ID \$AWS_SECRET_ACCESS_KEY; /usr/bin/mc mb plane-minio/\$AWS_S3_BUCKET_NAME; /usr/bin/mc anonymous set download plane-minio/\$AWS_S3_BUCKET_NAME; exit 0; "
|
/bin/sh -c " /usr/bin/mc config host add plane-minio http://plane-minio:9000 \$AWS_ACCESS_KEY_ID \$AWS_SECRET_ACCESS_KEY;
|
||||||
|
/usr/bin/mc mb plane-minio/\$AWS_PUBLIC_STORAGE_BUCKET_NAME;
|
||||||
|
/usr/bin/mc anonymous set download plane-minio/\$AWS_PUBLIC_STORAGE_BUCKET_NAME; exit 0;
|
||||||
|
/usr/bin/mc config host add plane-minio http://plane-minio:9000 \$AWS_ACCESS_KEY_ID \$AWS_SECRET_ACCESS_KEY;
|
||||||
|
/usr/bin/mc mb plane-minio/\$AWS_PRIVATE_STORAGE_BUCKET_NAME;
|
||||||
|
"
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
depends_on:
|
depends_on:
|
||||||
|
Loading…
Reference in New Issue
Block a user