diff --git a/api/config/settings/common.py b/api/config/settings/common.py index 7eb606d83005f931272b9a361f74d936a4b98b1f..12cb102dd812fec0a5263a96f5f1aa83281d2b3b 100644 --- a/api/config/settings/common.py +++ b/api/config/settings/common.py @@ -317,8 +317,6 @@ FILE_UPLOAD_PERMISSIONS = 0o644 # ------------------------------------------------------------------------------ ROOT_URLCONF = "config.urls" SPA_URLCONF = "config.spa_urls" -# See: https://docs.djangoproject.com/en/dev/ref/settings/#wsgi-application -WSGI_APPLICATION = "config.wsgi.application" ASGI_APPLICATION = "config.routing.application" # This ensures that Django will be able to detect a secure connection diff --git a/api/config/wsgi.py b/api/config/wsgi.py deleted file mode 100644 index 8e843eb4d29c4f162fe23e1a1a2ea3c0ed622fc5..0000000000000000000000000000000000000000 --- a/api/config/wsgi.py +++ /dev/null @@ -1,39 +0,0 @@ -""" -WSGI config for funkwhale_api project. - -This module contains the WSGI application used by Django's development server -and any production WSGI deployments. It should expose a module-level variable -named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover -this application via the ``WSGI_APPLICATION`` setting. - -Usually you will have the standard Django WSGI application here, but it also -might make sense to replace the whole Django WSGI application with a custom one -that later delegates to the Django one. For example, you could introduce WSGI -middleware here, or combine a Django application with an application of another -framework. - -""" -import os - -from django.core.wsgi import get_wsgi_application -from whitenoise.django import DjangoWhiteNoise - -# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks -# if running multiple sites in the same mod_wsgi process. To fix this, use -# mod_wsgi daemon mode with each site in its own daemon process, or use -# os.environ["DJANGO_SETTINGS_MODULE"] = "config.settings.production" -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.production") - -# This application object is used by any WSGI server configured to use this -# file. This includes Django's development server, if the WSGI_APPLICATION -# setting points here. -application = get_wsgi_application() - -# Use Whitenoise to serve static files -# See: https://whitenoise.readthedocs.org/ -application = DjangoWhiteNoise(application) - - -# Apply WSGI middleware here. -# from helloworld.wsgi import HelloWorldApplication -# application = HelloWorldApplication(application) diff --git a/api/requirements/base.txt b/api/requirements/base.txt index bf4660a149450debade8e53158e679274fbed73d..e6cd9669b5bc02317692b3da7b9199492f328201 100644 --- a/api/requirements/base.txt +++ b/api/requirements/base.txt @@ -3,7 +3,6 @@ django>=2.1,<2.2 # Configuration django-environ>=0.4,<0.5 -whitenoise>=3.3,<3.4 # Images Pillow>=4.3,<4.4