diff options
| author | root <root@dino.fm> | 2013-04-21 20:00:42 -0400 |
|---|---|---|
| committer | root <root@dino.fm> | 2013-04-21 20:00:42 -0400 |
| commit | 3790eedc2f48c725c586b8c7b924875fedbeb7b4 (patch) | |
| tree | 6ad7a958495ea2bf8f02846eb9b8ec6127bcb136 /scannerjammer | |
| parent | 5a309541befe767901b24ca2389a1497d16ab5f5 (diff) | |
getting ready to push
Diffstat (limited to 'scannerjammer')
| -rw-r--r-- | scannerjammer/settings.py | 13 | ||||
| -rw-r--r-- | scannerjammer/urls.py | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/scannerjammer/settings.py b/scannerjammer/settings.py index 5bb6083..a03d23e 100644 --- a/scannerjammer/settings.py +++ b/scannerjammer/settings.py @@ -55,7 +55,7 @@ USE_I18N = True USE_L10N = True # If you set this to False, Django will not use timezone-aware datetimes. -USE_TZ = True +USE_TZ = False # Absolute filesystem path to the directory that will hold user-uploaded files. # Example: "/home/media/media.lawrence.com/media/" @@ -130,6 +130,7 @@ INSTALLED_APPS = ( 'django.contrib.messages', 'django.contrib.staticfiles', 'django_evolution', + 'haystack', 'backend', 'frontend', # Uncomment the next line to enable the admin: @@ -178,3 +179,13 @@ SERVER_PORT = 80 SESSION_COOKIE_DOMAIN=".scannerjammer.com" USE_X_FORWARDED_HOST=True + +HAYSTACK_CONNECTIONS = { + 'default': { + 'ENGINE': 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine', + 'URL': 'http://127.0.0.1:9200/', + 'INDEX_NAME': 'haystack', + }, +} +#HAYSTACK_SITECONF='backend.haystack' +#HAYSTACK_SEARCH_ENGINE='elasticsearch' diff --git a/scannerjammer/urls.py b/scannerjammer/urls.py index 885d3a1..d8ba0e1 100644 --- a/scannerjammer/urls.py +++ b/scannerjammer/urls.py @@ -20,6 +20,8 @@ urlpatterns = patterns('', # Backend url(r'^api/', include('backend.urls')), + url(r'^search/', include('haystack.urls')), + # Frontend url(r'^backgrounds/?$', 'frontend.views.bg', name='bg'), url(r'^top/?$', 'frontend.views.topvideos', name='topvideos'), |