Implementation for django-configurations (#43)

* Added django-configurations

* Refactored to use django-configurations fully, removed python-decouple

* Typos

.env.template

@@ -1,4 +1,4 @@
-SECRET_KEY=...
-DEBUG=false
-PUBLIC_URL=https://fiesta.localhost
+DJANGO_DEBUG=false
 DJANGO_LOG_LEVEL=INFO
+DJANGO_SECRET_KEY=
+PUBLIC_URL=https://fiesta.localhost

Makefile

@@ -55,7 +55,7 @@ upd: ## Runs all needed docker containers in detached mode
 up: ## Runs all needed docker containers
 	docker-compose up
 
-produp: export DEBUG = False ## Runs fiesta in production mode.
+produp: export DJANGO_CONFIGURATION = LocalProduction ## Runs fiesta in production mode.
 produp:
 	docker-compose -f docker-compose.yml -f docker-compose.prod.yml --profile prod up --build
 

docker-compose.prod.yml

@@ -3,7 +3,7 @@ services:
   web:
     command: './manage.py collectstatic --noinput && ./manage.py runserver 0.0.0.0:8000'
     environment:
-      DEBUG: "false"
+      DJANGO_CONFIGURATION: Production
 
   webserver:
     command: [ nginx, '-g', 'daemon off;' ]
@@ -22,8 +22,8 @@ services:
       - "443:443"
 
   # remove profiles so production env does have filled elastic search
-  elastic:
-    profiles: [ ]
+#  elastic:
+#    profiles: [ ]
 
-  wikifetcher:
-    profiles: [ ]
+#  wikifetcher:
+#    profiles: [ ]

docker-compose.yml

@@ -10,7 +10,6 @@ services:
       - 8000
     env_file:
       - ./fiesta/.env.base
-    secrets:
       - .env
     build:
       context: .
@@ -132,10 +131,6 @@ services:
       - .env
       - wiki/.env.base
 
-secrets:
-  .env:
-    file: ./.env
-
 volumes:
   postgres_data:
   elastic_data:

fiesta/.env.base

@@ -1,3 +1,3 @@
-BUILD_DIR=/usr/src/build
-STATIC_DIR=/usr/src/static
-MEDIA_DIR=/usr/src/media
+DJANGO_BUILD_DIR=/usr/src/build
+DJANGO_STATIC_ROOT=/usr/src/static
+DJANGO_MEDIA_ROOT=/usr/src/media

fiesta/apps/files/storage.py

@@ -38,4 +38,4 @@ def upload_to(instance: BaseModel, filename: str) -> str:
         except AttributeError:
             modified = now().isoformat()
 
-        return hashlib.md5(f"{instance.pk}-{modified}".encode()).hexdigest()
+        return hashlib.sha256(f"{instance.pk}-{modified}".encode()).hexdigest()