X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=4f655385e9e193a77599bf53d33e882997a98434;hb=253c727bf8b4f874ae9488a1393acc5bcbbeae37;hp=b7b7b2c949f24b5690e89dbca0ae6cbfbade164a;hpb=c1f803384ad060eeedb52c29d149317b07bd2d37;p=myslice.git

diff --git a/myslice/settings.py b/myslice/settings.py
index b7b7b2c9..4f655385 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -34,12 +34,13 @@ if not os.path.isdir (os.path.join(HTTPROOT,"static")):
 if not os.path.isdir(ROOT): raise Exception,"Cannot find ROOT %s for unfold"%ROOT
 if not os.path.isdir(HTTPROOT): raise Exception,"Cannot find HTTPROOT %s for unfold"%HTTPROOT
 
-# dec 2013 - we currently have 3 auxiliary subdirs with various utilities
+# dec 2013 - we currently have 2 auxiliary subdirs with various utilities
 # that we do not wish to package 
-# hopefully the number should go down to 1
+# * sandbox is for plugin developers
+# * sample is for various test views
 # for each of these, if we find a directory of that name under ROOT, it then gets
 # inserted in INSTALLED_APPS and its urls get included (see urls.py)
-auxiliaries = [ 'sandbox', 'sample', 'trash', ]
+auxiliaries = [ 'sandbox', 'sample', ]
 
 ####################
 ADMINS = (
@@ -56,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'.
@@ -71,7 +84,7 @@ DATABASES = {
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
 # In a Windows environment this must be set to your system time zone.
-TIME_ZONE = 'America/Chicago'
+TIME_ZONE = 'Europe/Paris'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
@@ -197,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',
@@ -238,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