diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2011-11-09 16:34:20 -0300 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2011-11-09 16:34:20 -0300 |
| commit | 576517d5350ce1dc0d596413a9db95b7e4e7eb89 (patch) | |
| tree | 1e4fa28557231e48152a2f0165b2b920cbb7e2ed | |
| parent | 599fe9f2a6c603ebbb96c09e76b54c49aa64f501 (diff) | |
| parent | 1aa50bbe284c2fbc092636f6d114e1a76760f01e (diff) | |
| download | askbot-576517d5350ce1dc0d596413a9db95b7e4e7eb89.tar.gz askbot-576517d5350ce1dc0d596413a9db95b7e4e7eb89.tar.bz2 askbot-576517d5350ce1dc0d596413a9db95b7e4e7eb89.zip | |
Merge branch 'better-setup'
| -rw-r--r-- | askbot/setup_templates/settings.py | 4 | ||||
| -rw-r--r-- | askbot/setup_templates/settings.py.mustache | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py index ca6d2ebb..ed5c30da 100644 --- a/askbot/setup_templates/settings.py +++ b/askbot/setup_templates/settings.py @@ -209,11 +209,11 @@ ALLOW_UNICODE_SLUGS = False ASKBOT_USE_STACKEXCHANGE_URLS = False #mimic url scheme of stackexchange #Celery Settings -BROKER_BACKEND = "djkombu.transport.DatabaseTransport" +BROKER_TRANSPORT = "djkombu.transport.DatabaseTransport" CELERY_ALWAYS_EAGER = True import djcelery djcelery.setup_loader() -CSRF_COOKIE_NAME = 'askbot_scrf' +CSRF_COOKIE_NAME = 'askbot_csrf' CSRF_COOKIE_DOMAIN = ''#enter domain name here - e.g. example.com diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache index ad954734..82d42377 100644 --- a/askbot/setup_templates/settings.py.mustache +++ b/askbot/setup_templates/settings.py.mustache @@ -207,11 +207,12 @@ ALLOW_UNICODE_SLUGS = False ASKBOT_USE_STACKEXCHANGE_URLS = False #mimic url scheme of stackexchange #Celery Settings -BROKER_BACKEND = "djkombu.transport.DatabaseTransport" +BROKER_TRANSPORT= "djkombu.transport.DatabaseTransport" CELERY_ALWAYS_EAGER = True import djcelery djcelery.setup_loader() +DOMAIN_NAME = '{{domain_name}}' -CSRF_COOKIE_NAME = '{{domain_name}}_scrf' -CSRF_COOKIE_DOMAIN = '{{domain_name}}'#enter domain name here - e.g. example.com +CSRF_COOKIE_NAME = '{{domain_name}}_csrf' +CSRF_COOKIE_DOMAIN = DOMAIN_NAME |