diff --git a/dc3/dependencies/README.md b/dc3/dependencies/README.md index bee541cb3..5bb6b1dc9 100644 --- a/dc3/dependencies/README.md +++ b/dc3/dependencies/README.md @@ -1,24 +1,56 @@ -## 安装 acme.sh +# 使用 ACME.SH 申请并安装 LET’S ENCRYPT SSL 证书 -https://get.acme.sh | sh +Let’s Encrypt 是一个免费的，自动化的，开放的证书颁发机构（CA），为公众的利益而运行。 它是一项由 Internet Security Research Group（ISRG）提供的服务。 +acme.sh 则是实现了 acme 协议, 可以从 letsencrypt 生成免费的证书。 -## DNS-API - -> 阿里云控制台中申请子账号 API Token，并配置环境变量如下 +## 安装 ACME.SH ```bash -export Ali_Key="sdfsdfsdfljlbjkljlkjsdfoiwje" -export Ali_Secret="jlsdflanljkljlfdsaklkjflsa" +curl https://get.acme.sh | sh +source ~/.bashrc ``` -## 生成证书 +## 申请证书 + +这种方式的好处是，你不需要任何服务器，不需要任何公网 ip，只需要 dns 的解析记录即可完成验证，而且可申请泛域名证书。 +坏处是，需要配合DNS解析服务商的API使用，否则 acme.sh 将无法自动更新证书，每次都需要手动再次重新解析验证域名所有权。 + +### 配置阿里云 AccessKey ```bash -acme.sh --issue --dns dns_ali -d example.com -d www.example.com +# 阿里云控制台申请 API Token，并配置环境变量如下 +# RAM 访问控制 -> 访问凭证管理 -> AccessKey +export Ali_Key="AccessKey ID" +export Ali_Secret="AccessKey Secret" +``` + +### 配置阿里云 DNS + +```bash +acme.sh --issue --dns dns_ali -d dc3.site -d *.dc3.site ``` ## 安装证书 +> reloadcmd: 用于让web服务器重新加载新的证书文件，例子中使用的是 nginx 服务器，您也可以定义成其它服务器。 + ```bash acme.sh --installcert -d dc3.site --key-file /etc/letsencrypt/live/dc3.site/dc3.site.key --fullchain-file /etc/letsencrypt/live/dc3.site/fullchain.cer --reloadcmd "service nginx force-reload" -``` \ No newline at end of file +``` + +## 更新证书 + +Let’s Encrypt 的证书有效期为3个月，每3个月得重新申请证书。 +通过 acme.sh 可以自动管理SSL证书的申请。通过上面步骤的安装后 acme.sh 会定期自动更新SSL证书。 + +```bash +acme.sh --renew -d dc3.site --force +``` + +## 取消更新 + +有时候你可能需要移除特定域名的自动申请，这时候可以使用下面的命令让 acme.sh 取消对特定域名的自动续期。当然已申请的证书仍然有效，不会失效。 + +```bash +acme.sh --remove -d dc3.site +``` diff --git a/dc3/dependencies/conf.crt/dc3.site/README b/dc3/dependencies/conf.crt/dc3.site/README deleted file mode 100644 index 5050078ff..000000000 --- a/dc3/dependencies/conf.crt/dc3.site/README +++ /dev/null @@ -1,14 +0,0 @@ -This directory contains your keys and certificates. - -`privkey.pem` : the private key for your certificate. -`fullchain.pem`: the certificate file used in most server software. -`chain.pem` : used for OCSP stapling in Nginx >=1.3.7. -`cert.pem` : will break many server configurations, and should not be used - without reading further documentation (see link below). - -WARNING: DO NOT MOVE OR RENAME THESE FILES! - Certbot expects these files to remain in this location in order - to function properly! - -We recommend not moving these files. For more information, see the Certbot -User Guide at https://certbot.eff.org/docs/using.html#where-are-my-certificates. diff --git a/dc3/dependencies/conf.crt/dc3.site/cert.pem b/dc3/dependencies/conf.crt/dc3.site/cert.pem deleted file mode 100644 index 816659616..000000000 --- a/dc3/dependencies/conf.crt/dc3.site/cert.pem +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFVDCCBDygAwIBAgISAyRVdBS/p8SjMmqjZK8h8q4BMA0GCSqGSIb3DQEBCwUA -MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD -ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDA2MTkwMjIyMTRaFw0y -MDA5MTcwMjIyMTRaMBMxETAPBgNVBAMTCGRjMy5zaXRlMIIBIjANBgkqhkiG9w0B -AQEFAAOCAQ8AMIIBCgKCAQEAwrL0zWWpSo1przf6TSyRu/zfNSG36HThEmnibFn8 -D3HYUZzS+veuvH6uqPR1VVUOK80/2iiCBMQfFDufdTQjZAATJEcc6152VbZOWm80 -bD86FIP0W3FSzovVWmUDT/gdxgoAMr2ZxYTd5T+hSxMqTKYIVTzJS2fNr/1yi3IZ -O4bV0J4ZVnYeT3lFKKuchlbKIkwXgLQKBGqHvUGHIVXM5uy+kVSV0oZBWYgwCLwC -M6SkL1rYub4yOEJ6KrIT8/Znq8sIBo+exh0eP61eH9UM7dMCSvN0nw/2v6VxLNSp -GC3gV3OF0YPLgWK/8OCDMkt4htcm4yt6aAQSozm/BO2dXwIDAQABo4ICaTCCAmUw -DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM -BgNVHRMBAf8EAjAAMB0GA1UdDgQWBBT4PekdG7ZXD5B8h+OGrzebEpbJDTAfBgNV -HSMEGDAWgBSoSmpjBH3duubRObemRWXv86jsoTBvBggrBgEFBQcBAQRjMGEwLgYI -KwYBBQUHMAGGImh0dHA6Ly9vY3NwLmludC14My5sZXRzZW5jcnlwdC5vcmcwLwYI -KwYBBQUHMAKGI2h0dHA6Ly9jZXJ0LmludC14My5sZXRzZW5jcnlwdC5vcmcvMB8G -A1UdEQQYMBaCCiouZGMzLnNpdGWCCGRjMy5zaXRlMEwGA1UdIARFMEMwCAYGZ4EM -AQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly9jcHMubGV0 -c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHYAXqdz+d9WwOe1 -Nkh90EngMnqRmgyEoRIShBh1loFxRVgAAAFyypkpBgAABAMARzBFAiEArZaIwTLF -PlqVJkn0QlWVCg2opdsITWGwWyCX/8zW0CkCIHeSLi5Q8k9teZ2RMvdmJne38ww8 -pexE87f9VmQzynHuAHYAB7dcG+V9aP/xsMYdIxXHuuZXfFeUt2ruvGE6GmnTohwA -AAFyypko8QAABAMARzBFAiEAzmWlqO/fHa1B7i9rEICX5L5UF4RbaMiUjSzSPvgR -YuICIGXy6oRkrQxEjyK4+nKPdubI1wuxAwfIPXSls1Rd2RukMA0GCSqGSIb3DQEB -CwUAA4IBAQBx0N4epRYqvmNLzlJfPD09PXeEalB+7zN2ls44A7ao/PsN/vlN7hhX -JtjDMaUfoTyjtJxzDo/jcXsq7DzAe3bhG13bidLeh0naWVv147Is3Yz4khnuMjDb -90/YhMu5AKS9KCjPuJ72GDTWFPleJFMI1jUYxaapMSgGMjCDRSpegmGqDome+vzZ -QDI4wNCrxNSu4O6suWjMD8ACQMD97MnM1ILZekcJ9rMXIWVYDDCkgkrQqDObiR0f -k9jnL7XnrRbMQzHWRey9o3VBIJRo7TE82U+Lsn2su+PepYhOPK1dZv4iqyG+OXtm -PwwMZuwR8Yl4hCBJ//yhPq6Beh/aSbhV ------END CERTIFICATE----- diff --git a/dc3/dependencies/conf.crt/dc3.site/chain.pem b/dc3/dependencies/conf.crt/dc3.site/chain.pem deleted file mode 100644 index 0002462ce..000000000 --- a/dc3/dependencies/conf.crt/dc3.site/chain.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ -MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT -DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow -SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT -GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF -q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8 -SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0 -Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA -a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj -/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T -AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG -CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv -bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k -c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw -VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC -ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz -MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu -Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF -AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo -uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/ -wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu -X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG -PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6 -KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg== ------END CERTIFICATE----- diff --git a/dc3/dependencies/conf.crt/dc3.site/dc3.site.key b/dc3/dependencies/conf.crt/dc3.site/dc3.site.key new file mode 100644 index 000000000..273dd56a3 --- /dev/null +++ b/dc3/dependencies/conf.crt/dc3.site/dc3.site.key @@ -0,0 +1,5 @@ +-----BEGIN EC PRIVATE KEY----- +MHcCAQEEIFl2dIVmp3A3aAX46Im1vUuwCIYTf1y1pBIVUQBno1B2oAoGCCqGSM49 +AwEHoUQDQgAE63SlUpy5sp1r1zHDKeeNP3jBPlbwGn3/mK0bKqgXYwUKm+0ZUBP8 +PIh6eX+FnA7ZFkUvkXFRD3Q8POyzRwMgCA== +-----END EC PRIVATE KEY----- diff --git a/dc3/dependencies/conf.crt/dc3.site/fullchain.cer b/dc3/dependencies/conf.crt/dc3.site/fullchain.cer new file mode 100644 index 000000000..818ec8392 --- /dev/null +++ b/dc3/dependencies/conf.crt/dc3.site/fullchain.cer @@ -0,0 +1,68 @@ +-----BEGIN CERTIFICATE----- +MIIEAzCCA4mgAwIBAgIQeI2DNXjLytsxcNNXUoJQujAKBggqhkjOPQQDAzBLMQsw +CQYDVQQGEwJBVDEQMA4GA1UEChMHWmVyb1NTTDEqMCgGA1UEAxMhWmVyb1NTTCBF +Q0MgRG9tYWluIFNlY3VyZSBTaXRlIENBMB4XDTIzMTIwMzAwMDAwMFoXDTI0MDMw +MjIzNTk1OVowEzERMA8GA1UEAxMIZGMzLnNpdGUwWTATBgcqhkjOPQIBBggqhkjO +PQMBBwNCAATrdKVSnLmynWvXMcMp540/eME+VvAaff+YrRsqqBdjBQqb7RlQE/w8 +iHp5f4WcDtkWRS+RcVEPdDw87LNHAyAIo4IChTCCAoEwHwYDVR0jBBgwFoAUD2vm +S845R672fpAeefAwkZLIX6MwHQYDVR0OBBYEFH8/OrvWh1jqtQMqWWThvtjsXUf3 +MA4GA1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF +BwMBBggrBgEFBQcDAjBJBgNVHSAEQjBAMDQGCysGAQQBsjEBAgJOMCUwIwYIKwYB +BQUHAgEWF2h0dHBzOi8vc2VjdGlnby5jb20vQ1BTMAgGBmeBDAECATCBiAYIKwYB +BQUHAQEEfDB6MEsGCCsGAQUFBzAChj9odHRwOi8vemVyb3NzbC5jcnQuc2VjdGln +by5jb20vWmVyb1NTTEVDQ0RvbWFpblNlY3VyZVNpdGVDQS5jcnQwKwYIKwYBBQUH +MAGGH2h0dHA6Ly96ZXJvc3NsLm9jc3Auc2VjdGlnby5jb20wggEGBgorBgEEAdZ5 +AgQCBIH3BIH0APIAdwB2/4g/Crb7lVHCYcz1h7o0tKTNuyncaEIKn+ZnTFo6dAAA +AYwwhSEmAAAEAwBIMEYCIQChVCdnPXDjeYoWLKTe9pYMq7p9OIymvgpl8Q58aRTa +ygIhAJ6nsyCMhCMNsTg/1CYbm6upDe2o59pT/pxFoeHbidssAHcAO1N3dT4tuYBO +izBbBv5AO2fYT8P0x70ADS1yb+H61BcAAAGMMIUhTwAABAMASDBGAiEArVmP8Sh/ +vS434SLshIkjQYL+xfrpoiaSWR6UhdjrCQECIQDOwhXO6WADDsXLsl8dd1JyMLX+ +MMWS/3+5RqGPOHNcsDAiBgNVHREEGzAZgghkYzMuc2l0ZYINZGVtby5kYzMuc2l0 +ZTAKBggqhkjOPQQDAwNoADBlAjEAn3RPkYdvQsFEOr1X/NXOGuokdL5inC5qm3Sd +YDVmuwwec8cetbbAy6vU2p3n5cJYAjAE9JpmhXuz4V3tffWJXb6ALmk2k7CJV0Sd +P4v0jq3UpHYZaGdRdKNARK2PhmK0Zfg= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIDhTCCAwygAwIBAgIQI7dt48G7KxpRlh4I6rdk6DAKBggqhkjOPQQDAzCBiDEL +MAkGA1UEBhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNl +eSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMT +JVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMjAwMTMw +MDAwMDAwWhcNMzAwMTI5MjM1OTU5WjBLMQswCQYDVQQGEwJBVDEQMA4GA1UEChMH +WmVyb1NTTDEqMCgGA1UEAxMhWmVyb1NTTCBFQ0MgRG9tYWluIFNlY3VyZSBTaXRl +IENBMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAENkFhFytTJe2qypTk1tpIV+9QuoRk +gte7BRvWHwYk9qUznYzn8QtVaGOCMBBfjWXsqqivl8q1hs4wAYl03uNOXgFu7iZ7 +zFP6I6T3RB0+TR5fZqathfby47yOCZiAJI4go4IBdTCCAXEwHwYDVR0jBBgwFoAU +OuEJhtTPGcKWdnRJdtzgNcZjY5owHQYDVR0OBBYEFA9r5kvOOUeu9n6QHnnwMJGS +yF+jMA4GA1UdDwEB/wQEAwIBhjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdJQQW +MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgJO +MAgGBmeBDAECATBQBgNVHR8ESTBHMEWgQ6BBhj9odHRwOi8vY3JsLnVzZXJ0cnVz +dC5jb20vVVNFUlRydXN0RUNDQ2VydGlmaWNhdGlvbkF1dGhvcml0eS5jcmwwdgYI +KwYBBQUHAQEEajBoMD8GCCsGAQUFBzAChjNodHRwOi8vY3J0LnVzZXJ0cnVzdC5j +b20vVVNFUlRydXN0RUNDQWRkVHJ1c3RDQS5jcnQwJQYIKwYBBQUHMAGGGWh0dHA6 +Ly9vY3NwLnVzZXJ0cnVzdC5jb20wCgYIKoZIzj0EAwMDZwAwZAIwJHBUDwHJQN3I +VNltVMrICMqYQ3TYP/TXqV9t8mG5cAomG2MwqIsxnL937Gewf6WIAjAlrauksO6N +UuDdDXyd330druJcZJx0+H5j5cFOYBaGsKdeGW7sCMaR2PsDFKGllas= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID0zCCArugAwIBAgIQVmcdBOpPmUxvEIFHWdJ1lDANBgkqhkiG9w0BAQwFADB7 +MQswCQYDVQQGEwJHQjEbMBkGA1UECAwSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD +VQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0EgTGltaXRlZDEhMB8GA1UE +AwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTE5MDMxMjAwMDAwMFoXDTI4 +MTIzMTIzNTk1OVowgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpOZXcgSmVyc2V5 +MRQwEgYDVQQHEwtKZXJzZXkgQ2l0eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBO +ZXR3b3JrMS4wLAYDVQQDEyVVU0VSVHJ1c3QgRUNDIENlcnRpZmljYXRpb24gQXV0 +aG9yaXR5MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEGqxUWqn5aCPnetUkb1PGWthL +q8bVttHmc3Gu3ZzWDGH926CJA7gFFOxXzu5dP+Ihs8731Ip54KODfi2X0GHE8Znc +JZFjq38wo7Rw4sehM5zzvy5cU7Ffs30yf4o043l5o4HyMIHvMB8GA1UdIwQYMBaA +FKARCiM+lvEH7OKvKe+CpX/QMKS0MB0GA1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1 +xmNjmjAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zARBgNVHSAECjAI +MAYGBFUdIAAwQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5j +b20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNlcy5jcmwwNAYIKwYBBQUHAQEEKDAmMCQG +CCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wDQYJKoZIhvcNAQEM +BQADggEBABns652JLCALBIAdGN5CmXKZFjK9Dpx1WywV4ilAbe7/ctvbq5AfjJXy +ij0IckKJUAfiORVsAYfZFhr1wHUrxeZWEQff2Ji8fJ8ZOd+LygBkc7xGEJuTI42+ +FsMuCIKchjN0djsoTI0DQoWz4rIjQtUfenVqGtF8qmchxDM6OW1TyaLtYiKou+JV +bJlsQ2uRl9EMC5MCHdK8aXdJ5htN978UeAOwproLtOGFfy/cQjutdAFI3tZs4RmY +CV4Ks2dH/hzg1cEo70qLRDEmBDeNiXQ2Lu+lIg+DdEmSx/cQwgwp+7e9un/jX9Wf +8qn0dNW44bOwgeThpWOjzOoEeJBuv/c= +-----END CERTIFICATE----- diff --git a/dc3/dependencies/conf.crt/dc3.site/fullchain.pem b/dc3/dependencies/conf.crt/dc3.site/fullchain.pem deleted file mode 100644 index 6ec840f3d..000000000 --- a/dc3/dependencies/conf.crt/dc3.site/fullchain.pem +++ /dev/null @@ -1,58 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFVDCCBDygAwIBAgISAyRVdBS/p8SjMmqjZK8h8q4BMA0GCSqGSIb3DQEBCwUA -MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD -ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDA2MTkwMjIyMTRaFw0y -MDA5MTcwMjIyMTRaMBMxETAPBgNVBAMTCGRjMy5zaXRlMIIBIjANBgkqhkiG9w0B -AQEFAAOCAQ8AMIIBCgKCAQEAwrL0zWWpSo1przf6TSyRu/zfNSG36HThEmnibFn8 -D3HYUZzS+veuvH6uqPR1VVUOK80/2iiCBMQfFDufdTQjZAATJEcc6152VbZOWm80 -bD86FIP0W3FSzovVWmUDT/gdxgoAMr2ZxYTd5T+hSxMqTKYIVTzJS2fNr/1yi3IZ -O4bV0J4ZVnYeT3lFKKuchlbKIkwXgLQKBGqHvUGHIVXM5uy+kVSV0oZBWYgwCLwC -M6SkL1rYub4yOEJ6KrIT8/Znq8sIBo+exh0eP61eH9UM7dMCSvN0nw/2v6VxLNSp -GC3gV3OF0YPLgWK/8OCDMkt4htcm4yt6aAQSozm/BO2dXwIDAQABo4ICaTCCAmUw -DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM -BgNVHRMBAf8EAjAAMB0GA1UdDgQWBBT4PekdG7ZXD5B8h+OGrzebEpbJDTAfBgNV -HSMEGDAWgBSoSmpjBH3duubRObemRWXv86jsoTBvBggrBgEFBQcBAQRjMGEwLgYI -KwYBBQUHMAGGImh0dHA6Ly9vY3NwLmludC14My5sZXRzZW5jcnlwdC5vcmcwLwYI -KwYBBQUHMAKGI2h0dHA6Ly9jZXJ0LmludC14My5sZXRzZW5jcnlwdC5vcmcvMB8G -A1UdEQQYMBaCCiouZGMzLnNpdGWCCGRjMy5zaXRlMEwGA1UdIARFMEMwCAYGZ4EM -AQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly9jcHMubGV0 -c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHYAXqdz+d9WwOe1 -Nkh90EngMnqRmgyEoRIShBh1loFxRVgAAAFyypkpBgAABAMARzBFAiEArZaIwTLF -PlqVJkn0QlWVCg2opdsITWGwWyCX/8zW0CkCIHeSLi5Q8k9teZ2RMvdmJne38ww8 -pexE87f9VmQzynHuAHYAB7dcG+V9aP/xsMYdIxXHuuZXfFeUt2ruvGE6GmnTohwA -AAFyypko8QAABAMARzBFAiEAzmWlqO/fHa1B7i9rEICX5L5UF4RbaMiUjSzSPvgR -YuICIGXy6oRkrQxEjyK4+nKPdubI1wuxAwfIPXSls1Rd2RukMA0GCSqGSIb3DQEB -CwUAA4IBAQBx0N4epRYqvmNLzlJfPD09PXeEalB+7zN2ls44A7ao/PsN/vlN7hhX -JtjDMaUfoTyjtJxzDo/jcXsq7DzAe3bhG13bidLeh0naWVv147Is3Yz4khnuMjDb -90/YhMu5AKS9KCjPuJ72GDTWFPleJFMI1jUYxaapMSgGMjCDRSpegmGqDome+vzZ -QDI4wNCrxNSu4O6suWjMD8ACQMD97MnM1ILZekcJ9rMXIWVYDDCkgkrQqDObiR0f -k9jnL7XnrRbMQzHWRey9o3VBIJRo7TE82U+Lsn2su+PepYhOPK1dZv4iqyG+OXtm -PwwMZuwR8Yl4hCBJ//yhPq6Beh/aSbhV ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ -MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT -DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow -SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT -GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF -q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8 -SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0 -Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA -a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj -/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T -AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG -CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv -bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k -c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw -VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC -ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz -MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu -Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF -AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo -uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/ -wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu -X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG -PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6 -KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg== ------END CERTIFICATE----- diff --git a/dc3/dependencies/conf.crt/dc3.site/privkey.pem b/dc3/dependencies/conf.crt/dc3.site/privkey.pem deleted file mode 100644 index 2c848bc7d..000000000 --- a/dc3/dependencies/conf.crt/dc3.site/privkey.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDCsvTNZalKjWmv -N/pNLJG7/N81IbfodOESaeJsWfwPcdhRnNL69668fq6o9HVVVQ4rzT/aKIIExB8U -O591NCNkABMkRxzrXnZVtk5abzRsPzoUg/RbcVLOi9VaZQNP+B3GCgAyvZnFhN3l -P6FLEypMpghVPMlLZ82v/XKLchk7htXQnhlWdh5PeUUoq5yGVsoiTBeAtAoEaoe9 -QYchVczm7L6RVJXShkFZiDAIvAIzpKQvWti5vjI4QnoqshPz9merywgGj57GHR4/ -rV4f1Qzt0wJK83SfD/a/pXEs1KkYLeBXc4XRg8uBYr/w4IMyS3iG1ybjK3poBBKj -Ob8E7Z1fAgMBAAECggEAY5dMl2AAF418WM9mbmF07lbsCe6EdxiKJHQbCNeCkpfm -UeDJHuzg6bRXPT9GYW7Pf+JOXhZIY426ZAwXhck0rStIn07s4QyBtVg6fhHSG+i/ -mczhioDOHa7zZHi1GAvPlwR4k3vek2ViZ6iDpbZY9bocGxWr1bF0Sih3lhK4C3UJ -ICRNiQr6661BeTTMITODDH7CCS07CfK1yLR2+sT9FWVURJOzopeFTasLZ+D3u+tS -8XovU2dBw6kIxwXE5OG9a/Ddzxqd+ERoXSrB5GRe5lsfB+hGbW+prLZtegcT1GP7 -1b4sFtECneYQ0GrRBITEvlS2NjRDgyknR82QpJ8c4QKBgQDvzP4e3wbajmrN4KCo -bUcQZXum6JnIP0dYaZC1Sk/TfZ7ovf4Of0z+Q92OXhssWEVExTbSZhsEszEeQVTI -paigMqQ5hMcq/hjsSFDDvp5FcP3DuW3rXxayWjOJFiHwo//0+RtSngEKOuDMUkou -baKtZMg8EWJwGr0Qb6dnCHs8DwKBgQDP2f6sjktlZU9Gs6mfhexUBrzLaJIWhd7c -205m+tyleaC5lCNeqIHoyeTf+UQ+xMh/nJ/9hGxBJXenpoKJynBPMUJI7b7Kngz4 -7p/lVsXXEXpteM6zCBqhYjbClQSGOYRPWSq5w9FetBwa7cIV0UyqByDZ83ODWHW3 -znj6tEp5sQKBgDmCOutiZz1g7EJFfaIG2wUWoWns3HyGmHCemIKxuKUqukJs1hHZ -+7f6xJaRAQlIfgw5E6WvsQkWhFASMOgRunf4zSOyMSWhXI7F5QCcpU5YA7O9s5u/ -6SyKr1NQCIGygv7YAvJ0TCGM7z5w+bNavanBwreNH8Ns1iyr6kSuZweHAoGAajoJ -VHsswVdzmri7mhHB5HfFCVgaQXSNn+ZdPXg8SD3PDMlPAlOwgR6d4HHulP3RUpbj -lZeWE/1oF8CbunxBxddw/wCyn68DBj4+beFZHz+JiGVTjmA36/7b6bprI4ZFvp/d -nC8d0/7M1l5o8OmU+tjFy14GzTvqfdQCNG7sGSECgYBuHM3hBjeuTLTZ5lwv0KXX -GOYbcQV9dFjCmJ2/Hc65LIAWUTlUzJA0uN+YgyaPLeYca6nKzoVTA3W7uWG5C7yJ -xhvtKYwcJAZ/QNxduvfuNSdn4sXadUB/Q47rmpZQn9RQh9I6uBs6TJUFhLTI+E0d -crEIYAM+SnPsZwG53VgLRQ== ------END PRIVATE KEY----- diff --git a/dc3/docker-compose.yml b/dc3/docker-compose.yml index e952b6fa1..79383a9f1 100644 --- a/dc3/docker-compose.yml +++ b/dc3/docker-compose.yml @@ -27,7 +27,7 @@ services: - 8080:80 - 443:443 environment: - - APP_API_PATH=dc3-gateway + - APP_API_HOST=dc3-gateway - APP_API_PORT=8000 container_name: iot-dc3-web hostname: iot-dc3-web diff --git a/dc3/nginx/conf.d/default.conf b/dc3/nginx/conf.d/default.conf index a4a39c4dc..dfab278a3 100644 --- a/dc3/nginx/conf.d/default.conf +++ b/dc3/nginx/conf.d/default.conf @@ -33,8 +33,8 @@ server { ssl_protocols TLSv1 TLSv1.1 TLSv1.2; ssl_ciphers HIGH:!aNULL:!MD5; - ssl_certificate /etc/letsencrypt/live/dc3.site/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/dc3.site/privkey.pem; + ssl_certificate /etc/letsencrypt/live/dc3.site/fullchain.cer; + ssl_certificate_key /etc/letsencrypt/live/dc3.site/dc3.site.key; include /etc/nginx/location/*.conf; } diff --git a/dc3/nginx/location/default.env b/dc3/nginx/location/default.env index 58fc7ea17..70b6bd2f0 100644 --- a/dc3/nginx/location/default.env +++ b/dc3/nginx/location/default.env @@ -20,7 +20,7 @@ location / { } location ^~/api/ { - proxy_pass http://${APP_API_PATH}:${APP_API_PORT}/api/; + proxy_pass http://${APP_API_HOST}:${APP_API_PORT}/api/; } error_page 500 502 503 504 /50x.html;