From 9768de4412d964ef221449e5aecde07b9e7f5916 Mon Sep 17 00:00:00 2001
From: erjemin <erjemin@gmail.com>
Date: Fri, 16 Jan 2026 00:51:29 +0300
Subject: [PATCH] =?UTF-8?q?mod:=20=D1=84=D0=B0=D0=B9=D0=BB=20=D0=B1=D0=B0?=
 =?UTF-8?q?=D0=B7=D1=8B=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B1=D1=83=D0=B4=D0=B5=D1=82?=
 =?UTF-8?q?=20=D0=B2=20=D0=BA=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=D0=B5=20?=
 =?UTF-8?q?data=20(=D0=B2=20=D0=B4=D0=BE=D0=BA=D0=B5=D1=80=D0=B5=20=D0=BA?=
 =?UTF-8?q?=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=20=D0=BC=D0=BE=D0=BD=D1=82?=
 =?UTF-8?q?=D0=B8=D1=80=D1=83=D0=B5=D1=82=D1=81=D1=8F=20=D0=B2=D0=BE=20?=
 =?UTF-8?q?=D0=B2=D0=BD=D0=B5=D1=88=D0=BD=D0=B8=D0=B9=20=D0=BA=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=BE=D0=B3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/README.md                      |  1 +
 etpgrf_site/etpgrf_site/settings.py | 29 ++++++++++++++++++++++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 data/README.md

diff --git a/data/README.md b/data/README.md
new file mode 100644
index 0000000..8ec49be
--- /dev/null
+++ b/data/README.md
@@ -0,0 +1 @@
+В этот каталог попадет файл базы данных `db-etpgrf.sqlite3` после первого запуска приложения.
\ No newline at end of file
diff --git a/etpgrf_site/etpgrf_site/settings.py b/etpgrf_site/etpgrf_site/settings.py
index 9acf128..17e52b0 100644
--- a/etpgrf_site/etpgrf_site/settings.py
+++ b/etpgrf_site/etpgrf_site/settings.py
@@ -21,6 +21,9 @@ DEBUG = os.getenv('DEBUG', 'True') == 'True'
 
 ALLOWED_HOSTS = os.getenv('ALLOWED_HOSTS', 'localhost,127.0.0.1').split(',')
 
+# CSRF Trusted Origins (важно для работы через Nginx/Docker)
+CSRF_TRUSTED_ORIGINS = os.getenv('CSRF_TRUSTED_ORIGINS', 'http://localhost:8000,http://127.0.0.1:8000').split(',')
+
 
 # Application definition
 
@@ -36,6 +39,7 @@ INSTALLED_APPS = [
 
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
+    # 'whitenoise.middleware.WhiteNoiseMiddleware', # Лишнее, так как в контейнере используем Nginx для статики
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -66,11 +70,12 @@ WSGI_APPLICATION = 'etpgrf_site.wsgi.application'
 
 # Database
 # https://docs.djangoproject.com/en/6.0/ref/settings/#databases
+# print(f"DEBUG: Database path is: {DB_PATH}") # <-- ОТЛАДКА
 
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db-etpgrf.sqlite3',
+        'NAME': BASE_DIR.parent / 'data' / 'db-etpgrf.sqlite3',
     }
 }
 
@@ -79,10 +84,18 @@ DATABASES = {
 # https://docs.djangoproject.com/en/6.0/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
-    { 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', },
-    { 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', },
-    { 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', },
-    { 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', },
+    {
+        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
+    },
+    {
+        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+    },
 ]
 
 
@@ -91,17 +104,23 @@ AUTH_PASSWORD_VALIDATORS = [
 LANGUAGE_CODE = 'ru-RU'
 TIME_ZONE = 'Europe/Moscow'
 USE_I18N = True
+
 USE_TZ = True
 
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/6.0/howto/static-files/
+
 STATIC_URL = 'static/'
 
 # Поднимаемся на уровень выше от manage.py, чтобы попасть в корень репозитория
 # И кладем всё в папку public
 STATIC_ROOT = BASE_DIR.parent / 'public' / 'static_collected'
 STATICFILES_DIRS = [BASE_DIR.parent / 'public' / 'static']
+
+# Убираем настройки WhiteNoise, так как в продакшене статику будет раздавать Nginx
+# STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
+
 MEDIA_ROOT = BASE_DIR.parent / 'public' / 'media'
 MEDIA_URL = '/media/'