diff --git a/.gitignore b/.gitignore index 5a7f1915..92b4cc42 100644 --- a/.gitignore +++ b/.gitignore @@ -141,3 +141,4 @@ cython_debug/ ### Forum Specific ### .env deployed_static +python.log diff --git a/config/urls.py b/config/urls.py index 710eb702..b390bd80 100755 --- a/config/urls.py +++ b/config/urls.py @@ -2,6 +2,9 @@ from django.conf.urls import include, url from django.contrib import admin from django.urls import path from rest_framework import routers + +from machina import urls as machina_urls + from users.views import UserViewSet, CurrentUserView from ak.views import ( HomepageView, @@ -29,4 +32,5 @@ urlpatterns = [ path("404", NotFoundView.as_view(), name="not_found"), path("500", InternalServerErrorView.as_view(), name="internal_server_error"), path("health/", include("health_check.urls")), + path("forum/", include(machina_urls)), ] diff --git a/docker-compose.yml b/docker-compose.yml index fa025ec3..fcd98bb5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,6 +13,13 @@ services: ports: - "5432:5432" + redis: + image: "redis:alpine" + networks: + - backend + volumes: + - redis_data:/data + web: build: context: . diff --git a/python.log b/python.log deleted file mode 100644 index d3faa510..00000000 --- a/python.log +++ /dev/null @@ -1 +0,0 @@ -{"message": "Not Found: /favicon.ico", "status_code": 404, "request": ""}