From 4f9571f27edc3b080d521726f8e126b5287b2d81 Mon Sep 17 00:00:00 2001
From: dm1sh <me@dmitriy.icu>
Date: Sat, 12 Feb 2022 05:02:58 +0300
Subject: [PATCH] Added reading database config from DATABASE_URL env

---
 .dockerignore    |  2 ++
 .gitignore       |  1 +
 config.py        |  8 +++++---
 requirements.txt |  3 ++-
 settings.py      | 10 ++++++++--
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index e78b5d6..c55b30e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -23,3 +23,5 @@ setenv.py
 # Docker
 docker-compose*.yml
 Dockerfile
+
+.venv
diff --git a/.gitignore b/.gitignore
index 8034aa1..fb7510c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ env_file
 openssl_config
 venv/
 commands/
+.venv
\ No newline at end of file
diff --git a/config.py b/config.py
index 35187b0..8292e41 100644
--- a/config.py
+++ b/config.py
@@ -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)
 
diff --git a/requirements.txt b/requirements.txt
index 800c354..a383167 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,4 +12,5 @@ sentry-sdk==0.20.3
 ujson==1.35
 urllib3==1.25.3
 wget==3.2
-yarl==1.1.1
\ No newline at end of file
+yarl==1.1.1
+dj-database-url==0.5.0
diff --git a/settings.py b/settings.py
index 4e98018..3de7869 100644
--- a/settings.py
+++ b/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',
 )