Merge branch 'master' of https://github.com/fergalmoran/dss.docker

.gitignore

@@ -1 +1,2 @@
 .env
+.dss.web/

docker-compose.yml

@@ -61,8 +61,9 @@ nginx:
     build: ./nginx/
     ports:
         - "81:81"
+        - "444:444"
     links:
         - "api:api"
         - "web:web"
-    volumes_from:
-        - api
+    #volumes_from:
+    #    - api

nginx/Dockerfile

@@ -1,3 +1,4 @@
 FROM tutum/nginx
 RUN rm /etc/nginx/sites-enabled/default
 ADD sites-enabled/ /etc/nginx/sites-enabled
+ADD ssl/ /etc/nginx/ssl

nginx/sites-enabled/deepsouthsounds.com

@@ -1,6 +1,9 @@
 server {
     listen 81;
+}
 
+server{
+    listen 444;
     server_name api.deepsouthsounds.com api-test.deepsouthsounds.com;
     client_max_body_size 0;
 
@@ -8,6 +11,10 @@ server {
 	alias /usr/local/lib/python2.7/site-packages/grappelli/static/grappelli;
     }
 
+    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;

nginx/ssl/dss.crt

@@ -0,0 +1,36 @@
+-----BEGIN CERTIFICATE-----
+MIIGTzCCBTegAwIBAgIHBiMAy5PBjDANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
+BhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBE
+aWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcxODA2BgNVBAMTL1N0YXJ0Q29tIENs
+YXNzIDEgUHJpbWFyeSBJbnRlcm1lZGlhdGUgU2VydmVyIENBMB4XDTE1MDgxNjIy
+MTUzOVoXDTE2MDgxNjE5NDUxNFowTjELMAkGA1UEBhMCSUUxIDAeBgNVBAMTF3d3
+dy5kZWVwc291dGhzb3VuZHMuY29tMR0wGwYJKoZIhvcNAQkBFg5mZXJnQGxtb3Jh
+bi5tZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtakQR6obzModFy
+rbZVVXIEgKqNIynW3xnAVvaIU6fg5EzQ+DnVReEYxBFwhhg3CNBGWndXJ7AzxAAr
+rYQywl7FpC+2h8G6qFyBOZwaF5JpoksUuklF/FEQO5pi4Gx1LEgRS/BcDf3u8t/n
+/y54oTuP8Y+tB7/M0D7xQLx2pYfqAJAMTJe+DVixJ39PH1ey/njriahBwu6LDk2r
+s4i8Wl08xPBU7KFoQNip7QZl6a48J7CdwOggBBdoCALkoPMDGZgXItVMNl8romV1
+PGomy5UisPsxPXqsifS1v7GhdmgU0BhgQoRSYmN8UeGfUt0WsLDo2t3q81rUeXd3
+xrTBvKMCAwEAAaOCAvEwggLtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgOoMBMGA1Ud
+JQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBRK0bobi4eKcJAiRJKFVLbmPci8CjAf
+BgNVHSMEGDAWgBTrQjTQmLCrn/Qbawj3zGQu7w4sRTA3BgNVHREEMDAughd3d3cu
+ZGVlcHNvdXRoc291bmRzLmNvbYITZGVlcHNvdXRoc291bmRzLmNvbTCCAVYGA1Ud
+IASCAU0wggFJMAgGBmeBDAECATCCATsGCysGAQQBgbU3AQIDMIIBKjAuBggrBgEF
+BQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9saWN5LnBkZjCB9wYIKwYB
+BQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwAwIB
+ARqBvlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBhY2NvcmRpbmcgdG8gdGhl
+IENsYXNzIDEgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMgb2YgdGhlIFN0YXJ0Q29t
+IENBIHBvbGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhlIGludGVuZGVkIHB1cnBv
+c2UgaW4gY29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBwYXJ0eSBvYmxpZ2F0aW9u
+cy4wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5zdGFydHNzbC5jb20vY3J0
+MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsGAQUFBzABhi1odHRwOi8v
+b2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9zZXJ2ZXIvY2EwQgYIKwYBBQUH
+MAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1Yi5jbGFzczEuc2Vy
+dmVyLmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS8w
+DQYJKoZIhvcNAQELBQADggEBAI4v0O4gHkhEJmnugdFixPiTYRMGY03lBKXYNroc
+QJaSlQCA8PgjVXbeJhplKkIKM/DeHDlZOJ9NTd6LEmXa0vIHAGGEnjAFy4qRnEqL
+yuuoW6I5OBJ+uCSc+iCLbKMN+4q03UzZ2xl/+BiiJmqsNNETozBcpbuo9dav1q3R
+naoIvw2BbZy3mGMPmqKyx7/EPWHaL0jkhsg7q4/sNogEo1s0eThQ595ygJllxF1K
+u/PzBAn5M4GTeBGXV1Th8rkkIzdnPcOde5deQQy5k9g/8+116NEKWct2zUnhs33W
+NcYWg7BTSP9TLm9aYdbUQYPknTcWefb/JIFHa34XI012a9A=
+-----END CERTIFICATE-----

nginx/ssl/dss.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCrWpEEeqG8zKHR
+cq22VVVyBICqjSMp1t8ZwFb2iFOn4ORM0Pg51UXhGMQRcIYYNwjQRlp3VyewM8QA
+K62EMsJexaQvtofBuqhcgTmcGheSaaJLFLpJRfxREDuaYuBsdSxIEUvwXA397vLf
+5/8ueKE7j/GPrQe/zNA+8UC8dqWH6gCQDEyXvg1YsSd/Tx9Xsv5464moQcLuiw5N
+q7OIvFpdPMTwVOyhaEDYqe0GZemuPCewncDoIAQXaAgC5KDzAxmYFyLVTDZfK6Jl
+dTxqJsuVIrD7MT16rIn0tb+xoXZoFNAYYEKEUmJjfFHhn1LdFrCw6Nrd6vNa1Hl3
+d8a0wbyjAgMBAAECggEAQwfhtNPYE0glgQ6QX8RP8ZNLVexyNfrFOYihPD2mJAT4
+qggRImaIuH58rKnM+woEW5055HdmoioN4Vc0wIMuv+4mxTdtMd6337/5blRSpkbG
+YwKPwPwssPVdq45EZokLsoF5qGQKYSypO+fATkiIIgm0IFU6s9AGIqkzfsYXCOxg
+OMYumw0lnkUf8ult66cWjBpekJ8Skz3DsTjqdvAv1KAXYGRLHRhjKZKOj0XBz1Kz
+qyvPamW6aVuMga9YU09dPm4CVxUGc0hdETClqLYsQHAzHKyeF2Mk2tt6vUjuxPfF
+EaZkl1JjmxTSbViYhd0ABO1Mc1azxWh0ciPjF39qEQKBgQDVkIwPrfGK2TouRyOc
+E3zuWurXYe6q1+TnPgIs575zEogy6DMy9JXzQCuenDzYY4ztYZB2vaUfRvJqJI7N
+VnIxB1wRWuQiyv+NWzIXceHgiQkOiHG06F7j57BvNmYi+brtyl6qzkAqdzl1Py06
+uqar2tjWIbnzyNWPoDbKelFgiwKBgQDNZt4UGZUQLdC4u3TZM5CuE7VbzL5ybL2/
+x9R3ismSSVurPZFb4HOtYzuw9sYmUg8HhgH4X0CZl5ePGPZGTJ1dayR8+1tFCMP6
+qaUQfF62E+T0h+Z6wuuyofZPYqP77bOfuguivPYeqimVU3CMPfuHR0QKHveUiK1N
+h+KejME/SQKBgQCBdTjh/FAyGdIB4Y+9eba+ihBXdX8Gww53+oe5DtXMzYwQR99Z
+YRhQtzJ52D2t8lKoRv8aa4Vfu1MRco25/VAFVm/B+XXXfXSCDKkFuzvwL0F1NNKw
+ljeHMZgrIi+xve5JXOYb5iDRXSpQX3acZi7IeEX/L7yYAcMraDQucw1HVwKBgFEW
+6FvFEb02aS1VDDdnjRm8PCAGv7UKywp4iJ+9EgEHpwH+p3E/NkvgXkNp2SZtxPMy
+a3qzmBxK5ZGfyDJOst2bm+cfkJO7dytxZ/IPN5DoX75OHKagZ065dDU4+wZNfFl1
+qHxR31SR1yLVsxwaqD9q2iiouxNPtiNinwv7A5vJAoGABZrZ8prBDwDPbHTBcBzP
+bhgsyB3QzN8GFNZqMxp0r+AJfDSVertfgTV5qNEVI/f+n6hD1K1zTshbbaTVJTpI
+QRkEUTEOC52LXu6Kwy8i/yto9AcKft58ODXKzpRP667gDJYie/32/FSwRBDVpT8r
+dp5Gq2UgQ2B5hBXakP/atF4=
+-----END PRIVATE KEY-----