From 7ed9fa489d7fc17e7224c02a25e91eb28d8350e1 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Fri, 8 Jul 2016 16:57:33 +0200 Subject: [PATCH] fix debug toobar static config path, change default pro port --- README.rst | 2 +- app/local_settings.py | 2 +- docker-compose.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 42d0229f..e04a48aa 100644 --- a/README.rst +++ b/README.rst @@ -30,7 +30,7 @@ For a production environment setup:: docker-compose up -Then browse the app at http://localhost/ (replacing 'localhost' by the IP given by the docker terminal on OSX or Windows) +Then browse the app at http://localhost:8020/ (replacing 'localhost' by the IP given by the docker terminal on OSX or Windows) For a development environment setup:: diff --git a/app/local_settings.py b/app/local_settings.py index 4b3d83c9..e74b9f77 100644 --- a/app/local_settings.py +++ b/app/local_settings.py @@ -103,7 +103,7 @@ EVENT_USE_FEATURED_IMAGE = True EVENT_SHOP_URL = 'http://eve.ircam.fr/manifeste.php/manifestation/' EVENT_PASS_URL = 'http://eve.ircam.fr/manifeste.php/pass/' -TINYMCE_SETUP_JS = "/static/js/tinymce_setup.js" +TINYMCE_SETUP_JS = "/srv/app/static/js/tinymce_setup.js" SLUGIFY = 'django.template.defaultfilters.slugify' diff --git a/docker-compose.yml b/docker-compose.yml index 9c7c3a8a..7ca02a7a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -56,7 +56,7 @@ app: nginx: image: nginx ports: - - "80:80" + - "8020:80" volumes: - ./etc/nginx.conf:/etc/nginx/conf.d/default.conf - ./data/var/log/nginx/:/var/log/nginx -- 2.39.5