From d1259a30d0acdabc2adb8bdd9cdc832ed40cc1a1 Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Tue, 2 Feb 2016 20:46:53 +0000
Subject: [PATCH] Added API cert

---
 nginx/sites-enabled/deepsouthsounds.com | 17 +++++++++++++----
 nginx/ssl/api.csr                       | 17 -----------------
 2 files changed, 13 insertions(+), 21 deletions(-)
 delete mode 100644 nginx/ssl/api.csr

diff --git a/nginx/sites-enabled/deepsouthsounds.com b/nginx/sites-enabled/deepsouthsounds.com
index 4de3a1b..ab22739 100644
--- a/nginx/sites-enabled/deepsouthsounds.com
+++ b/nginx/sites-enabled/deepsouthsounds.com
@@ -19,11 +19,20 @@
 
 server {
     listen 80;
+    listen 443 default ssl;
+
     server_name api.deepsouthsounds.com api-test.deepsouthsounds.com;
     client_max_body_size 0;
     
+    ssl_certificate /etc/nginx/ssl/api.crt;
+    ssl_certificate_key /etc/nginx/ssl/api.key;
+
+    if ($ssl_protocol = "") {
+       rewrite ^ https://$server_name$request_uri? permanent;
+    }
+
     location /assets/grappelli {
-	alias /usr/local/lib/python2.7/site-packages/grappelli/static/grappelli;
+        alias /usr/local/lib/python2.7/site-packages/grappelli/static/grappelli;
     }
     
    location /assets {
@@ -54,9 +63,9 @@ server {
     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;
-    #}
+    if ($ssl_protocol = "") {
+       rewrite ^ https://$server_name$request_uri? permanent;
+    }
 
     client_max_body_size 250M;
 
diff --git a/nginx/ssl/api.csr b/nginx/ssl/api.csr
deleted file mode 100644
index 4e1dc23..0000000
--- a/nginx/ssl/api.csr
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIICxzCCAa8CAQAwgYExCzAJBgNVBAYTAklFMRAwDgYDVQQIDAdNdW5zdGVyMQ0w
-CwYDVQQHDARDb3JrMRAwDgYDVQQKDAdQb2ROb21zMSAwHgYDVQQDDBdhcGkuZGVl
-cHNvdXRoc291bmRzLmNvbTEdMBsGCSqGSIb3DQEJARYORmVyZ0BsTW9yYW4ubWUw
-ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC45PPug1RnipVJ+NGjBzXe
-lj6sgIlez7JbL0W6PiRu5H1wJhijCFG4MZqmohDhjrgDReksLkFNIm07CxcXYvpx
-dH+dwoentDAu275ICRN+OVk6GoYJOcKkFmixt9+3LRdTnunDpOAscv24KvSGp+5Z
-P6NxKOyt34OHR3k/6tCY3IwdswirtHKTiFKX0gL2xTbYCsh+PfDF0p3W3PJeyAhU
-a/j4N9VrgE8OSxueBLR4fpXw35Sct4cgc0uL2NFmFQy2eJ65eyG0JZtX/jna5K9S
-ITvuP7Wo6mh7ZzTVCQGyjSrjbO2Wbvp1w04uV+ZJEPPd9Ox05dVNV35HefjYbwIl
-AgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEABjak1RxPiZTEE+X22NQALoT8N3tR
-qiUg9ihaTrb57DUsfKGuLGVxOH8fehrg44LZqAk0wabrfRPLaw748uWS+sqBg0nX
-0R8D+NYq1xiTLFmegFHv0gyzPFK25TGI7VL+oi64O+09uIrsVn9xG5AeH7TxW2q7
-ib4vgOoaVj6MtLvswxUEjIJHNuZKWp0cmsLeLQnOozhpr8JYBjBWYv/fiJM0VjkN
-VzRVKQIaN07n8jcbncGzbjpg0u3M12UKDK1eyTvNSM9efwcYUMMhyGikFUeO9i4+
-u4ExDnRSfElXuufD45oYVIbjk570jze3Q9SqyN4YTWrkHjJh218DWk8n2Q==
------END CERTIFICATE REQUEST-----