Commit 322a7b57ed1058b7fec68742112a5124f620afaa

Authored by Sergio Oliveira
1 parent ad4f165f

Moving socks settings to bottom

Showing 1 changed file with 5 additions and 6 deletions   Show diff stats
src/colab/custom_settings.py
... ... @@ -129,20 +129,19 @@ MIDDLEWARE_CLASSES = (
129 129  
130 130 # Add the django_browserid authentication backend.
131 131 AUTHENTICATION_BACKENDS = (
132   - 'django_browserid.auth.BrowserIDBackend',
  132 + 'django.contrib.auth.backends.ModelBackend',
  133 + 'accounts.auth.ColabBrowserIDBackend',
133 134 )
134 135  
135   -
136   -
137   -SOCKS_SERVER = None
138   -SOCKS_PORT = None
139   -
140 136 STATICFILES_DIRS = (
141 137 os.path.join(BASE_DIR, 'colab', 'static'),
142 138 )
143 139  
144 140 STATIC_ROOT = os.path.join(BASE_DIR, '..', 'www', 'static')
145 141  
  142 +SOCKS_SERVER = None
  143 +SOCKS_PORT = None
  144 +
146 145 from feedzilla.settings import *
147 146 FEEDZILLA_PAGE_SIZE = 5
148 147 FEEDZILLA_SITE_TITLE = gettext(u'Planet Colab')
... ...