From: Thomas Fillon <thomas@parisson.com>
Date: Mon, 2 Mar 2015 23:08:38 +0000 (+0100)
Subject: Merge branch 'feature/docker-compose' of github.com:parisson/TimeSide into feature... 
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7d8db158d7106ae3e5a4e418ce5c2bc5ee0a2562;p=timeside.git

Merge branch 'feature/docker-compose' of github.com:parisson/TimeSide into feature/docker-compose

Conflicts:
	docker-compose.yml
---

7d8db158d7106ae3e5a4e418ce5c2bc5ee0a2562
diff --cc docker-compose.yml
index 67c88c0,dc56396..80e7c09
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@@ -3,17 -3,7 +3,17 @@@ datadb
    volumes:
      - /var/lib/postgresql
  
 +datastatic:
 +  image: debian:stable
 +  volumes:
 +    - /var/www
 +    
 +datalog:
 +  image: debian:stable
 +  volumes:
 +    - /var/log/nginx
 +    - /var/log/postgres
-         
+ 
  db:
    image: postgres
    volumes_from:
@@@ -24,11 -14,8 +24,11 @@@ nginx
    ports:
      - "8080:80"
    volumes:
-     - ./examples/deploy/nginx-app.conf:/etc/nginx/sites-enabled/
+     - ./examples/deploy/nginx/sites-enabled:/etc/nginx/sites-enabled
      - /media
 +  volumes_from:
 +    - datastatic
 +    - datalog
    links:
      - app
  
diff --cc examples/deploy/nginx/sites-enabled/app.conf
index 0000000,a7cfb57..bc2eb3f
mode 000000,100644..100644
--- a/examples/deploy/nginx/sites-enabled/app.conf
+++ b/examples/deploy/nginx/sites-enabled/app.conf
@@@ -1,0 -1,58 +1,44 @@@
+ # mysite_nginx.conf
+ 
+ # Define connection details for connecting to a django app running in
+ # a docker container.
+ # the upstream component nginx needs to connect to
+ upstream app {
+     #server unix:/opt/TimeSide/examples/sandbox/app.sock; # for a file socket
+     server app:8000; # for a web port socket (we'll use this first)
+     }
+ 
+ # configuration of the server
+ server {
+     # the port your site will be served on, default_server indicates that this server block
+     # is the block to use if no blocks match the server_name
+     listen      80 default_server;
+ 
+     # the domain name it will serve for
+     server_name .example.com; # substitute your machine's IP address or FQDN
+     charset     utf-8;
+ 
+     # max upload size
+     client_max_body_size 75M;   # adjust to taste
+ 
+     # Django media
+     location /media  {
+         alias /opt/TimeSide/examples/sandbox/media;  # your Django project's media files - amend as required
+     }
+ 
+     # Django static
+     location /static {
 -        alias app:/var/www/static; # your Django project's static files - amend as required
++        alias /var/www/static; # your Django project's static files - amend as required
+     }
+ 
 -    # Finally, send all non-media requests to the Django server.
++    # WSGI proxy settings
++    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
++    proxy_set_header Host $http_host;
++    proxy_redirect off;
++    proxy_buffering on;
++    proxy_read_timeout 43200;
+     location / {
 -        uwsgi_pass  app:8000;
 -        #include     /etc/nginx/uwsgi_params; # the uwsgi_params file you installed
 -
 - 	# the uwsgi_params file you installed needs to be passed with each
 -	# request.
 -	# the uwsgi_params need to be passed with each uwsgi request
 -	uwsgi_param QUERY_STRING $query_string;
 -	uwsgi_param REQUEST_METHOD $request_method;
 -	uwsgi_param CONTENT_TYPE $content_type;
 -	uwsgi_param CONTENT_LENGTH $content_length;
 -	uwsgi_param REQUEST_URI $request_uri;
 -	uwsgi_param PATH_INFO $document_uri;
 -	uwsgi_param DOCUMENT_ROOT $document_root;
 -	uwsgi_param SERVER_PROTOCOL $server_protocol;
 -	uwsgi_param HTTPS $https if_not_empty;
 -	uwsgi_param REMOTE_ADDR $remote_addr;
 -	uwsgi_param REMOTE_PORT $remote_port;
 -	uwsgi_param SERVER_PORT $server_port;
 -	uwsgi_param SERVER_NAME $server_name;
 -
 -
 -        }
 -    }
++    	     proxy_pass http://app; # Duplicated in location statements below.
++    }   
++
++}