summaryrefslogtreecommitdiff
path: root/settings.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-10-04 20:43:40 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-10-04 20:43:40 +0200
commitd06361146b4f77c9b759272f9103c36732db8cc5 (patch)
tree2eb7fc84d929159ffbbc4cf2b9de0dea226c2c71 /settings.py
parent22f9a272242bb7fa18f92b3f7b1ed556e1a8f20e (diff)
downloadChimère-d06361146b4f77c9b759272f9103c36732db8cc5.tar.bz2
Chimère-d06361146b4f77c9b759272f9103c36732db8cc5.zip
Simplify project layout
Diffstat (limited to 'settings.py')
-rw-r--r--settings.py13
1 files changed, 7 insertions, 6 deletions
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')