summaryrefslogtreecommitdiff
path: root/fossee_anime/settings.py
diff options
context:
space:
mode:
authorAkshen2019-04-12 11:24:11 +0530
committerGitHub2019-04-12 11:24:11 +0530
commit359a4862c277d6e390a94bd54151b9630e604147 (patch)
treec88d69c13ab6683e6671cd7e46c7d54fac29304e /fossee_anime/settings.py
parentd2867b9f320ab823f0d40ed948867019e172ee79 (diff)
parent2d99408252a23c4715c9fb456af38d2246b87ead (diff)
downloadFOSSEE_animations-359a4862c277d6e390a94bd54151b9630e604147.tar.gz
FOSSEE_animations-359a4862c277d6e390a94bd54151b9630e604147.tar.bz2
FOSSEE_animations-359a4862c277d6e390a94bd54151b9630e604147.zip
Merge pull request #2 from Akshen/develop
Develop
Diffstat (limited to 'fossee_anime/settings.py')
-rw-r--r--fossee_anime/settings.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/fossee_anime/settings.py b/fossee_anime/settings.py
index 53b200b..9b3d6ed 100644
--- a/fossee_anime/settings.py
+++ b/fossee_anime/settings.py
@@ -12,7 +12,7 @@ https://docs.djangoproject.com/en/1.9/ref/settings/
import os
import sys
-from local_settings import (
+from .local_settings import (
EMAIL_HOST,
EMAIL_PORT,
EMAIL_HOST_USER,
@@ -77,6 +77,8 @@ TEMPLATES = [
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
+ 'django.template.context_processors.media',
+
],
},
},
@@ -140,11 +142,11 @@ LOGIN_URL = '/login/'
MEDIA_URL = '/data/'
-MEDIA_ROOT = os.path.join(BASE_DIR, "workshop_app", "data")
+MEDIA_ROOT = os.path.join(BASE_DIR, "fossee_manim", 'data')
-LOG_FOLDER = os.path.join(BASE_DIR, "workshop_app", "logs")
+LOG_FOLDER = os.path.join(BASE_DIR, "fossee_manim", "logs")
-#Email Connection Settings
+# Email Connection Settings
EMAIL_HOST = EMAIL_HOST
EMAIL_HOST_USER = EMAIL_HOST_USER
EMAIL_HOST_PASSWORD = EMAIL_HOST_PASSWORD
@@ -155,7 +157,7 @@ SENDER_EMAIL = SENDER_EMAIL
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-#Change this to the production url
+# Change this to the production url
PRODUCTION_URL = 'your_production_url'
ADMIN_EMAIL = 'your admin email' \ No newline at end of file