diff --git a/Dockerfile b/Dockerfile index 880b9ee56..0e5d2f118 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,7 +43,6 @@ FROM python:3.11.1-alpine3.17 AS backend ENV PYTHONDONTWRITEBYTECODE 1 ENV PYTHONUNBUFFERED 1 ENV PIP_DISABLE_PIP_VERSION_CHECK=1 -ENV DJANGO_SETTINGS_MODULE plane.settings.production WORKDIR /code diff --git a/ENV_SETUP.md b/ENV_SETUP.md index 7a54f77a0..f1cc7cb1e 100644 --- a/ENV_SETUP.md +++ b/ENV_SETUP.md @@ -76,7 +76,7 @@ NEXT_PUBLIC_ENABLE_OAUTH=0 # Backend # Debug value for api server use it as 0 for production use DEBUG=0 -DJANGO_SETTINGS_MODULE="plane.settings.selfhosted" +DJANGO_SETTINGS_MODULE="plane.settings.selfhosted" # deprecated ​ # Error logs SENTRY_DSN="" diff --git a/apiserver/bin/bucket_script.py b/apiserver/bin/bucket_script.py deleted file mode 100644 index 89717d527..000000000 --- a/apiserver/bin/bucket_script.py +++ /dev/null @@ -1,83 +0,0 @@ -import os, sys -import boto3 -import json -from botocore.exceptions import ClientError - - -sys.path.append("/code") - -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "plane.settings.production") -import django - -django.setup() - -def set_bucket_public_policy(s3_client, bucket_name): - public_policy = { - "Version": "2012-10-17", - "Statement": [{ - "Effect": "Allow", - "Principal": "*", - "Action": ["s3:GetObject"], - "Resource": [f"arn:aws:s3:::{bucket_name}/*"] - }] - } - - try: - s3_client.put_bucket_policy( - Bucket=bucket_name, - Policy=json.dumps(public_policy) - ) - print(f"Public read access policy set for bucket '{bucket_name}'.") - except ClientError as e: - print(f"Error setting public read access policy: {e}") - - - -def create_bucket(): - try: - from django.conf import settings - - # Create a session using the credentials from Django settings - session = boto3.session.Session( - aws_access_key_id=settings.AWS_ACCESS_KEY_ID, - aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY, - ) - - # Create an S3 client using the session - s3_client = session.client('s3', endpoint_url=settings.AWS_S3_ENDPOINT_URL) - bucket_name = settings.AWS_STORAGE_BUCKET_NAME - - print("Checking bucket...") - - # Check if the bucket exists - s3_client.head_bucket(Bucket=bucket_name) - - # If head_bucket does not raise an exception, the bucket exists - print(f"Bucket '{bucket_name}' already exists.") - - set_bucket_public_policy(s3_client, bucket_name) - - except ClientError as e: - error_code = int(e.response['Error']['Code']) - bucket_name = settings.AWS_STORAGE_BUCKET_NAME - if error_code == 404: - # Bucket does not exist, create it - print(f"Bucket '{bucket_name}' does not exist. Creating bucket...") - try: - s3_client.create_bucket(Bucket=bucket_name) - print(f"Bucket '{bucket_name}' created successfully.") - set_bucket_public_policy(s3_client, bucket_name) - except ClientError as create_error: - print(f"Failed to create bucket: {create_error}") - elif error_code == 403: - # Access to the bucket is forbidden - print(f"Access to the bucket '{bucket_name}' is forbidden. Check permissions.") - else: - # Another ClientError occurred - print(f"Failed to check bucket: {e}") - except Exception as ex: - # Handle any other exception - print(f"An error occurred: {ex}") - -if __name__ == "__main__": - create_bucket() diff --git a/deploy/selfhost/docker-compose.yml b/deploy/selfhost/docker-compose.yml index 2ab4fbba6..348d23425 100644 --- a/deploy/selfhost/docker-compose.yml +++ b/deploy/selfhost/docker-compose.yml @@ -5,7 +5,7 @@ x-app-env : &app-env - NGINX_PORT=${NGINX_PORT:-80} - WEB_URL=${WEB_URL:-http://localhost} - DEBUG=${DEBUG:-0} - - DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-plane.settings.selfhosted} + - DJANGO_SETTINGS_MODULE=${DJANGO_SETTINGS_MODULE:-plane.settings.selfhosted} # deprecated - NEXT_PUBLIC_ENABLE_OAUTH=${NEXT_PUBLIC_ENABLE_OAUTH:-0} - NEXT_PUBLIC_DEPLOY_URL=${NEXT_PUBLIC_DEPLOY_URL:-http://localhost/spaces} - SENTRY_DSN=${SENTRY_DSN:-""} diff --git a/deploy/selfhost/variables.env b/deploy/selfhost/variables.env index 1ad6ee51a..d1ab35d37 100644 --- a/deploy/selfhost/variables.env +++ b/deploy/selfhost/variables.env @@ -7,7 +7,7 @@ API_REPLICAS=1 NGINX_PORT=80 WEB_URL=http://localhost DEBUG=0 -DJANGO_SETTINGS_MODULE=plane.settings.selfhosted +DJANGO_SETTINGS_MODULE=plane.settings.selfhosted # deprecated NEXT_PUBLIC_ENABLE_OAUTH=0 NEXT_PUBLIC_DEPLOY_URL=http://localhost/spaces SENTRY_DSN=""