From 93d0377d9742314902e35f546440c93f3a6f8bb2 Mon Sep 17 00:00:00 2001 From: Emilie Date: Fri, 8 Dec 2017 12:26:29 +0100 Subject: [PATCH] [Settings] : fix .gitmodules and django settings --- .gitmodules | 7 ++++--- app/local_settings.py | 27 ++++++++++++++------------- app/settings.py | 2 +- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.gitmodules b/.gitmodules index 43e29d5f..5fa55236 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,13 +22,14 @@ [submodule "lib/grappelli-safe"] path = lib/grappelli-safe url = https://github.com/yomguy/grappelli-safe.git - branch = dynamic_stacked + branch-master = dynamic_stacked + branch-dev = dynamic_stacked ignore = dirty [submodule "lib/mezzanine-organization"] path = lib/mezzanine-organization url = https://github.com/Ircam-Web/mezzanine-organization.git - branch-master = vertigo-master - branch-dev = vertigo-dev + branch-master = master + branch-dev = master ignore = dirty [submodule "lib/cartridge"] path = lib/cartridge diff --git a/app/local_settings.py b/app/local_settings.py index 1cba9332..5d05c65f 100644 --- a/app/local_settings.py +++ b/app/local_settings.py @@ -55,22 +55,22 @@ DEBUG = True if os.environ.get('DEBUG') == 'True' else False ADMINS = ( ('Guillaume Pellerin', 'guillaume.pellerin@ircam.fr'), - ('David Palomares', 'd.palomares@libelium.com'), + ('Emilie Zawadzki', 'emilie.zawadzki@ircam.fr'), ) # Make these unique, and don't share it with anybody. SECRET_KEY = "j1qa@u$5ktqr^0_kwh@-j@*-80t$)ht!4-=ybz1xc%@3+r(r&tzefoih" NEVERCACHE_KEY = "m)u^%r@uh#r3wu0&$=#$1ogx)uy4hv93^2lt%c3@xi=^gifoj8paozijdihazefd" -EMAIL_HOST = 'smtp.ircam.fr' +EMAIL_HOST = '' # please specify your smtp server address EMAIL_PORT = '25' -SERVER_EMAIL = 'no-reply-vertigo@ircam.fr' -DEFAULT_FROM_EMAIL = 'Vertigo@iuk.fraunhofer.de' -DEFAULT_TO_EMAIL = 'Vertigo@iuk.fraunhofer.de' -EMAIL_SUBJECT_PREFIX = "[VERTIGO]" +SERVER_EMAIL = 'no-reply@no-reply.org' # a no reply address +DEFAULT_FROM_EMAIL = 'default@default.org' # another address, default one +DEFAULT_TO_EMAIL = 'recipient@recipient.org' # default recipient, for your tests +EMAIL_SUBJECT_PREFIX = "[PREFIX]" # prefix title in email -SITE_TITLE = 'VERTIGO' -SITE_TAGLINE = 'VERTIGO' +SITE_TITLE = 'Your Site' +SITE_TAGLINE = 'This is a Mezzo site' EVENT_DOMAIN = "//eve.ircam.fr" EVENT_SHOP_URL = EVENT_DOMAIN+"/pub.php/event/%d/edit" @@ -81,8 +81,9 @@ EVENT_CONFIRMATION_URL = EVENT_DOMAIN+"/pub.php/cart/done?transaction_id=%s" FIGGO_API_URL_PROD='https://ircam.ilucca.net/' FIGGO_API_HEADER_AUTH='Lucca application=bd6d5481-40eb-414b-9135-434e12749223' -HOST_THEMES = [ - ('vertigo.ircam.fr', 'organization_themes.vertigo-themes.vertigo_ircam_fr'), - ('vertigo.starts.eu', 'organization_themes.vertigo-themes.vertigo_starts_eu'), - ('www.starts.eu', 'organization_themes.vertigo-themes.www_starts_eu'), -] +# HOST_THEMES = [ +# ('manifeste.ircam.fr', 'themes.base'), +# ('vertigo.ircam.fr', 'organization_themes.vertigo-themes.vertigo_ircam_fr'), +# ('vertigo.starts.eu', 'organization_themes.vertigo-themes.vertigo_starts_eu'), +# ('www.starts.eu', 'organization_themes.vertigo-themes.www_starts_eu'), +# ] diff --git a/app/settings.py b/app/settings.py index 17a3cf27..d471d0ba 100644 --- a/app/settings.py +++ b/app/settings.py @@ -140,7 +140,7 @@ USE_TZ = True SESSION_EXPIRE_AT_BROWSER_CLOSE = False SESSION_ENGINE = "django.contrib.sessions.backends.signed_cookies" -SITE_ID = 3 +SITE_ID = 1 # If you set this to False, Django will make some optimizations so as not # to load the internationalization machinery. -- 2.39.5