From d06361146b4f77c9b759272f9103c36732db8cc5 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 4 Oct 2016 20:43:40 +0200
Subject: Simplify project layout

---
 settings.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'settings.py')

diff --git a/settings.py b/settings.py
index 7e7d85c..a65a1b1 100644
--- a/settings.py
+++ b/settings.py
@@ -23,10 +23,6 @@ CONTACT_EMAIL = ''
 STATIC_URL = '/static/'
 STATIC_ROOT = ROOT_PATH + 'static/'
 
-STATICFILES_DIRS = (
-    os.path.join(ROOT_PATH, "chimere_example_project/chimere_example_static"),
-)
-
 TINYMCE_URL = ''
 JQUERY_JS_URLS = ('/javascript/jquery/jquery.js',
                   '/javascript/jquery-ui/jquery-ui.js',)
@@ -231,8 +227,6 @@ MIDDLEWARE_CLASSES = [
     'django.contrib.messages.middleware.MessageMiddleware'
 ]
 
-ROOT_URLCONF = 'chimere_example_project.urls'
-
 TEMPLATE_DIRS = [
     ROOT_PATH + 'templates',
 ]
@@ -275,12 +269,19 @@ INSTALLED_APPS += [
 LOG_PATH = '/var/log/django/'
 MOBILE_DOMAINS = []  # if you have specific domains for mobile access
 
+PROJECT_APP = 'chimere_example_project'
+
 LOGFILE_NAME = ""
 try:
     from local_settings import *
 except ImportError as e:
     print('Unable to load local_settings.py:', e)
 
+
+ROOT_URLCONF = PROJECT_APP + '.urls'
+
+INSTALLED_APPS.insert(INSTALLED_APPS.index('chimere'), PROJECT_APP)
+
 if CHIMERE_SEARCH_ENGINE:
     INSTALLED_APPS.append('haystack')
 
-- 
cgit v1.2.3