Merge branch 'master' of github.com:kostrykin/tournaments

kosmotive · Jan 29, 2024 · 213b9ac · 213b9ac
2 parents 478aeff + f95cc41
commit 213b9ac
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 14 deletions.
diff --git a/tournaments/manage.py b/tournaments/manage.py
@@ -6,7 +6,7 @@
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'tournaments.settings')
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'tournaments.settings.development')
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

diff --git a/tournaments/tournaments/settings/__init__.py b/tournaments/tournaments/settings/__init__.py
diff --git a/tournaments/tournaments/settings.py → tournaments/tournaments/settings/common.py b/tournaments/tournaments/settings.py → tournaments/tournaments/settings/common.py
@@ -13,19 +13,7 @@
 from pathlib import Path
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve().parent.parent
-
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = 'django-insecure-ouqc8j0sk$gn+*9zja*ii=rs=$q()cs$e*9$fg1(y28d#m8m$d'
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-ALLOWED_HOSTS = []
+BASE_DIR = Path(__file__).resolve().parent.parent.parent
 
 
 # Application definition

diff --git a/tournaments/tournaments/settings/development.py b/tournaments/tournaments/settings/development.py
@@ -0,0 +1,13 @@
+from tournaments.settings.common import *
+
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/4.1/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = 'django-insecure-ouqc8j0sk$gn+*9zja*ii=rs=$q()cs$e*9$fg1(y28d#m8m$d'
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = ['*']
diff --git a/tournaments/tournaments/settings/production.py b/tournaments/tournaments/settings/production.py
@@ -0,0 +1,16 @@
+import os
+
+from tournaments.settings.common import *
+
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = os.environ['SECRET_KEY']
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = False
+
+ALLOWED_HOSTS = [
+    os.environ['HOSTNAME'],
+]
+
+STATIC_ROOT = BASE_DIR / '../deployed'