mod: использование секретов через .env

dicquo/dicquo/settings.py

@@ -1,58 +1,47 @@
 # -*- coding: utf-8 -*-
 """
 Django settings for dic-quo project.
-
-Generated by 'django-admin startproject' using Django 3.1.1.
-
-For more information on this file, see
-https://docs.djangoproject.com/en/3.1/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/3.1/ref/settings/
 """
 
-import socket
+import environ
+import os
 from pathlib import Path
-if socket.gethostname() == 'seremin':
-    # офисный комп (Windows)
-    from dicquo.my_secret_dev_office_win import *
-elif socket.gethostname() == 'erjemin-home':
-    # домашний комп (Windows)
-    from dicquo.my_secret_dev_home_win import *
-elif socket.gethostname() in ['m1.N1', 'm1.local', ]:
-    # домашний комп (MacOS)
-    from dicquo.my_secret_dev_home_mac import *
-elif socket.gethostname() in ['orangepi5', 'vm678195', ]:
-    # продакшн (боевой) сервер
-    from dicquo.my_secret_prod import *
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
+env = environ.Env(
+    # set casting, default value
+    DEBUG=(bool, False)
+)
+
+# Reading .env file
+# BASE_DIR is .../dicquo/
+# Project root (where .env is) is .../dicquo/../ or ../../ from settings.py
+# If BASE_DIR is .../dicquo, then .env is at BASE_DIR.parent/.env
+environ.Env.read_env(os.path.join(BASE_DIR.parent, '.env'))
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = MY_SECRET_KEY
+SECRET_KEY = env('SECRET_KEY')
 
-DEBUG = MY_DEBUG
+DEBUG = env('DEBUG')
 
-ALLOWED_HOSTS = MY_ALLOWED_HOSTS
+ALLOWED_HOSTS = env.list('ALLOWED_HOSTS', default=[])
 
 #########################################
 # Настройки сообщений об ошибках когда все упало и т.п.
-ADMINS = MY_ADMINS
+ADMINS = (('Admin', env('ADMIN_EMAIL', default='admin@example.com')),)
 
 #########################################
 # настройки для почтового сервера
-EMAIL_HOST = MY_EMAIL_HOST                    # SMTP server
-EMAIL_PORT = MY_EMAIL_PORT                   # для SSL/https
-EMAIL_HOST_USER = MY_EMAIL_HOST_USER            # login or ''
-EMAIL_HOST_PASSWORD = MY_EMAIL_HOST_PASSWORD    # password
-SERVER_EMAIL = DEFAULT_FROM_EMAIL = EMAIL_HOST_USER
-EMAIL_USE_TLS = MY_EMAIL_USE_TLS
-EMAIL_FROM = MY_EMAIL_FROM  # мейл, от имени которого отправляются письма
+EMAIL_CONFIG = env.email_url(
+    'EMAIL_URL', default='smtp://user:password@localhost:25')
+vars().update(EMAIL_CONFIG)
+
+SERVER_EMAIL = DEFAULT_FROM_EMAIL = EMAIL_CONFIG['EMAIL_HOST_USER']
 EMAIL_SUBJECT_PREFIX = '[DIC-QUO ERR]: '  # префикс для оповещений об ошибках и необработанных исключениях
 
 # Application definition
@@ -79,6 +68,13 @@ MIDDLEWARE: list[str] = [
 
 ROOT_URLCONF: str = 'dicquo.urls'
 
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': BASE_DIR.parent / 'database/db.sqlite3',
+    }
+}
+
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
@@ -113,7 +109,6 @@ AUTH_PASSWORD_VALIDATORS = [
 # https://docs.djangoproject.com/en/3.1/topics/i18n/
 LANGUAGE_CODE = 'ru-RU'         # <--------- RUSSIAN
 TIME_ZONE = 'Europe/Moscow'     #
-# TIME_ZONE = 'America/Los_Angeles'     #
 USE_I18N = True
 USE_L10N = True
 USE_TZ = True               # учитывать часовой пояс
@@ -127,27 +122,12 @@ FIRST_DAY_OF_WEEK = 1       # неделя начинается с понеде
 STATIC_URL = '/static/'
 MEDIA_URL = '/media/'
 
-# Настройки для прода....
-TOUCH_RELOAD = MY_TOUCH_RELOAD   # дёргаем этот файл, чтобы перегрузить uWSGI
+# Using pathlib for cleaner path management
+# Adjusted to serve from public/media relative to project root
+MEDIA_ROOT = BASE_DIR.parent / 'public/media'
+STATIC_ROOT = BASE_DIR.parent / 'public/static'
 
-MEDIA_ROOT = MY_MEDIA_ROOT
 STATICFILES_DIRS = [
-    MY_STATIC_ROOT,
+    # Add other static dirs here if needed
 ]
-# STATIC_ROOT = MY_STATIC_ROOT
-# STATIC_BASE_PATH = MY_STATIC_ROOT
 
-
-DATABASES = {
-    'default': {
-        'ENGINE': "django.db.backends.mysql",
-        'HOST': MY_DATABASE_HOST,  # Set to "" for localhost. Not used with sqlite3.
-        'PORT': MY_DATABASE_PORT,  # Set to "" for default. Not used with sqlite3.
-        'NAME': MY_DATABASE_NAME,  # Not used with sqlite3.
-        'USER': MY_DATABASE_USER,  # Not used with sqlite3.
-        'PASSWORD': MY_DATABASE_PASSWORD,  # Not used with sqlite3.
-        # 'OPTIONS': { 'autocommit': True, }
-    }
-}
-
-DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'