local changes from server

[prawokultury.git] / prawokultury / settings.d / 50-contrib.py

diff --git a/prawokultury/settings.d/50-contrib.py b/prawokultury/settings.d/50-contrib.py
index 4625e79..5e34fe8 100644 (file)
--- a/prawokultury/settings.d/50-contrib.py
+++ b/prawokultury/settings.d/50-contrib.py
@@ -14,7 +14,7 @@ THUMBNAIL_QUALITY = 95
 GRAVATAR_DEFAULT_IMAGE = 'http://localhost:8000/static/img/avatar.png'
 
 CAS_SERVER_URL = 'http://logowanie.nowoczesnapolska.org.pl/cas/'
 GRAVATAR_DEFAULT_IMAGE = 'http://localhost:8000/static/img/avatar.png'
 
 CAS_SERVER_URL = 'http://logowanie.nowoczesnapolska.org.pl/cas/'

-CAS_VERSION = '1'
+CAS_VERSION = '3'

 
 HONEYPOT_FIELD_NAME='miut'
 
 
 HONEYPOT_FIELD_NAME='miut'
 


@@ -24,16 +24,19 @@ GETPAID_BACKENDS = (
     'getpaid.backends.payu',
 )
 
     'getpaid.backends.payu',
 )
 

+PIWIK_URL = ''
+PIWIK_SITE_ID = 0

 
 

-import djcelery
-djcelery.setup_loader()
-
-BROKER_BACKEND = "djkombu.transport.DatabaseTransport"
-BROKER_HOST = "localhost"
-BROKER_PORT = 5672
-BROKER_USER = "guest"
-BROKER_PASSWORD = "guest"
-BROKER_VHOST = "/"

 
 

+BROKER_URL = 'django://'
+CELERY_RESULT_BACKEND='djcelery.backends.database:DatabaseBackend'

 CELERY_EAGER_PROPAGATES_EXCEPTIONS = True
 CELERY_SEND_TASK_ERROR_EMAILS = True
 CELERY_EAGER_PROPAGATES_EXCEPTIONS = True
 CELERY_SEND_TASK_ERROR_EMAILS = True

+CELERY_TASK_SERIALIZER = 'json'
+CELERY_ACCEPT_CONTENT = ['json']
+
+SOUTH_MIGRATION_MODULES = {
+    'getpaid' : 'prawokultury.migrations_contrib.getpaid',
+    'payu': 'prawokultury.migrations_contrib.getpaid_payu',
+    'taggit': 'taggit.south_migrations',
+}