Added reading database config from DATABASE_URL env
This commit is contained in:
parent
b896c8e00f
commit
4f9571f27e
@ -23,3 +23,5 @@ setenv.py
|
||||
# Docker
|
||||
docker-compose*.yml
|
||||
Dockerfile
|
||||
|
||||
.venv
|
||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,3 +8,4 @@ env_file
|
||||
openssl_config
|
||||
venv/
|
||||
commands/
|
||||
.venv
|
@ -1,5 +1,7 @@
|
||||
import os
|
||||
|
||||
from django.core.management.utils import get_random_secret_key
|
||||
|
||||
ALLOWED_USER_IDS = os.environ.get('ALLOWED_USER_IDS', '')
|
||||
|
||||
DATABASE_USER = os.environ.get('POSTGRES_USER', 'postgres')
|
||||
@ -8,6 +10,8 @@ DATABASE_HOST = os.environ.get('DATABASE_HOST', 'db')
|
||||
DATABASE_PORT = os.environ.get('DATABASE_PORT', '5432')
|
||||
DATABASE_NAME = os.environ.get('POSTGRES_DB', 'tgvkbot')
|
||||
|
||||
DATABASE_URL = os.environ.get('DATABASE_URL', '')
|
||||
|
||||
VK_APP_ID = os.environ.get('VK_APP_ID', '2685278') # Kate mobile
|
||||
|
||||
AUDIO_URL = os.environ.get('AUDIO_URL', '')
|
||||
@ -30,9 +34,7 @@ MAX_FILE_SIZE = os.environ.get('MAX_FILE_SIZE', 52428800)
|
||||
API_VERSION = os.environ.get('API_VERSION', '5.124')
|
||||
AUDIO_API_VERSION = os.environ.get('API_VERSION', '5.78')
|
||||
|
||||
# https://www.miniwebtool.com/django-secret-key-generator/
|
||||
# Возможно достаточно заглушки в стиле 'tgvkbot-super-secret-key(nope)'
|
||||
SECRET_KEY = os.environ.get('SECRET_KEY', '!jh4wm=%s%l&jv7-lru6hg)mq2pk&rd@i*s0*c!v!zv01cf9iw')
|
||||
SECRET_KEY = os.environ.get('SECRET_KEY', get_random_secret_key())
|
||||
|
||||
SENTRY_URL = os.environ.get('SENTRY_URL', None)
|
||||
|
||||
|
@ -12,4 +12,5 @@ sentry-sdk==0.20.3
|
||||
ujson==1.35
|
||||
urllib3==1.25.3
|
||||
wget==3.2
|
||||
yarl==1.1.1
|
||||
yarl==1.1.1
|
||||
dj-database-url==0.5.0
|
||||
|
10
settings.py
10
settings.py
@ -1,9 +1,15 @@
|
||||
from config import *
|
||||
|
||||
import dj_database_url
|
||||
|
||||
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
|
||||
DATABASES = {
|
||||
'default': {
|
||||
'default': dj_database_url.config(default=DATABASE_URL)
|
||||
}
|
||||
|
||||
if not DATABASE_URL:
|
||||
DATABASE['default'] = {
|
||||
'ENGINE': 'django.db.backends.postgresql',
|
||||
'NAME': DATABASE_NAME,
|
||||
'USER': DATABASE_USER,
|
||||
@ -11,7 +17,7 @@ DATABASES = {
|
||||
'HOST': DATABASE_HOST,
|
||||
'PORT': DATABASE_PORT
|
||||
}
|
||||
}
|
||||
|
||||
INSTALLED_APPS = (
|
||||
'data',
|
||||
)
|
||||
|
Loading…
x
Reference in New Issue
Block a user