X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=4f655385e9e193a77599bf53d33e882997a98434;hb=902d7e75b27625363fb684bc41255241e7f6272a;hp=70b4a87a6063ef619769938d6559cb1093a9b528;hpb=8914ff738d969ee43d95d7bd2aa23f6b4d6200f0;p=myslice.git

diff --git a/myslice/settings.py b/myslice/settings.py
index 70b4a87a..4f655385 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -57,6 +57,18 @@ EMAIL_HOST = "localhost"
 EMAIL_PORT = 25
 EMAIL_USE_TLS = False
 
+# use the email for debugging purpose
+# turn on debugging: 
+# python -m smtpd -n -c DebuggingServer localhost:1025
+
+#if DEBUG:
+#    EMAIL_HOST = 'localhost'
+#    EMAIL_PORT = 1025
+#    EMAIL_HOST_USER = ''
+#    EMAIL_HOST_PASSWORD = ''
+#    EMAIL_USE_TLS = False
+#    DEFAULT_FROM_EMAIL = 'testing@example.com'
+
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
@@ -198,7 +210,7 @@ INSTALLED_APPS = [
     # managing database migrations
     'south', 
     # Uncomment the next line to enable the admin:
-    # 'django.contrib.admin',
+     'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     'portal',
@@ -239,7 +251,7 @@ LOGGING = {
     }
 }
 
-AUTHENTICATION_BACKENDS = ( 'auth.manifoldbackend.ManifoldBackend', )
+AUTHENTICATION_BACKENDS = ( 'auth.manifoldbackend.ManifoldBackend','django.contrib.auth.backends.ModelBackend' )
 
 ### the view to redirect malformed (i.e. with a wrong CSRF) incoming requests
 # without this setting django will return a 403 forbidden error, which is fine