Make the catalog setting based on from STORAGE_ROOT

We were doing that, but then if a specific config file overrode
STORAGE_ROOT, then the catalog configs would still be based on the
default STORAGE_ROOT.

ideascube/conf/base.py

@@ -339,6 +339,4 @@
 
 SESSION_COOKIE_AGE = 60 * 60  # Members must be logged out after one hour
 BACKUP_FORMAT = 'zip'  # One of 'zip', 'tar', 'bztar', 'gztar'
-CATALOG_CACHE_BASE_DIR = '/var/cache/ideascube/catalog'
-CATALOG_STORAGE_BASE_DIR = os.path.join(STORAGE_ROOT, 'catalog')
 TAGGIT_CASE_INSENSITIVE = True

ideascube/settings.py

@@ -45,6 +45,12 @@ def log(s):
     BACKUPED_ROOT = ldict.get('BACKUPED_ROOT') or os.path.join(STORAGE_ROOT, 'main')  # noqa
     MEDIA_ROOT = ldict.get('MEDIA_ROOT') or os.path.join(BACKUPED_ROOT, 'media')  # noqa
     STATIC_ROOT = ldict.get('STATIC_ROOT') or os.path.join(STORAGE_ROOT, 'static')  # noqa
+    CATALOG_CACHE_BASE_DIR = (
+        ldict.get('CATALOG_CACHE_BASE_DIR') or '/var/cache/ideascube/catalog')
+    CATALOG_STORAGE_BASE_DIR = (
+        ldict.get('CATALOG_STORAGE_BASE_DIR')
+        or os.path.join(BACKUPED_ROOT, 'catalog'))
+
     if not getattr(ldict, 'DATABASES', None):
         DATABASES = {
             'default': {