From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Thu, 19 Jan 2012 15:48:05 +0000 (+0100)
Subject: merge settings cache chagnes
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/19552dfa90720c774b26c2042e0755ded6aa3c39?ds=sidebyside;hp=--cc

merge settings cache chagnes
---

19552dfa90720c774b26c2042e0755ded6aa3c39
diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index f93f9e8ac..851860f28 100644
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -16,15 +16,20 @@ MANAGERS = ADMINS
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-        'NAME': path.join(PROJECT_DIR, 'dev.db'), # Or path to database file if using sqlite3.
-        'USER': '',                      # Not used with sqlite3.
-        'PASSWORD': '',                  # Not used with sqlite3.
-        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
+        'ENGINE': 'django.db.backends.mysql', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': 'wl', # Or path to database file if using sqlite3.
+        'USER': 'wl',                      # Not used with sqlite3.
+        'PASSWORD': 'test',                  # Not used with sqlite3.
+        'HOST': 'localhost',                      # Set to empty string for localhost. Not used with sqlite3.
         'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
     }
 }
 
+DATABASE_OPTIONS = {
+   "init_command": "SET storage_engine=INNODB DEFAULT CHARSET=utf8",
+}
+
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
@@ -312,7 +317,7 @@ BROKER_USER = "guest"
 BROKER_PASSWORD = "guest"
 BROKER_VHOST = "/"
 
-
+CELERY_EAGER_PROPAGATES_EXCEPTIONS = True
 
 # Load localsettings, if they exist
 try: