git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
[myslice.git]
/
myslice
/
settings.py
diff --git
a/myslice/settings.py
b/myslice/settings.py
index
bb9e74a
..
c9b3005
100644
(file)
--- a/
myslice/settings.py
+++ b/
myslice/settings.py
@@
-24,11
+24,23
@@
if not ROOT:
####################
ADMINS = (
####################
ADMINS = (
- # ('
Your Name', 'your_email@example
.com'),
+ # ('
your_name', 'your_email@test
.com'),
)
MANAGERS = ADMINS
)
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'.
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.