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

.gitignore

@@ -3,6 +3,8 @@ dss.web
 dss.api
 dss.radio
 
+*.swp
+
 api_env
 web_env
 radio_env

nginx/ssl/api.crt

@@ -1,64 +1,31 @@
 -----BEGIN CERTIFICATE-----
-MIIE/DCCA+SgAwIBAgIQHBAGf2spfbC3YljHUkXqgjANBgkqhkiG9w0BAQsFADB4
-MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjEpMCcGA1UECxMg
-U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxJjAkBgNVBAMTHVN0YXJ0
-Q29tIENsYXNzIDEgRFYgU2VydmVyIENBMB4XDTE2MDIwMjE5Mzc1MVoXDTE3MDIw
-MjE5Mzc1MVowIjEgMB4GA1UEAwwXYXBpLmRlZXBzb3V0aHNvdW5kcy5jb20wggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC45PPug1RnipVJ+NGjBzXelj6s
-gIlez7JbL0W6PiRu5H1wJhijCFG4MZqmohDhjrgDReksLkFNIm07CxcXYvpxdH+d
-woentDAu275ICRN+OVk6GoYJOcKkFmixt9+3LRdTnunDpOAscv24KvSGp+5ZP6Nx
-KOyt34OHR3k/6tCY3IwdswirtHKTiFKX0gL2xTbYCsh+PfDF0p3W3PJeyAhUa/j4
-N9VrgE8OSxueBLR4fpXw35Sct4cgc0uL2NFmFQy2eJ65eyG0JZtX/jna5K9SITvu
-P7Wo6mh7ZzTVCQGyjSrjbO2Wbvp1w04uV+ZJEPPd9Ox05dVNV35HefjYbwIlAgMB
-AAGjggHWMIIB0jALBgNVHQ8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
-AQUFBwMBMAkGA1UdEwQCMAAwHQYDVR0OBBYEFH3/s5cla4l1/KXcatZj2cKtXT45
-MB8GA1UdIwQYMBaAFNeRTgHEsL/4yGeTRJznM/qtkwyvMG8GCCsGAQUFBwEBBGMw
-YTAkBggrBgEFBQcwAYYYaHR0cDovL29jc3Auc3RhcnRzc2wuY29tMDkGCCsGAQUF
-BzAChi1odHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9zY2Euc2VydmVyMS5j
-cnQwOAYDVR0fBDEwLzAtoCugKYYnaHR0cDovL2NybC5zdGFydHNzbC5jb20vc2Nh
-LXNlcnZlcjEuY3JsMDcGA1UdEQQwMC6CF2FwaS5kZWVwc291dGhzb3VuZHMuY29t
-ghNkZWVwc291dGhzb3VuZHMuY29tMCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3Rh
-cnRzc2wuY29tLzBQBgNVHSAESTBHMAgGBmeBDAECATA7BgsrBgEEAYG1NwECBDAs
-MCoGCCsGAQUFBwIBFh5odHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kwDQYJ
-KoZIhvcNAQELBQADggEBAMqtoLFQsoN02xW5XA3hnZIgmn48i/zp0hO9cQG14fM7
-M6SCh/SEUL03nGbgoeJrfxSofiXrLOLTpgabPPSBfwtXEQR7VyxjJ7uKYS2CE0e9
-tHE0QuDfPQ8DrjgEZWh1gYKxzyTBOrA4Cx74rj3BUJQcL4RdtDXAJRgojoTwYlW1
-jj5Vrz0tXAcw3KGeBY70GlSN94WRW9ug5orz1OI15/q3oAehjgM+oBWk1qXgfSaE
-2AQ1RP0XT9oB56uvufBi5Jt1DQnnZTHo+1K7wP8pbSXeuHFBs71cVvBsnbqzZE/y
-ZVtxMkwNaI0u6backAEuJAOeiYCdOlY69mXSRMFKqUE=
------END CERTIFICATE-----
-
------BEGIN CERTIFICATE-----
-MIIF5TCCA82gAwIBAgIQal3D5TtOT9B7aR6l/OxkazANBgkqhkiG9w0BAQsFADB9
-MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
-U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
-cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTUxMjE2MDEwMDA1WhcN
-MzAxMjE2MDEwMDA1WjB4MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20g
-THRkLjEpMCcGA1UECxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkx
-JjAkBgNVBAMTHVN0YXJ0Q29tIENsYXNzIDEgRFYgU2VydmVyIENBMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2uz0qohni7BLYmaWv8lEaObCK0ygM86s
-eeN2w9FW4HWvQbQKRYDvy43kFuMmFD4RHkHn1Mk7sijXkJ/F8NH+5Tjbins7tFIC
-ZXd+Qe2ODCMcWbOLoYB54sM514tsZk6m3M4lZi3gmT7ISFiNdKpf/C3dZwasWea+
-dbLpwQWZEcM6oCXmW/6L3kwQAhC0GhJm2rBVrYEDvZq1EK3Bv+g5gAW8DVfusUai
-oyW0wfQdnKtOLv1M4rtezrKtE8T5tjyeKvFqMX93+LYVlT8Vs+sD12s3ncldqEDL
-U89IiBjg6FsbLfM2Ket/3RbfvggfQMPQshipdhrZL8q10jibTlViGQIDAQABo4IB
-ZDCCAWAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
-BQcDATASBgNVHRMBAf8ECDAGAQH/AgEAMDIGA1UdHwQrMCkwJ6AloCOGIWh0dHA6
-Ly9jcmwuc3RhcnRzc2wuY29tL3Nmc2NhLmNybDBmBggrBgEFBQcBAQRaMFgwJAYI
-KwYBBQUHMAGGGGh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbTAwBggrBgEFBQcwAoYk
-aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvY2EuY3J0MB0GA1UdDgQWBBTX
-kU4BxLC/+Mhnk0Sc5zP6rZMMrzAfBgNVHSMEGDAWgBROC+8apEBbpRdphzDKNGhD
-0EGu8jA/BgNVHSAEODA2MDQGBFUdIAAwLDAqBggrBgEFBQcCARYeaHR0cDovL3d3
-dy5zdGFydHNzbC5jb20vcG9saWN5MA0GCSqGSIb3DQEBCwUAA4ICAQCO5z+95Eu6
-gog9K9e7DatQXfeUL8zq1Ycj0HKo3ZvFhRjULAVrMj7JrURtfoZziTDl39gvMDhL
-voN5EFEYQWyre5ySsFgGeZQHIC0zhETILSyAE7JCKaEJ//APnkcQfx458GOuJvi+
-p2JpRxa8Sc/HVJ9HqA687QbbJFFZlUP5IqLtCb8yZVBURd4Nm/+01DXBzomoQPwA
-K3cYl9br6Q+eKmCKPKN6X4IT1gwtwXuca1f3OpZTbUFPdPz1KvP1qCFt+rNieSmO
-BN76Xa9ffzoBByzVdnvk2OHuopmJq/eHF+E3s+GFYT6Oxjrez/lEbBvgEmGyXZOZ
-aj6XeDnBxOIYRODfnZG99cy2q5WtDLHKuiMogJGO89PWaI2jK1Aq5sa0j55jp2Je
-FXbRieKw5CKreCIiNR9MpaffieLgbTcK1BSKjxUZtd7BqJ3x1lvD2jbe7WKqzusZ
-btPhFgrDDsgdw27zQokNYBZZaa1LwYZGZgddiAcLcYkilGobA2wLKk6eYz6VnatD
-dI4aQx6FkHWvKU0e7s/cUym6Px3vXrC4z6woAztC98XaorPO0pkL73P4dKSjnKYY
-rYsqe7BnBGtANf1XaG5Pm8BUWJ9WZAWin6KsJXTo8Nj0G4CRq7dq17LBnCbi9Qmp
-Szc2kuPNbrV8PvbTLIXupfZFFj0d9mpaFg==
+MIIFaTCCBFGgAwIBAgIQZf2eUz+9EJoirTFRNuPQnzANBgkqhkiG9w0BAQsFADCB
+kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
+BAMTLUNPTU9ETyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD
+QTAeFw0xNjAyMDMwMDAwMDBaFw0xOTAyMDIyMzU5NTlaMFsxITAfBgNVBAsTGERv
+bWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UECxMLUG9zaXRpdmVTU0wxIDAe
+BgNVBAMTF2FwaS5kZWVwc291dGhzb3VuZHMuY29tMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA4WE78m9dYld1j0c+HNy3L1oqvtph4RqTEJbkM39UmZK6
+r+0bqxOqg2Khk4BKukqed8pWgmGOM2mCufU2yOS5uJxTTnrlR020bulFB7XRpuLL
+M0qICuAIUvXo3uaBhtZ3OL8UWC98CGhuOup3s3t/nAIIgu9hNUV6ObSI99n72dE9
+KuYp3ScQCrNxqKJDz3lnor5MED01X7UAjgFfYwpdt2++/MdronKqA94ZzcTxN959
+NS4l+xV0srnblUHwKuCI1pQ4IaaIJTzfgesQqqxIJUFOjKeWr6NiVvzac5bJZs4E
+av+YuGZbYajTRmfH8ILkWFHp8qnG5g08XeoixuxFrwIDAQABo4IB8TCCAe0wHwYD
+VR0jBBgwFoAUkK9qOpRaC9iQ6hJWc99DtDoo2ucwHQYDVR0OBBYEFBvCqAJ91ly3
+byFJW0jMM3hXHOZ7MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBPBgNVHSAESDBGMDoGCysGAQQBsjEB
+AgIHMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNvbW9kby5jb20vQ1BT
+MAgGBmeBDAECATBUBgNVHR8ETTBLMEmgR6BFhkNodHRwOi8vY3JsLmNvbW9kb2Nh
+LmNvbS9DT01PRE9SU0FEb21haW5WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3Js
+MIGFBggrBgEFBQcBAQR5MHcwTwYIKwYBBQUHMAKGQ2h0dHA6Ly9jcnQuY29tb2Rv
+Y2EuY29tL0NPTU9ET1JTQURvbWFpblZhbGlkYXRpb25TZWN1cmVTZXJ2ZXJDQS5j
+cnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTA/BgNVHREE
+ODA2ghdhcGkuZGVlcHNvdXRoc291bmRzLmNvbYIbd3d3LmFwaS5kZWVwc291dGhz
+b3VuZHMuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQBmVL1N1GLaHRkheTLIzDgApXHI
+oDixgxxC6XXGAIE/o8aRTqy4luJWXcmZtaO5abkcMFJbjISjBq94c2DzUh2DbpEi
+bTbkIVKnfmF956vUvnDUe0iIojHpqN8oV4A47Rzac8bwBljrmqXek++FG5NhL99O
+HXTzPZ20CjTpVgUFUvPY4hfXCBHOaxvqe2XwsEkfNFpiY0uu4VE0PHmnVb1kfind
+wNPr3hp/UKvm7Ex9R1Fi4cP3LOHEdHvtDEng1BtO1BMGI8vCEw/caq93MxsZ06vf
+rEGIiCmjeJWGPRZmdLnzPnL80Q18+tXUwuIh3u0DTy0Zsv/NhoffnL4iBR06
 -----END CERTIFICATE-----

nginx/ssl/api.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDhYTvyb11iV3WP
+Rz4c3LcvWiq+2mHhGpMQluQzf1SZkrqv7RurE6qDYqGTgEq6Sp53ylaCYY4zaYK5
+9TbI5Lm4nFNOeuVHTbRu6UUHtdGm4sszSogK4AhS9eje5oGG1nc4vxRYL3wIaG46
+6neze3+cAgiC72E1RXo5tIj32fvZ0T0q5indJxAKs3GookPPeWeivkwQPTVftQCO
+AV9jCl23b778x2uicqoD3hnNxPE33n01LiX7FXSyuduVQfAq4IjWlDghpoglPN+B
+6xCqrEglQU6Mp5avo2JW/NpzlslmzgRq/5i4ZlthqNNGZ8fwguRYUenyqcbmDTxd
+6iLG7EWvAgMBAAECggEAF2tdKVH9KCziYGMMxz8AIgGCk5ZpuVRjl8O2Lsu6ZMLk
+d0dyKpK+kyx6kbMxEK6UTOpPlvjAKAN8vAoJCVMLIW3NEkie7ovahfPjYmu4P1kt
+uES0YjzpYIWBDzhwmSxL8y+X05oLj2wamDCpA5N/rRxg+goZ1clEbB6gZPDXxMhR
+VYtVTCSZrXgLP9abQi1i9n04uj1QmKrc60IqLK0S0evRf2ZsqTf1W3FC4IGZQs1Y
+5ny4vo0OS+asuU6LnlLFjKH7kixQOuMRsCY3P2dXYECqkUlV3ZZ+uw/ysWfcbkpL
+PxhtMu3l+9cRSphbGjHbIlD3BGDUPgbF6jbRwyNTUQKBgQD6vANjj0VE8elbTM54
+XVUpersX5AwuglLhM5v6LxuR4JhMD6tk8n73tJYhLTUVCrITZcpl1DkLASQ2KEN4
+EYHh6UZyCNXnARRRpRVjJws7CQLxImaoWRwKJIM16XfdNFwEL0OYvVm763LZ5qTS
+Gjovf2grdKPF31l9+/EqBVYowwKBgQDmHOkiMr6dO3WhE6gSY8HcHyJIt85HhfcT
+nrJ60vlqg6oilZlHlYoKv4HGfQ60Fqu107B3egWBpCpV9RqNkaYUyuMn56Y19aVp
+lA+EQLGP8ennJzGM3Yt3tzlLeKhKBTuV3x7a8Ht7/CX+H5Fs+3a+dt63mZ8hLC44
+SxbSCcwApQKBgQDShV4LD9ZHRx55zAlnwmWoyCWir5USz9WqxFxoOXlaiEsXQejU
+f07fyD5taLmzCyHta3/+86tZdAHlfvT3MSvudKDzSjvfE2buDj/g2n1xeeWAdTPg
+kcEbOwD4GSjNEBNaaBzHd+SKBeyOzDsDNYY5Ly5Vnj+L+jX3s7wPXh+zZQKBgEq4
+vpdlRPJHmYXJnT0DebLhxT85uFkPTlDnqmsp0OXehUOfsltFWsLsttZeS4T9C5sK
+d3YEgH89cKXi5lFsJzL/Qs31ccp5ztG+y18VptLoKhzuZC+qzRv9ujQgpP0MP/IF
+tr4/csmq8idX1uA9s6xbayzRTJP4BbYv4+QmXEElAoGBAM+82VRw3JxikE2pU511
+aUDElTg2rNxVRFtDK5P9r/tqs3o90PJ0QGARdyhAjA0P81+ugDJMkpyjlmVrCgT6
+nUNg+AypkVwR+h53V/hb6tGc9Ux7jK9V/pxtmHzmRAeQFeD6qIuMgF1ShiGcSPJw
+W3r1vgMEQ/E0p7t/QXgjFCh3
+-----END PRIVATE KEY-----

nginx/ssl/dss.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDoRKDVVQ5o4Wuv
+/yJhXUqIF4moeKfhVs/QYLHI6Jl0Hs8qojEMhw8vFTeeBuWurbrD9zgIv+ZibdSI
+nmTFE/Lib+KYusMHEH0pgp2kOGXQfh8iW6ZOIvqhcdtGVe09UwPoKv5FzdlGgfQv
+S8j/I8knyyHrd19Sc8MTBOLS5Uqiu4it3KqQgolnlolxXoLiI8NUSrsFdzqcsIzZ
+m2XIqvoJiZZOl7f2uT+aEw5XpEGHhGmV9VJcOrh5H3fFHhJNCPWrsJQvGP/qz7Lx
+TqeGJgcLad+uRFY6qv5C6wTBqo/qChNitVoSalqgyFMiTgT2zlviFuHfXvp1BOKN
+qoCreAEVAgMBAAECggEANM6FknsID6hQh28GLgS70T0ouvjTklPeY43YXckkOlZW
+22aMqEB8n0O/pVoEFjbBY5RtVO/sPSyjSXxZhMUIT5sIdZjghlalXi6oEJIR89j4
+0yLrKJCjUtlD9TXL/klFdh9wOAaZA4LANZCRXhCQx09Touk87s4K5+QQfcpLsbtq
+cnC934PeryJMkGo5YlDamYGbLTLNQGpiZ1TdDI0RhK1QF+TrRQi5XgDcleWuZ4TU
+oI2FBp595Zgi003+3Pypktot5LIH4nMrygIulQ5fes9uFj4PX/V41vfBHaFAt05c
+RijBq9+53BiuABMhjpcLrlhauJN2oplAeYp5v7DJgQKBgQD0qG6bSgFSGZ1HZLYb
+RyefMKPbBZHMddw0gJ65odbMgQOW055CRKJnxUDxrrXYujiOZK0JP9FAH4KBUkeY
+sQU1SGTrDa2HZiGdJx++0oKR69cA/YOmkxS9hgPcS/YayCRaBZmTM/8R+Sd3vpD7
+KUGQGoJSJtTc65EdT6gi8502jQKBgQDzCSeuGBXmFsVOpe9d1lMhjk8rnhEY4Krs
+oFYCGiWmY+nF79ulxP0ZR3v0i8DFWon7IDOkGavZdO5Bx9YYGzuDF/o1fGmsiONy
+IrxVpMcMOpnu4XnfLXLG8y90g68gHDWFVIAMnRtCIQWAuoS5gLSMdcwSoCxjZQeu
+pwnwIjJ2qQKBgQDcceNvgsgb3L6NdJ5th7iYxG/vyl3rt4rZt8bNBpkPnXPJdBYW
+KdeX3vE8kyqBBJIvI2GSgvEdcQbbVXLzjxVdRETCUom4BXtmKbl97BoAN1t8JfF4
+pvA6MMXLupoe2ZV/k6okK+a5oCFC0O+7jxnnKSuhsCF+ibcwjPS3wYA3hQKBgQDb
+9lY+gDgZtlQ/mXlqkZdN0JIhJP/OZ1DrtzYA0w9uaBFl/2/pub9lCMjMjUwckpQ9
+gGicxks+FlGpoadIzCTxwlrH2+F8saxBWeThErDAha1agiIedvDh1aoGp0RyKHXc
+RZ1bTTolgOONHcMQbcd7NQZNeUCTeRYZ4b7h4uGPeQKBgQCI2FCSWN7gX9c3pQNe
+9/qznhDuWfCS7wLKIAYt/JUK7va2yliBFxKoecZeZ+E0utVXrjQuruFqQ+g9uL8+
+9TyjbdhGHoLotfkwUSGDC/Bw4pikyA0y6Th72zdvxzBbuZtxSd/tY64R5grw9SCI
+a9Zsjpfr2IwuWH3zleMfEHcohQ==
+-----END PRIVATE KEY-----