projects
/
matthijs
/
projects
/
xerxes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Show the currently logged in user and a logout link on the login page.
[matthijs/projects/xerxes.git]
/
settings.py
diff --git
a/settings.py
b/settings.py
index 574b39536a5f8e786d04a1e3f23ab18bed5b493c..ccffacbed25bb1cf5d02682d3f5934e8fbf84c6f 100644
(file)
--- a/
settings.py
+++ b/
settings.py
@@
-11,7
+11,6
@@
ADMINS = (
MANAGERS = ADMINS
MANAGERS = ADMINS
-PHPBB_DATABASE_NAME = 'ee_forum'
# Local time zone for this installation. Choices can be found here:
# http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
# Local time zone for this installation. Choices can be found here:
# http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
@@
-88,3
+87,11
@@
TEMPLATE_CONTEXT_PROCESSORS = (
)
LOGIN_URL = "/accounts/login/"
)
LOGIN_URL = "/accounts/login/"
+LOGIN_REDIRECT_URL = "/influences/"
+
+# Allow authentication against the phpb user accounts
+
+AUTHENTICATION_BACKENDS = (
+ 'ee.auth.PhpBBBackend',
+ 'django.contrib.auth.backends.ModelBackend',
+)