Skip to content

Commit

Permalink
Merge pull request #99 from 2023-Winter-Bootcamp-Team-J/bug/#98
Browse files Browse the repository at this point in the history
bug: settings.py 수정
  • Loading branch information
jungeunyooon authored Jan 25, 2024
2 parents 93e3c56 + a0b21fd commit de8cdf4
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions backend/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,16 +145,16 @@
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.mysql',
'NAME': os.environ.get('DATABASE_NAME', 'default_db_name'),
'USER': os.environ.get('DATABASE_USER', 'default_user'),
'PASSWORD': os.environ.get('DATABASE_PASSWORD', 'default_password'),
'HOST': os.environ.get('DATABASE_HOST', 'localhost'),
'PORT': os.environ.get('DATABASE_PORT', '3306'),
'NAME': os.environ.get('DATABASE_NAME'),
'USER': os.environ.get('DATABASE_USER'),
'PASSWORD': os.environ.get('DATABASE_PASSWORD'),
'HOST': os.environ.get('DATABASE_HOST'),
'PORT': os.environ.get('DATABASE_PORT'),
}
}

DATABASE_URL = os.environ.get('DATABASE_URL', "default_database_url")
SECRET_KEY = os.environ.get('SECRET_KEY', 'default_secret_key')
DATABASE_URL = os.environ.get('DATABASE_URL')
SECRET_KEY = os.environ.get('SECRET_KEY')

# Password validation
# https://docs.djangoproject.com/en/5.0/ref/settings/#auth-password-validators
Expand Down Expand Up @@ -226,6 +226,4 @@
DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
MEDIA_URL = f'https://{AWS_S3_CUSTOM_DOMAIN}/'

#정적 파일 불러오기
STATIC_URL = 'static/'
STATIC_ROOT = os.path.join(BASE_DIR, '_static')

0 comments on commit de8cdf4

Please sign in to comment.