diff --git a/backend/config/settings/aws.py b/backend/config/settings/aws.py index 32157ec6..cbdfb906 100644 --- a/backend/config/settings/aws.py +++ b/backend/config/settings/aws.py @@ -7,10 +7,10 @@ CORS_ORIGIN_WHITELIST = ("http://127.0.0.1:3000", "http://0.0.0.0:3000", "http:/ CSRF_TRUSTED_ORIGINS = CORS_ORIGIN_WHITELIST DJANGO_DRF_FILEPOND_STORAGES_BACKEND = "storages.backends.s3boto3.S3Boto3Storage" -AWS_ACCESS_KEY_ID = os.environ.get("AWS_ACCESS_KEY_ID") -AWS_SECRET_ACCESS_KEY = os.environ.get("AWS_SECRET_ACCESS_KEY") -AWS_S3_REGION_NAME = os.environ.get("REGION_NAME", "us-west-1") -AWS_STORAGE_BUCKET_NAME = os.environ.get("BUCKET_NAME", "filepond-uploads") +AWS_ACCESS_KEY_ID = env("AWS_ACCESS_KEY_ID") +AWS_SECRET_ACCESS_KEY = env("AWS_SECRET_ACCESS_KEY") +AWS_S3_REGION_NAME = env("REGION_NAME", "us-west-1") +AWS_STORAGE_BUCKET_NAME = env("BUCKET_NAME", "doccano") AWS_DEFAULT_ACL = "private" AWS_BUCKET_ACL = "private" AWS_AUTO_CREATE_BUCKET = True diff --git a/backend/config/settings/gcp.py b/backend/config/settings/gcp.py index 4a4b90d2..b6965366 100644 --- a/backend/config/settings/gcp.py +++ b/backend/config/settings/gcp.py @@ -9,6 +9,6 @@ CORS_ORIGIN_WHITELIST = ("http://127.0.0.1:3000", "http://0.0.0.0:3000", "http:/ CSRF_TRUSTED_ORIGINS = CORS_ORIGIN_WHITELIST DJANGO_DRF_FILEPOND_STORAGES_BACKEND = "storages.backends.gcloud.GoogleCloudStorage" -GS_BUCKET_NAME = os.environ.get("BUCKET_NAME", "doccano") -GS_PROJECT_ID = os.environ["GS_PROJECT_ID"] -GS_CREDENTIALS = service_account.Credentials.from_service_account_file(os.environ["GOOGLE_APPLICATION_CREDENTIALS"]) +GS_BUCKET_NAME = env("BUCKET_NAME", "doccano") +GS_PROJECT_ID = env("GS_PROJECT_ID") +GS_CREDENTIALS = service_account.Credentials.from_service_account_file(env("GOOGLE_APPLICATION_CREDENTIALS"))