Merge branch 'master' into rwd

[wolnelektury.git] / wolnelektury / settings / basic.py

diff --git a/wolnelektury/settings/basic.py b/wolnelektury/settings/basic.py
index 3dcb484..30812e5 100644 (file)
--- a/wolnelektury/settings/basic.py
+++ b/wolnelektury/settings/basic.py
@@ -1,5 +1,5 @@
 from os import path
-from settings.paths import PROJECT_DIR
+from .paths import PROJECT_DIR
 
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
@@ -21,6 +21,8 @@ DATABASES = {
     }
 }
 
+SOLR = "http://localhost:8983/solr/wl/"
+SOLR_TEST = "http://localhost:8983/solr/wl_test/"
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
@@ -28,6 +30,7 @@ DATABASES = {
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
 TIME_ZONE = 'Europe/Warsaw'
+USE_TZ = True
 
 SITE_ID = 1