From 00dcfb58ca1a87c34e7f1f3ac889ec018eba9b4f Mon Sep 17 00:00:00 2001 From: Emilie Date: Wed, 22 Mar 2017 16:08:14 +0100 Subject: [PATCH] Generic settings --- app/settings.py | 12 ++++++------ docker-compose.yml | 2 +- env/dev.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/settings.py b/app/settings.py index 92412522..c1d59da2 100644 --- a/app/settings.py +++ b/app/settings.py @@ -138,7 +138,7 @@ LOCALE_PATHS = ['locale',] 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. @@ -213,8 +213,8 @@ ROOT_URLCONF = "urls" INSTALLED_APPS = [ "themes.base", - "themes.starts_eu", - 'themes.vertigo_starts_eu', + # "themes.starts_eu", + # 'themes.vertigo_starts_eu', "modeltranslation", "dal", @@ -305,9 +305,9 @@ if not DEBUG: TEMPLATES[0]['APP_DIRS'] = False HOST_THEMES = [ - ('www.starts.eu', 'themes.starts_eu'), - ('vertigo.starts.eu', 'themes.vertigo_starts_eu'), - ('vertigo.ircam.fr', 'themes.base'), + #('www.starts.eu', 'themes.starts_eu'), + #('vertigo.starts.eu', 'themes.vertigo_starts_eu'), + ('manifeste.ircam.fr', 'themes.base'), ] # List of middleware classes to use. Order is important; in the request phase, diff --git a/docker-compose.yml b/docker-compose.yml index dde49af6..ea4508d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -65,7 +65,7 @@ app: nginx: image: nginx ports: - - "8021:80" + - "8022:80" volumes: - ./etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf volumes_from: diff --git a/env/dev.yml b/env/dev.yml index 378cd00a..80eb5934 100644 --- a/env/dev.yml +++ b/env/dev.yml @@ -22,7 +22,7 @@ app: command: /bin/sh bin/app.sh --runserver ports: - - "9021:8000" + - "9022:8000" - "3001:3000" environment: - DEBUG=True -- 2.39.5