aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--settings.py19
1 files changed, 5 insertions, 14 deletions
diff --git a/settings.py b/settings.py
index b83cb78..9b25c34 100644
--- a/settings.py
+++ b/settings.py
@@ -221,20 +221,11 @@ WKHTMLTOPDF_CMD_OPTIONS = {
'page-size': 'a4'
}
+from local_settings import *
+
CACHES['comptia'] = {
- 'BACKEND': 'django.core.cache.backends.memcached.PyMemcacheCache',
- 'LOCATION': '127.0.0.1:11211',
- 'TIMEOUT': 60 * 60 * 24,
+ 'BACKEND': CACHES['default']['BACKEND'],
+ 'LOCATION': CACHES['default']['LOCATION'],
+ 'TIMEOUT': 60*60*24,
'KEY_PREFIX': 'comptia_'
}
-
-RQ_QUEUES = {
- 'default': {
- 'HOST': 'localhost',
- 'PORT': 6379,
- 'DB': 0,
- 'DEFAULT_TIMEOUT': 3600, # 60 minutes
- },
-}
-
-from local_settings import *