From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 23 Mar 2017 17:08:28 +0000 (+0100)
Subject: Merge branch 'master' of git+ssh://git.forge.ircam.fr/mezzanine-organization
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=266b71a6d3ddcc30612d66bbda58bbefe00ddc7e;p=mezzo.git

Merge branch 'master' of git+ssh://git.forge.ircam.fr/mezzanine-organization
---

266b71a6d3ddcc30612d66bbda58bbefe00ddc7e
diff --cc docker-compose.yml
index c035d821,10569c1d..6871e443
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@@ -65,9 -65,10 +65,10 @@@ app
  nginx:
    image: nginx
    ports:
 -    - "8022:80"
 +    - "8024:80"
    volumes:
      - ./etc/nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
+     - ./etc/nginx/htpasswd:/etc/nginx/htpasswd
    volumes_from:
      - var
    links:
diff --cc etc/nginx/conf.d/default.conf
index 99dede90,276b15b1..87d81e95
--- a/etc/nginx/conf.d/default.conf
+++ b/etc/nginx/conf.d/default.conf
@@@ -1,39 -1,42 +1,43 @@@
  server_tokens off;
  
- server {
-     listen 80;
-     server_name manifeste2017.ircam.fr;
-     return 301 $scheme://www.manifeste2017.ircam.fr$request_uri;
- }
+ #server {
+ #    listen 80;
+ #    server_name starts.eu;
 -#    return 301 $scheme://www.starts.eu$request_uri;
++#    return 301 $scheme://manifeste.ircam.fr$request_uri;
+ #}
  
  server {
 -    listen 80;
 -    charset utf-8;
 -    server_name _;
 -
 -    access_log /var/log/nginx/app-access.log;
 -    error_log /var/log/nginx/app-error.log;
 -
 -    # max upload size
 -    client_max_body_size 4096M;
 -
 -    # Django media
 -    location /media/ {
 -        alias /srv/media/;
 -    }
 -
 -    # Django static
 -    location /static/ {
 -        alias /srv/static/;
 -    }
 -
 -    # Django static
 -    location /doc/ {
 -        alias /srv/doc/build/html/;
 -    }
 -
 -    location / {
 -       uwsgi_pass app:8000;
 -       include /etc/nginx/uwsgi_params;
 +       listen 80;
 +       charset utf-8;
 +       server_name manifeste2017.ircam.fr;
 +
 +       access_log /var/log/nginx/app-access.log;
 +       error_log /var/log/nginx/app-error.log;
 +
 +       # max upload size
 +       client_max_body_size 4096M; # adjust to taste
 +
 +       # Django media
 +       location /media/ {
-        	        alias /srv/media/; # your Django project's media files - amend as required
++       	        alias /srv/media/;
 +       }
 +
 +       # Django static
 +       location /static/ {
-                alias /srv/static/; # your Django project's static files - amend as required
++               alias /srv/static/;
 +       }
 +
 +       # Django static
 +       location /doc/ {
-                alias /srv/doc/build/html/; # your Django project's static files - amend as required
++               alias /srv/doc/build/html/;
 +       }
 +
 +       location / {
 +	     uwsgi_pass app:8000;
 +	     include /etc/nginx/uwsgi_params;
 +       }
+ 
+        # Uncomment to restrict access with login/pass
+        #auth_basic_user_file /etc/nginx/htpasswd;
+     }
  }