Changeset 9748 for src

Timestamp:

Dec 3, 2011, 11:11:32 AM (13 years ago)

Author:

rick

Message:

OSM_PROXY_DIR can also be overwritten (if used).

File:

• src/django_gheat/settings.py (modified) (2 diffs)

src/django_gheat/settings.py

@@ -4 +4 @@
 PROJECT_HOME = os.path.abspath(os.path.dirname(__file__))
 
+# This variables get re-used in definitions so make sure to override them upfront
 DJANGO_PREFIX = '/d'
+OSM_PROXY_DIR = PROJECT_HOME + '/cache/osm_proxy'
+
 if os.path.isfile(PROJECT_HOME + '/local_settings.py'):
-  try:
-    import local_settings
-    DJANGO_PREFIX = local_settings.DJANGO_PREFIX
-  except (AttributeError,NameError):
-    pass
+  from local_settings import *
 
 DJANGO_BALANCERS = OSM_PROXY_BALANCERS = ['a','b','c','d','e','f']
@@ -54 +53 @@
     'osm_proxy': {
         'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
-        'LOCATION': '/usr/local/var/django/cache/osm_proxy',
+        'LOCATION': OSM_PROXY_DIR,
         'TIMEOUT': 3600 * 24 * 7,
         'OPTIONS': {