fix debug toobar static config path, change default pro port

diff --git a/README.rst b/README.rst
index 42d0229f63275f25b15b4525df0e339a37d1437a..e04a48aaf25d55d2ba7778a3b89173d473b0e26c 100644 (file)
--- 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 4b3d83c97c87a2532aced75e657264d16824e4f9..e74b9f7796b74b48f4f27ab9237cb4bfdec58fe6 100644 (file)
--- 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 9c7c3a8a8e937dd2d0aad944003aac1dc099dad4..7ca02a7a69dee04bc54ac9eda5c8cb4f265244d5 100644 (file)
--- 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