Fixed SSL

This commit is contained in:
Fergal Moran
2015-08-17 21:03:13 +01:00
parent 684378ecb5
commit c71eaf4f8e
2 changed files with 13 additions and 12 deletions

View File

@@ -60,8 +60,8 @@ nginx:
restart: always restart: always
build: ./nginx/ build: ./nginx/
ports: ports:
- "81:81" - "80:80"
- "444:444" - "443:443"
links: links:
- "api:api" - "api:api"
- "web:web" - "web:web"

View File

@@ -1,16 +1,8 @@
server { server {
listen 81; listen 81;
}
server{
listen 444;
server_name api.deepsouthsounds.com api-test.deepsouthsounds.com; server_name api.deepsouthsounds.com api-test.deepsouthsounds.com;
client_max_body_size 25M; client_max_body_size 25M;
ssl on;
ssl_certificate /etc/nginx/ssl/dss.crt;
ssl_certificate_key /etc/nginx/ssl/dss.key;
location / { location / {
proxy_pass http://api:8000; proxy_pass http://api:8000;
proxy_set_header Host $host; proxy_set_header Host $host;
@@ -20,9 +12,18 @@ server{
} }
server { server {
listen 81; listen 80;
listen 443 default ssl;
server_name www.deepsouthsounds.com ext-test.deepsouthsounds.com deepsouthsounds.com; server_name www.deepsouthsounds.com ext-test.deepsouthsounds.com deepsouthsounds.com;
ssl_certificate /etc/nginx/ssl/dss.crt;
ssl_certificate_key /etc/nginx/ssl/dss.key;
#if ($ssl_protocol = "") {
# rewrite ^ https://$server_name$request_uri? permanent;
#}
client_max_body_size 250M; client_max_body_size 250M;
location /api { location /api {