Skip to content

Commit

Permalink
Converted tabs to space
Browse files Browse the repository at this point in the history
  • Loading branch information
Maxim Pak committed Nov 22, 2016
1 parent 34dec73 commit 6000e61
Showing 1 changed file with 30 additions and 30 deletions.
60 changes: 30 additions & 30 deletions container-nginx/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,41 @@ events {worker_connections 1024;}

# the upstream component nginx needs to connect to
http {
upstream carparker {
server parker:8030;
upstream carparker {
server parker:8030;
#server unix:///carparker/carparker.sock; # for a file socket
#server 127.0.0.1:8001; # for a web port socket (we'll use this first)
}
#server 127.0.0.1:8001; # for a web port socket (we'll use this first)
}

# configuration of the server
server {
# the port your site will be served on
listen 80 default_server;
# the domain name it will serve for
#server_name *.*; # substitute your machine's IP address or FQDN
charset utf-8;
# configuration of the server
server {
# the port your site will be served on
listen 80 default_server;
# the domain name it will serve for
#server_name *.*; # substitute your machine's IP address or FQDN
charset utf-8;

# max upload size
client_max_body_size 75M; # adjust to taste
# max upload size
client_max_body_size 75M; # adjust to taste

#Django media
location /media {
alias /carparker/media; # your Django project's media files - amend as required
}
#Django media
location /media {
alias /carparker/media; # your Django project's media files - amend as required
}

location /static {
alias /carparker/static; # your Django project's static files - amend as required
}
location /static {
alias /carparker/static; # your Django project's static files - amend as required
}

location /extras {
alias /carparker/static; # your Django project's static files - amend as required
}
location /extras {
alias /carparker/static; # your Django project's static files - amend as required
}

# Finally, send all non-media requests to the Django server.
location / {
uwsgi_pass carparker;
#include /carparker/container-nginx/uwsgi_params; # the uwsgi_params file you installed
include /home/docker/uwsgi_params; # the uwsgi_params file you installed
}
}
# Finally, send all non-media requests to the Django server.
location / {
uwsgi_pass carparker;
#include /carparker/container-nginx/uwsgi_params; # the uwsgi_params file you installed
include /home/docker/uwsgi_params; # the uwsgi_params file you installed
}
}
}

0 comments on commit 6000e61

Please sign in to comment.