diff --git a/.gitignore b/.gitignore index f3af4fb..1c7f2b3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ - # Created by https://www.toptal.com/developers/gitignore/api/python # Edit at https://www.toptal.com/developers/gitignore?templates=python @@ -284,7 +283,9 @@ fabric.properties # Test blog posts /markdownblog/mdfiles/* /envvars.env -/markdownblog/static -/*.pem -/markdownblog/cert.* \ No newline at end of file +# Database data +/data + +# static files +/markdownblog/static/ \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index c36aa77..353bb35 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,14 +8,16 @@ services: volumes: - ./markdownblog:/markdownblog ports: - - "8000:8000" + - "8234:8234" env_file: - envvars.env - command: python3 manage.py runserver 0.0.0.0:8000 + command: gunicorn markdownblog.wsgi -b 0.0.0.0:8234 db: image: postgres:14.3-alpine ports: - "5432:5432" env_file: - - envvars.env \ No newline at end of file + - envvars.env + volumes: + - ./data:/var/lib/postgresql/data diff --git a/markdownblog/markdownblog/settings.py b/markdownblog/markdownblog/settings.py index fce21f7..cbb71f0 100644 --- a/markdownblog/markdownblog/settings.py +++ b/markdownblog/markdownblog/settings.py @@ -124,7 +124,8 @@ USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/4.0/howto/static-files/ -STATIC_URL = 'static/' +STATIC_URL = '/static/' +STATIC_ROOT = 'static' # Default primary key field type # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field @@ -138,6 +139,8 @@ LOGOUT_REDIRECT_URL = "/" CSRF_HEADER_NAME = "X-CSRFToken" +CSRF_TRUSTED_ORIGINS = ["https://cdaut.de", "http://cdaut.de"] + # multifactor auth MFA_URL = '/accounts/2fa/login' diff --git a/markdownblog/markdownblog/templates/blog/tree_view_template.html b/markdownblog/markdownblog/templates/blog/tree_view_template.html index d000a37..2134c3b 100644 --- a/markdownblog/markdownblog/templates/blog/tree_view_template.html +++ b/markdownblog/markdownblog/templates/blog/tree_view_template.html @@ -21,6 +21,7 @@ delete
  • {{ post }} +

    Views: {{ post.views }}