merge settings cache chagnes

[wolnelektury.git] / wolnelektury / settings.py

diff --git a/wolnelektury/settings.py b/wolnelektury/settings.py
index f93f9e8..851860f 100644 (file)
--- a/wolnelektury/settings.py
+++ b/wolnelektury/settings.py
@@ -16,15 +16,20 @@ MANAGERS = ADMINS
 
 DATABASES = {
     'default': {
 
 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.
     }
 }
 
         '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.
 # 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 = "/"
 
 BROKER_PASSWORD = "guest"
 BROKER_VHOST = "/"
 

-
+CELERY_EAGER_PROPAGATES_EXCEPTIONS = True

 
 # Load localsettings, if they exist
 try:
 
 # Load localsettings, if they exist
 try: