From c71eaf4f8e829de62215154b645fa4a060e4786c Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Mon, 17 Aug 2015 21:03:13 +0100
Subject: [PATCH] Fixed SSL

---
 docker-compose.yml                      |  4 ++--
 nginx/sites-enabled/deepsouthsounds.com | 21 +++++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b2d7660..46125df 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -60,8 +60,8 @@ nginx:
     restart: always
     build: ./nginx/
     ports:
-        - "81:81"
-        - "444:444"
+        - "80:80"
+        - "443:443"
     links:
         - "api:api"
         - "web:web"
diff --git a/nginx/sites-enabled/deepsouthsounds.com b/nginx/sites-enabled/deepsouthsounds.com
index 364c6b1..51535c2 100644
--- a/nginx/sites-enabled/deepsouthsounds.com
+++ b/nginx/sites-enabled/deepsouthsounds.com
@@ -1,16 +1,8 @@
 server {
     listen 81;
-}
-
-server{
-    listen 444;
     server_name api.deepsouthsounds.com api-test.deepsouthsounds.com;
     client_max_body_size 25M;
 
-    ssl on;
-    ssl_certificate /etc/nginx/ssl/dss.crt;
-    ssl_certificate_key /etc/nginx/ssl/dss.key;
-
     location / {
         proxy_pass http://api:8000;
         proxy_set_header Host $host;
@@ -20,9 +12,18 @@ server{
 }
 
 server {
-    listen 81;
+    listen 80;
+    listen 443 default ssl;
+
     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;
 
     location /api {