From d90f0f32180082283cfddbae0b18a48cacbe3762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tao=20Bror=20Bojl=C3=A9n?= Date: Wed, 20 Feb 2019 17:14:28 +0000 Subject: [PATCH] don't serve static files --- backend/api/backend/settings/base.py | 5 +---- backend/api/backend/settings/{dev.py => development.py} | 0 backend/api/backend/urls.py | 1 - docker-compose.yml | 1 + example.env | 2 +- 5 files changed, 3 insertions(+), 6 deletions(-) rename backend/api/backend/settings/{dev.py => development.py} (100%) diff --git a/backend/api/backend/settings/base.py b/backend/api/backend/settings/base.py index e345598..c24fcff 100644 --- a/backend/api/backend/settings/base.py +++ b/backend/api/backend/settings/base.py @@ -120,8 +120,5 @@ USE_TZ = False # https://docs.djangoproject.com/en/2.1/howto/static-files/ STATIC_URL = '/static/' -STATICFILES_DIRS = [ - os.path.join(BASE_DIR, '../../frontend/build/static') -] +STATICFILES_DIRS = [] STATIC_ROOT = os.path.join(BASE_DIR, 'static') - diff --git a/backend/api/backend/settings/dev.py b/backend/api/backend/settings/development.py similarity index 100% rename from backend/api/backend/settings/dev.py rename to backend/api/backend/settings/development.py diff --git a/backend/api/backend/urls.py b/backend/api/backend/urls.py index 9510429..b77c246 100644 --- a/backend/api/backend/urls.py +++ b/backend/api/backend/urls.py @@ -34,5 +34,4 @@ router.register(r'graph/edges', views.EdgeView, base_name='edge') urlpatterns = [ path('api/v1/', include(router.urls)), path('silk/', include('silk.urls', namespace='silk')), - path('', TemplateView.as_view(template_name='index.html')), ] diff --git a/docker-compose.yml b/docker-compose.yml index 0acaf44..74dccd2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,6 +19,7 @@ services: - POSTGRES_PASSWORD - POSTGRES_DB - DJANGO_SETTINGS_MODULE + - ENVIRONMENT=development build: ./backend/api command: bash scripts/docker-entrypoint.sh volumes: diff --git a/example.env b/example.env index f3867ba..4abeff1 100644 --- a/example.env +++ b/example.env @@ -2,4 +2,4 @@ SECRET_KEY=a-long-secret-key POSTGRES_USER=postgres POSTGRES_PASSWORD=postgres POSTGRES_DB=fediverse -DJANGO_SETTINGS_MODULE=backend.settings.dev +DJANGO_SETTINGS_MODULE=backend.settings.development