Docker-compose: fix configuration

diff --git a/docker-compose.yml b/docker-compose.yml
index daa3536f6feb813a78cf68bfdef527fae7e0848e..f26e63cf954b51532656bbbebbfe872fb5207181 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,9 +25,10 @@ db:
 nginx:
   image: nginx
   ports:
-    - "8080:80"
+    - "8000:80"
+    - "8001:443"
   volumes:
-    - ./examples/deploy/nginx/sites-enabled:/etc/nginx/sites-enabled
+    - ./examples/deploy/nginx/sites-enabled/app.conf:/etc/nginx/conf.d/default.conf
     - /media
     - ./examples/deploy/static/:/var/www/static
   links:
@@ -39,6 +40,6 @@ app:
     - .:/opt/TimeSide
     - ./examples/deploy/static/:/var/www/static
   command: /opt/TimeSide/examples/sandbox/manage.py collectstatic
-  command: uwsgi --ini /opt/TimeSide/examples/sandbox/uwsgi.ini:local
-  ports:
-    - "8000:8000"
+  command: uwsgi --socket :8000 --wsgi-file /opt/TimeSide/examples/sandbox/wsgi.py  --chdir /opt/TimeSide/examples/sandbox/ --master --processes 4 --threads 2
+  expose:
+    - "80" #default runserver wsgi port
\ No newline at end of file

diff --git a/examples/deploy/nginx/sites-enabled/app.conf b/examples/deploy/nginx/sites-enabled/app.conf
index bc2eb3f48d45a90b00f50335b1f9b9dd6d744970..b401d7c91468b758a98cf882d16b53d84a5fc0c6 100644 (file)
--- a/examples/deploy/nginx/sites-enabled/app.conf
+++ b/examples/deploy/nginx/sites-enabled/app.conf
@@ -1,44 +1,27 @@
-# mysite_nginx.conf
+server_tokens off;
 
-# 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 /var/www/static; # your Django project's static files - amend as required
-    }
-
-    # 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 / {
-            proxy_pass http://app; # Duplicated in location statements below.
-    }   
-
+       listen 80;
+       server_name nginx;
+
+       #proxy headers for additional info
+       proxy_set_header HOST $host;
+       proxy_set_header X-Forwarded-Proto $scheme;
+       proxy_set_header X-Real-IP $remote_addr;
+       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+       #charset koi8-r;
+       #access_log /var/log/nginx/log/host.access.log main;
+
+       # Django static
+       location /static {
+               alias /var/www/static; # your Django project's static files - amend as required
+       }
+
+       location / {
+             #proxy_pass django;
+            uwsgi_pass app:8000;
+            include /etc/nginx/uwsgi_params;
+       }
 }
+
+   
\ No newline at end of file