From a4fe7d6c5a2810585cb5da65d38fbd57792b77ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Bedna=C5=99=C3=ADk?= <jan.bednarik@gmail.com>
Date: Thu, 16 Apr 2020 17:04:58 +0200
Subject: [PATCH] Database setup

---
 .gitignore             |  6 ++++++
 .isort.cfg             |  2 +-
 README.md              | 12 ++++++++++++
 majak/settings/base.py | 20 ++++++++------------
 requirements/base.in   |  2 ++
 requirements/base.txt  |  2 ++
 6 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index a81c8ee1..5e5d652d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,3 +136,9 @@ dmypy.json
 
 # Cython debug symbols
 cython_debug/
+
+#####################################################
+# CUSTOM
+
+# direnv
+.envrc
diff --git a/.isort.cfg b/.isort.cfg
index 300d5ee9..1a915274 100644
--- a/.isort.cfg
+++ b/.isort.cfg
@@ -4,4 +4,4 @@ line_length = 88
 multi_line_output = 3
 default_sectiont = "THIRDPARTY"
 include_trailing_comma = true
-known_third_party = django,wagtail
+known_third_party = django,environ,wagtail
diff --git a/README.md b/README.md
index 6e1547a7..daab5815 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,18 @@
 
 Maják je CMS pro Pirátské weby. Postavený je na [Wagtail](https://wagtail.io/).
 
+[![code style: Black](https://img.shields.io/badge/code%20style-Black-000000)](https://github.com/psf/black)
+[![powered by: Wagtail](https://img.shields.io/badge/powered%20by-Wagtail-43b1b0)](https://wagtail.io)
+[![powered by: Django](https://img.shields.io/badge/powered%20by-Django-0C4B33)](https://www.djangoproject.com)
+
+## Konfigurace
+
+Je třeba nastavit environment proměnné:
+
+| proměnná | default | popis |
+| --- | --- | --- |
+| `DATABASE_URL` | | DSN k databázi (např. `postgres://user:pass@localhost:5342/majak`) |
+
 ## Vývoj
 
 Pro vývoj je definován pomocný `Makefile` pro časté akce. Pro nápovědu zavolej:
diff --git a/majak/settings/base.py b/majak/settings/base.py
index 219f9765..9fd202f8 100644
--- a/majak/settings/base.py
+++ b/majak/settings/base.py
@@ -13,6 +13,10 @@ https://docs.djangoproject.com/en/3.0/ref/settings/
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 
+import environ
+
+env = environ.Env()
+
 PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 BASE_DIR = os.path.dirname(PROJECT_DIR)
 
@@ -83,12 +87,8 @@ WSGI_APPLICATION = "majak.wsgi.application"
 # Database
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
 
-DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.sqlite3",
-        "NAME": os.path.join(BASE_DIR, "db.sqlite3"),
-    }
-}
+DATABASES = {"default": env.db("DATABASE_URL")}
+DATABASES["default"]["ATOMIC_REQUESTS"] = True
 
 
 # Password validation
@@ -107,14 +107,10 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/3.0/topics/i18n/
 
-LANGUAGE_CODE = "en-us"
-
-TIME_ZONE = "UTC"
-
+LANGUAGE_CODE = "cs"
+TIME_ZONE = "Europe/Prague"
 USE_I18N = True
-
 USE_L10N = True
-
 USE_TZ = True
 
 
diff --git a/requirements/base.in b/requirements/base.in
index 30640e47..e4d8a9a6 100644
--- a/requirements/base.in
+++ b/requirements/base.in
@@ -1,2 +1,4 @@
 wagtail
+django-environ
 django-extensions
+psycopg2-binary
diff --git a/requirements/base.txt b/requirements/base.txt
index c5d3144e..afd2abe1 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -8,6 +8,7 @@ asgiref==3.2.7            # via django
 beautifulsoup4==4.6.0     # via wagtail
 certifi==2020.4.5.1       # via requests
 chardet==3.0.4            # via requests
+django-environ==0.4.5     # via -r base.in
 django-extensions==2.2.9  # via -r base.in
 django-modelcluster==5.0.1  # via wagtail
 django-taggit==1.2.0      # via wagtail
@@ -19,6 +20,7 @@ html5lib==1.0.1           # via wagtail
 idna==2.9                 # via requests
 l18n==2018.5              # via wagtail
 pillow==6.2.2             # via wagtail
+psycopg2-binary==2.8.5    # via -r base.in
 pytz==2019.3              # via django, django-modelcluster, l18n
 requests==2.23.0          # via wagtail
 six==1.14.0               # via django-extensions, html5lib, l18n
-- 
GitLab