diff options
author | Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com> | 2011-04-07 18:13:09 (GMT) |
---|---|---|
committer | Ernesto Rico-Schmidt <e.rico.schmidt@gmail.com> | 2011-04-07 18:13:09 (GMT) |
commit | 975b1111db79bcf63cf47bf72b1b44636dde4f18 (patch) | |
tree | 9dfe274585bc6ff825f18799764881d2712f1912 /helsinki/program/settings.py | |
parent | 758180007e1a1735b7e7fc871593400fb80054dd (diff) | |
parent | 3c5bfc8fe50437e9a8f8b1a259639dc95c56f3d9 (diff) |
Merge branch 'develop'
Diffstat (limited to 'helsinki/program/settings.py')
-rw-r--r-- | helsinki/program/settings.py | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/helsinki/program/settings.py b/helsinki/program/settings.py index c5173a5..43a3d1d 100644 --- a/helsinki/program/settings.py +++ b/helsinki/program/settings.py @@ -34,19 +34,7 @@ MEDIA_ROOT = '' MEDIA_URL = '' -STATIC_ROOT = '' - -STATIC_URL = '/static/' - -ADMIN_MEDIA_PREFIX = '/static/admin/' - -STATICFILES_DIRS = () - -STATICFILES_FINDERS = ( - 'django.contrib.staticfiles.finders.FileSystemFinder', - 'django.contrib.staticfiles.finders.AppDirectoriesFinder', -# 'django.contrib.staticfiles.finders.DefaultStorageFinder', -) +ADMIN_MEDIA_PREFIX = '/media/' SECRET_KEY = 'oepk-$!=)c)7+y%cdz-x46_h5bp!o-*9%dv!(sf=3r4zfqk_(t' @@ -76,25 +64,11 @@ INSTALLED_APPS = ( 'django.contrib.sessions', 'django.contrib.sites', 'django.contrib.messages', - 'django.contrib.staticfiles', 'django.contrib.admin', 'helsinki.program', + 'haystack', ) -LOGGING = { - 'version': 1, - 'disable_existing_loggers': False, - 'handlers': { - 'mail_admins': { - 'level': 'ERROR', - 'class': 'django.utils.log.AdminEmailHandler' - } - }, - 'loggers': { - 'django.request':{ - 'handlers': ['mail_admins'], - 'level': 'ERROR', - 'propagate': True, - }, - } -} +HAYSTACK_SITECONF = 'helsinki.search_sites' +HAYSTACK_SEARCH_ENGINE = 'solr' +HAYSTACK_SOLR_URL = 'http://localhost:8983/solr' |