diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-04 19:45:47 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-04 19:45:47 +0200 |
| commit | 60b4197a9b7bba4d257066a011a5f1c5cb7ab6d1 (patch) | |
| tree | 009a42a0a623dd511606875921576d09c4f2c2eb | |
| parent | 91aa7aa352230dcacec966b5250286d927ed9163 (diff) | |
| download | Chimère-60b4197a9b7bba4d257066a011a5f1c5cb7ab6d1.tar.bz2 Chimère-60b4197a9b7bba4d257066a011a5f1c5cb7ab6d1.zip | |
Reorganize django files to have a more common conf
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | local_settings.py.gitlab-ci (renamed from chimere_example_project/local_settings.py.gitlab-ci) | 0 | ||||
| -rw-r--r-- | local_settings.py.pip.sample (renamed from chimere_example_project/local_settings.py.pip.sample) | 0 | ||||
| -rw-r--r-- | local_settings.py.sample (renamed from chimere_example_project/local_settings.py.sample) | 0 | ||||
| -rwxr-xr-x | manage.py (renamed from chimere_example_project/manage.py) | 1 | ||||
| -rw-r--r-- | settings.py (renamed from chimere_example_project/settings.py) | 5 | ||||
| -rw-r--r-- | wsgi.py (renamed from chimere_example_project/wsgi.py) | 0 |
7 files changed, 3 insertions, 10 deletions
@@ -4,11 +4,8 @@ *.mo *.ignore Makefile -example_project/settings.py -example_project/static/icons/* -example_project/static/upload/* -example_project/media/* -example_project/local_settings.py +media/* +local_settings.py chimere_env/ docs/en/build/ docs/fr/build/ diff --git a/chimere_example_project/local_settings.py.gitlab-ci b/local_settings.py.gitlab-ci index 5abd801..5abd801 100644 --- a/chimere_example_project/local_settings.py.gitlab-ci +++ b/local_settings.py.gitlab-ci diff --git a/chimere_example_project/local_settings.py.pip.sample b/local_settings.py.pip.sample index 747427f..747427f 100644 --- a/chimere_example_project/local_settings.py.pip.sample +++ b/local_settings.py.pip.sample diff --git a/chimere_example_project/local_settings.py.sample b/local_settings.py.sample index 33a4989..33a4989 100644 --- a/chimere_example_project/local_settings.py.sample +++ b/local_settings.py.sample diff --git a/chimere_example_project/manage.py b/manage.py index 504c115..75c7cb7 100755 --- a/chimere_example_project/manage.py +++ b/manage.py @@ -5,7 +5,6 @@ import sys if __name__ == "__main__": - sys.path.insert(0, os.path.abspath('./../')) os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") from django.core.management import execute_from_command_line diff --git a/chimere_example_project/settings.py b/settings.py index 09f5743..7e7d85c 100644 --- a/chimere_example_project/settings.py +++ b/settings.py @@ -5,7 +5,6 @@ # overload all theses settings in your local_settings.py file import os -import sys _ = lambda s: s DEBUG = False @@ -25,7 +24,7 @@ STATIC_URL = '/static/' STATIC_ROOT = ROOT_PATH + 'static/' STATICFILES_DIRS = ( - os.path.join(ROOT_PATH, "chimere_example_static"), + os.path.join(ROOT_PATH, "chimere_example_project/chimere_example_static"), ) TINYMCE_URL = '' @@ -363,8 +362,6 @@ if 'OSM_MOBILE_JS_URLS' not in globals(): "http://www.openstreetmap.org/openlayers/OpenStreetMap.js"] if DEBUG_TOOLBAR: - if '..' not in sys.path: - sys.path.insert(0, '..') global DEBUG_TOOLBAR_PANELS global DEBUG_TOOLBAR_CONFIG MIDDLEWARE_CLASSES += ['debug_toolbar.middleware.DebugToolbarMiddleware'] diff --git a/chimere_example_project/wsgi.py b/wsgi.py index 093cc8a..093cc8a 100644 --- a/chimere_example_project/wsgi.py +++ b/wsgi.py |