diff options
Diffstat (limited to 'example_project')
| -rw-r--r-- | example_project/local_settings.py.sample | 10 | ||||
| -rw-r--r-- | example_project/settings.py | 18 | 
2 files changed, 8 insertions, 20 deletions
| diff --git a/example_project/local_settings.py.sample b/example_project/local_settings.py.sample index dae6f98b5..942a35df5 100644 --- a/example_project/local_settings.py.sample +++ b/example_project/local_settings.py.sample @@ -34,6 +34,7 @@ DEBUG_TOOLBAR = False  TEMPLATE_DEBUG = DEBUG  SQL_DEBUG = False +# important to change on a server hosting multiple ishtar instances  PROJECT_SLUG = "my-project"  # complete with host/domain names that this website can serve @@ -51,12 +52,3 @@ SRID = 27572  ENCODING = ''  # specific encoding for CSV export - default to utf-8  SURFACE_UNIT = 'square-metre'  SURFACE_UNIT_LABEL = u'm²' - -# choose the extensions to install -# you can remove lines according to the comments but don't change the order -EXTRA_APPS = [ -    'archaeological_files', -    'archaeological_context_records', -    'archaeological_warehouse',  # need archaeological_finds -    'archaeological_finds',  # need archaeological_context_records -] diff --git a/example_project/settings.py b/example_project/settings.py index e124198aa..4b91c554f 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -128,8 +128,14 @@ INSTALLED_APPS = [      'south',      'registration',      # 'geodjangofla', +    'ishtar_pdl',      'ishtar_common', -    'archaeological_operations',  # mandatory app to run ishtar +    'archaeological_files_pdl', +    'archaeological_files', +    'archaeological_operations', +    'archaeological_context_records', +    'archaeological_warehouse', +    'archaeological_finds',      # 'django_extensions',      # 'debug_toolbar',  ] @@ -214,16 +220,6 @@ except ImportError, e:  if 'test' in sys.argv:      SOUTH_TESTS_MIGRATE = False -for app in PRE_APPS: -    INSTALLED_APPS.insert(INSTALLED_APPS.index('ishtar_common'), app) - -if 'archaeological_files' in EXTRA_APPS: -    EXTRA_APPS.pop(EXTRA_APPS.index('archaeological_files')) -    INSTALLED_APPS.insert(INSTALLED_APPS.index('archaeological_operations'), -                          'archaeological_files') - -INSTALLED_APPS += EXTRA_APPS -  PROJECT_SLUG = locals().get('PROJECT_SLUG', 'default')  if LOGFILE: | 
