From bb4c915114b0ea865dbec2aa1da3367afcf0759c Mon Sep 17 00:00:00 2001 From: Nikolai R Kristiansen Date: Tue, 22 Mar 2016 14:29:28 +0100 Subject: [PATCH] Minor deploy fixes --- kassasite/settings.py | 9 +-------- kassasite/wsgi.py | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/kassasite/settings.py b/kassasite/settings.py index 82bb6c3..ce07126 100644 --- a/kassasite/settings.py +++ b/kassasite/settings.py @@ -94,23 +94,16 @@ DATABASES = { # Internationalization # https://docs.djangoproject.com/en/1.8/topics/i18n/ - LANGUAGE_CODE = 'en-us' - TIME_ZONE = 'Europe/Oslo' - USE_I18N = True - USE_L10N = True - USE_TZ = True # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/1.8/howto/static-files/ - STATIC_URL = '/static/' - STATICFILES_DIRS = ( os.path.join(BASE_DIR, 'static'), ) @@ -128,6 +121,6 @@ CORS_ORIGIN_ALLOW_ALL = True # Local settings try: - from local_settings import * + from .local_settings import * except ImportError: pass diff --git a/kassasite/wsgi.py b/kassasite/wsgi.py index 5b00411..ead35a7 100644 --- a/kassasite/wsgi.py +++ b/kassasite/wsgi.py @@ -11,6 +11,6 @@ import os from django.core.wsgi import get_wsgi_application -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "neuf_kassa.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "kassasite.settings") application = get_wsgi_application()