X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=myslice%2Fsettings.py;h=3a39ab92f04398025a8a2ced0713011c62ac38ea;hb=9a62ec0dc3ee3e859f3563da29d9c838a658b140;hp=2dbb8618cead965936ad73a64a693a3ccf1f0272;hpb=50f3f9251618c6a095bfb6188e43eea7b0acae48;p=myslice.git

diff --git a/myslice/settings.py b/myslice/settings.py
index 2dbb8618..3a39ab92 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -24,11 +24,19 @@ if not ROOT:
 
 ####################
 ADMINS = (
-    # ('Your Name', 'your_email@example.com'),
+    # ('your_name', 'your_email@test.com'),
 )
 
 MANAGERS = ADMINS
 
+# Mail configuration
+#DEFAULT_FROM_EMAIL = "root@theseus.ipv6.lip6.fr"
+#EMAIL_HOST_PASSWORD = "mypassword"
+
+EMAIL_HOST = "localhost"
+EMAIL_PORT = 25
+EMAIL_USE_TLS = False
+
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
@@ -76,28 +84,47 @@ MEDIA_URL = ''
 # Don't put anything in this directory yourself; store your static files
 # in apps' "static/" subdirectories and in STATICFILES_DIRS.
 # Example: "/home/media/media.lawrence.com/static/"
-STATIC_ROOT = os.path.join(ROOT,'django-static')
+STATIC_ROOT = os.path.join(ROOT,'static')
 
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
-STATIC_URL = '/all-static/'
+STATIC_URL = '/static/'
 
 # Additional locations of static files
 STATICFILES_DIRS = (
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    os.path.join(ROOT,'all-static'),
+    # Thierry : we do not need to detail the contents 
+    # of our 'apps' since they're mentioned in INSTALLED_APPS
 )
 
+# Needed by PluginFinder
+PLUGIN_DIR = os.path.join(ROOT,'plugins')
+# ThirdPartyFinder
+THIRDPARTY_DIR = os.path.join(ROOT, 'third-party')
+
 # List of finder classes that know how to find static files in
 # various locations.
 STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
+# Thierry : no need for this one    
+#    'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-#    'django.contrib.staticfiles.finders.DefaultStorageFinder',
+    'unfold.collectstatic.PluginFinder',
+    'unfold.collectstatic.ThirdPartyFinder',
+###    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
+#TEMPLATE_CONTEXT_PROCESSORS = (
+#    'django.contrib.auth.context_processors.auth',
+#    'django.core.context_processors.debug',
+#    'django.core.context_processors.i18n',
+#    'django.core.context_processors.media',
+#    'django.core.context_processors.static',
+#    'django.core.context_processors.request',
+#    'django.contrib.messages.context_processors.messages',
+#)
+
 # Make this unique, and don't share it with anybody.
 SECRET_KEY = 't%n(3h)&r^n8(+8)(sp29t^$c2#t(m3)e2!02l8w1#36tl#t27'
 
@@ -127,7 +154,7 @@ TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    os.path.join(ROOT,"all-templates"),
+    os.path.join(ROOT,"templates"),
 )
 
 INSTALLED_APPS = (
@@ -148,13 +175,27 @@ INSTALLED_APPS = (
     'plugins',
     # views - more or less stable 
     'views',
+    # temporary
     'trash',
+    # managing database migrations
+    'south', 
     # Uncomment the next line to enable the admin:
     # 'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
+    'portal',
+    'sample',
+# DEPRECATED #    'django.contrib.formtools',
+# DEPRECATED ##    'crispy_forms',
+# DEPRECATED #
+# DEPRECATED #    # User registration
+# DEPRECATED #    'django.contrib.auth',
+# DEPRECATED #    'django.contrib.sites',
+# DEPRECATED #    'registration',
 )
 
+ACCOUNT_ACTIVATION_DAYS = 7 # One-week activation window; you may, of course, use a different value.
+
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
 # the site admins on every HTTP 500 error when DEBUG=False.
@@ -184,7 +225,7 @@ LOGGING = {
     }
 }
 
-AUTHENTICATION_BACKENDS = ( 'auth.backend.MyCustomBackend', 'auth.manifoldbackend.ManifoldBackend', )
+AUTHENTICATION_BACKENDS = ( 'auth.manifoldbackend.ManifoldBackend', )
 
 ### 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
@@ -195,4 +236,3 @@ CSRF_FAILURE_VIEW = 'manifold.manifoldproxy.csrf_failure'
 #IA_JS_FORMAT = "<script type='text/javascript' src='{URL}' />"
 # put stuff under static/
 # IA_MEDIA_PREFIX = '/code/'
-