diff --git a/Makefile b/Makefile
index 1c7782f..688d77f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
#!make
-include variables.env
-export $(shell sed 's/=.*//' variables.env)
+include .env
+export $(shell sed 's/=.*//' .env)
test:
env
diff --git a/README.md b/README.md
index 1db2b10..43cea93 100644
--- a/README.md
+++ b/README.md
@@ -45,8 +45,8 @@ that are not checked in to Git:
* Database password
There is a file in the root directory of this repo called
-`variables.env.template`. This file should be copied into a file called
-`variables.env`, where you define these variables according to your liking.
+`.env.template`. This file should be copied into a file called
+`.env`, where you define these variables according to your liking.
Django's secret key should be a "large, unpredictable value". Just google
"[Django Secret Key Generator](https://www.miniwebtool.com/django-secret-key-generator/)" and you should find something.
diff --git a/docker-compose.yml b/docker-compose.yml
index 3e951a3..9028691 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,7 @@ services:
DB_PASSWORD: "$DB_PASSWORD"
DB_HOST: "db"
DB_PORT: "5432"
+ DJANGO_SECRET_KEY: "$DJANGO_SECRET_KEY"
depends_on:
- db
volumes:
diff --git a/dtekportal/homepage/templates/homepage/index/welcome-box.html b/dtekportal/homepage/templates/homepage/index/welcome-box.html
index 91b76c0..1c3e03c 100644
--- a/dtekportal/homepage/templates/homepage/index/welcome-box.html
+++ b/dtekportal/homepage/templates/homepage/index/welcome-box.html
@@ -1,10 +1,11 @@
{% load i18n %}
+{% load static %}
-
+ right: 20px;">
{% trans "Välkommen" %}
diff --git a/dtekportal/homepage/static/homepage/studiesociala-natverket.pdf b/dtekportal/staticfiles/homepage/studiesociala-natverket.pdf
similarity index 100%
rename from dtekportal/homepage/static/homepage/studiesociala-natverket.pdf
rename to dtekportal/staticfiles/homepage/studiesociala-natverket.pdf
diff --git a/logs/debug.log b/logs/debug.log
deleted file mode 100644
index 8e0abfd..0000000
--- a/logs/debug.log
+++ /dev/null
@@ -1,33 +0,0 @@
-Internal Server Error: /langs
-Traceback (most recent call last):
- File "/usr/local/lib/python3.7/site-packages/django/core/handlers/exception.py", line 34, in inner
- response = get_response(request)
- File "/usr/local/lib/python3.7/site-packages/django/core/handlers/base.py", line 156, in _get_response
- response = self.process_exception_by_middleware(e, request)
- File "/usr/local/lib/python3.7/site-packages/django/core/handlers/base.py", line 154, in _get_response
- response = response.render()
- File "/usr/local/lib/python3.7/site-packages/django/template/response.py", line 106, in render
- self.content = self.rendered_content
- File "/usr/local/lib/python3.7/site-packages/django/template/response.py", line 81, in rendered_content
- template = self.resolve_template(self.template_name)
- File "/usr/local/lib/python3.7/site-packages/django/template/response.py", line 63, in resolve_template
- return select_template(template, using=self.using)
- File "/usr/local/lib/python3.7/site-packages/django/template/loader.py", line 42, in select_template
- return engine.get_template(template_name)
- File "/usr/local/lib/python3.7/site-packages/django/template/backends/django.py", line 34, in get_template
- return Template(self.engine.get_template(template_name), self)
- File "/usr/local/lib/python3.7/site-packages/django/template/engine.py", line 144, in get_template
- template, origin = self.find_template(template_name)
- File "/usr/local/lib/python3.7/site-packages/django/template/engine.py", line 126, in find_template
- template = loader.get_template(name, skip=skip)
- File "/usr/local/lib/python3.7/site-packages/django/template/loaders/base.py", line 30, in get_template
- contents, origin, origin.template_name, self.engine,
- File "/usr/local/lib/python3.7/site-packages/django/template/base.py", line 156, in __init__
- self.nodelist = self.compile_nodelist()
- File "/usr/local/lib/python3.7/site-packages/django/template/base.py", line 194, in compile_nodelist
- return parser.parse()
- File "/usr/local/lib/python3.7/site-packages/django/template/base.py", line 479, in parse
- self.extend_nodelist(nodelist, compiled_result, token)
- File "/usr/local/lib/python3.7/site-packages/django/template/base.py", line 497, in extend_nodelist
- token, '%r must be the first tag in the template.' % node,
-django.template.exceptions.TemplateSyntaxError: must be the first tag in the template.