Skip to content

Commit

Permalink
fix settings and main.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
dev-lymar committed May 17, 2024
1 parent 338ea56 commit ca7fbc1
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
DEBUG=True

# CORS
CORS_ORIGIN_ALLOW_ALL=False/False
CORS_ALLOW_CREDENTIALS=True/False
CORS_ORIGIN_ALLOW_ALL=False
CORS_ALLOW_CREDENTIALS=True
CORS_ALLOWED_ORIGINS=http://...

# Allowed hosts
Expand All @@ -22,6 +22,6 @@ SECRET_KEY = 'django-insecure-your_secret_key'
# Mail secret key
EMAIL_HOST=smtp.mail
EMAIL_PORT=port.mail
EMAIL_USE_SSL=true
EMAIL_USE_SSL=True
EMAIL_HOST_USER = 'example@mail.com'
EMAIL_HOST_PASSWORD = 'email_password'
3 changes: 3 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ jobs:
sudo touch .env
sudo chmod 666 .env
sudo echo DEBUG=${{ secrets.DEBUG }} >> .env
sudo echo CORS_ORIGIN_ALLOW_ALL=${{ secrets.CORS_ORIGIN_ALLOW_ALL }} >> .env
sudo echo CORS_ALLOW_CREDENTIALS=${{ secrets.CORS_ALLOW_CREDENTIALS }} >> .env
sudo echo CORS_ALLOWED_ORIGINS=${{ secrets.CORS_ALLOWED_ORIGINS }} >> .env
sudo echo ALLOWED_HOSTS=${{ secrets.ALLOWED_HOSTS }} >> .env
sudo echo DATABASE_NAME=${{ secrets.DATABASE_NAME }} >> .env
Expand All @@ -119,6 +121,7 @@ jobs:
sudo echo SECRET_KEY=${{ secrets.SECRET_KEY }} >> .env
sudo echo EMAIL_HOST=${{ secrets.EMAIL_HOST }} >> .env
sudo echo EMAIL_PORT=${{ secrets.EMAIL_PORT }} >> .env
sudo echo EMAIL_USE_SSL=${{ secrets.EMAIL_USE_SSL }} >> .env
sudo echo EMAIL_HOST_USER=${{ secrets.EMAIL_HOST_USER }} >> .env
sudo echo EMAIL_HOST_PASSWORD=${{ secrets.EMAIL_HOST_PASSWORD }} >> .env
- name: Executing remote command
Expand Down
12 changes: 7 additions & 5 deletions melnichanka/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

from dotenv import load_dotenv

load_dotenv()

# Build paths inside the project like this: BASE_DIR / 'subdir'.
BASE_DIR = Path(__file__).resolve().parent.parent

Expand All @@ -27,12 +29,12 @@
SECRET_KEY = str(os.getenv("SECRET_KEY"))

# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = str(os.getenv("DEBUG"))
load_dotenv()
DEBUG = bool(os.getenv("DEBUG", "False"))


# CORS
CORS_ORIGIN_ALLOW_ALL = False
CORS_ALLOW_CREDENTIALS = True
CORS_ORIGIN_ALLOW_ALL = bool(os.getenv("CORS_ORIGIN_ALLOW_ALL"))
CORS_ALLOW_CREDENTIALS = bool(os.getenv("CORS_ALLOW_CREDENTIALS"))
CORS_ALLOWED_ORIGINS_RAW = os.getenv("CORS_ALLOWED_ORIGINS")
CORS_ALLOWED_ORIGINS = CORS_ALLOWED_ORIGINS_RAW.split(",") if CORS_ALLOWED_ORIGINS_RAW else []

Expand Down Expand Up @@ -182,7 +184,7 @@
EMAIL_PORT_RAW = os.getenv("EMAIL_PORT")
EMAIL_PORT = int(EMAIL_PORT_RAW) if EMAIL_PORT_RAW else 0
EMAIL_USE_TLS = False
EMAIL_USE_SSL = True
EMAIL_USE_SSL = bool(os.getenv("EMAIL_USE_SSL"))
EMAIL_HOST_USER = str(os.getenv("EMAIL_HOST_USER"))
EMAIL_HOST_PASSWORD = str(os.getenv("EMAIL_HOST_PASSWORD"))

Expand Down

0 comments on commit ca7fbc1

Please sign in to comment.