From 76869cb99b4e5ba5c92abd5db3d67b38984dfa73 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 21 Sep 2016 15:45:46 +0200 Subject: [PATCH] Add eve and prestashop modules, user local DBs only --- app/local_settings.py | 4 ++-- app/settings.py | 3 ++- docker-compose.yml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/local_settings.py b/app/local_settings.py index 528c8016..8ee7bf02 100644 --- a/app/local_settings.py +++ b/app/local_settings.py @@ -8,7 +8,7 @@ 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" # DATABASE_ROUTERS = ['eve.routers.EveRouter', 'festival.routers.FestivalRouter',] -DATABASE_ROUTERS = ['eve.routers.EveRouter',] +DATABASE_ROUTERS = ['eve.routers.EveRouter', 'prestashop.routers.PrestaRouter'] DATABASES = { 'default': { @@ -32,7 +32,7 @@ DATABASES = { 'USER': 'ircam_shops', # Not used with sqlite3. 'PASSWORD': 'pUmt97e4MgR9EP4knyWea0n', # Not used with sqlite3. 'NAME': 'ircam_shops', - 'HOST': 'mysql2.ircam.fr', # Set to empty string for localhost. Not used with sqlite3. + 'HOST': 'localhost', # Set to empty string for localhost. Not used with sqlite3. 'PORT': '3306', # Set to empty string for default. Not used with sqlite3. } diff --git a/app/settings.py b/app/settings.py index 12f99dd5..3129ad9f 100644 --- a/app/settings.py +++ b/app/settings.py @@ -221,7 +221,8 @@ INSTALLED_APPS = [ "mezzanine.accounts", # "mezzanine.mobile", "cartridge.shop", - # "eve", + "eve", + "prestashop", 'djangobower', "meta", "mezzanine_agenda", diff --git a/docker-compose.yml b/docker-compose.yml index 328d4a46..0dc9634f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,7 +45,7 @@ app: - ./app/:/srv/app - ./lib/mezzanine-agenda/:/srv/lib/mezzanine-agenda - ./lib/django-eve/:/srv/lib/django-eve - # - ./lib/mezzanine/:/srv/lib/mezzanine + - ./lib/django-prestashop/:/srv/lib/django-prestashop - ./lib/grappelli-safe/:/srv/lib/grappelli-safe volumes_from: - data -- 2.39.5