From 16c4c22751c802ce154ec4934ee794b85904dca7 Mon Sep 17 00:00:00 2001 From: WizaXxX Date: Thu, 1 Oct 2020 09:05:21 +0000 Subject: [PATCH 1/8] renew sert --- certs/fullchain.pem | 44 +++++++++++++++++++------------------- certs/privkey.pem | 52 ++++++++++++++++++++++----------------------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/certs/fullchain.pem b/certs/fullchain.pem index af4396c..36bd346 100644 --- a/certs/fullchain.pem +++ b/certs/fullchain.pem @@ -1,34 +1,34 @@ -----BEGIN CERTIFICATE----- -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 -vKU= +BAHWeQIEAgSB9ASB8QDvAHYAXqdz+d9WwOe1Nkh90EngMnqRmgyEoRIShBh1loFx +RVgAAAF042iVtQAABAMARzBFAiBIIdT/ViUfucdJA9KBiv3AbFg9mZPUQXuaj3v6 +t3iloQIhAPp09Y4dYG+pw/Kl1OQXvzuItPjBc9RgXaI/G4RrewhPAHUAsh4FzIui +zYogTodm+Su5iiUgZ2va+nDnsklTLe+LkF4AAAF042iVrgAABAMARjBEAiB1r5jl +EYBvq1l/6XR+5plBhGuyeQDoNJ0oYUMmR032IQIgE+VSywcAMV/dpvqeftBDW+Bv +y/Eu7gI9esw8tzlhoWQwDQYJKoZIhvcNAQELBQADggEBACOXCmqRPvRz7xB4KJ5O +g8P701MpiuFm0hr1qme0F8v5ZXKWiUkps7aIBmlFD2jCz+YxvVTNgVfxl0TLJaWC +cRVBM/UXjTR7T9wO06Z+3p3naJEllk1fCaNEknW6aLDSR79KQLgMxN0ash/oM5dN +YLZNVXQ0XfQqpPWCXVqJLtg9LDexi58RqJHUtXIeTBds6LzDHhirNQ70Ev3sm+Dd +MOmiij6p+gkskkVu7PVL7GN6sGEsa0/wbKkKgKR26pTc6kriO6CXFlw+hGb5VSri +lxmALKQ8vpFb4uScIVXKmyNKUHrwBjBJUkpDcidCMwy3/4Q0fT71b98dYK6U38fN +S4Y= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ diff --git a/certs/privkey.pem b/certs/privkey.pem index 0321ff5..8442137 100644 --- a/certs/privkey.pem +++ b/certs/privkey.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC5mr0fHMkIWXMJ -NmdWz7oXx5yf0Hlp1Hl3PWvkxyCeF4pHvd5LYz30MJd9hlO44T15FNTNdlL3bAYV -C1/5wlnZyWqvxJB3Jj0aBP5LHXzPanQ9xzanW812WOzz2PyWDf/C3R2R4n/DcHpm -ua1yFQM+KzxkjKtpQhl+m6kuB5bx4ewVt0wkFXR+iQisenWyRdAUJ7iMetSAl9AF -+ZtXPL4rmnbk/3ibULEwln4V421RNBnVPxIUMsEnUoGPKNU9TYD4ZCML8wktN8Z6 -QvT8vsch+lvqV01uH9+x2zFlBCpyOeHFMoF1gl2xFeRU5ynVxLBwh6bWNDaWfbdy -V2L5WN/rAgMBAAECggEAPuFQr0i2RvDfC0D2M6/+kO3cfzxG1fbZC++wLPrVbxn0 -jCekNxAxPhh0Sl+G37zXcbz/93fd1dswGFMZOemBPUqCrXe/pc47pyQH7vTXgwHC -zec++eYdLroj1N0vfbrSanc0/Gaq+FCT91dyjpLV3WsSc9JAhFGTh5Q+9cw2dE2N -JLKMPkrQ+YsUF8tSJre1GmJqDeTC7T82YYL1Z7zoc9L28To0LiDNndvfpBv/D14r -i1kghKRVqr6fujHLUEhgDdMDBRVApeqWCO1KaXP8mO2hHpAlYLMjjTpd8I6eM619 -p/BvN0avgkacRUkvmANqbgGM+tN6/naVLpE2Abmg0QKBgQDlcflT/+3UUWn8qEMH -S1fRnYRgUJqhxnhx3e+FQbzjZBsE7bQ/aSouKiq6+vvEpwZpIbLxzyg9UL9N62uC -O2pllXnchyFon7pV5rzm5mq0jos88Tsn9mBDeZxi1xGtP3nrP0IA7+xuhVVR9n0w -wao8MXEP/01CwhrOj1eJ5SiJuQKBgQDPFdijiT+4YpLYvoBkwEP5nqoG6NDjb3D4 -PwPE0A0AmcbUdt8OWMDDQzCVpIH/Qx70uOO4hpFO8BB+FEcRJbPsJVI+N1WUS1zn -GTW+rulWycijn4rD/sIts1/3ElnbqO+FMKycnLdIC1z4M+XOZ19o5WWUy1gEd9Es -yPXPbdO4wwKBgQCpadxU/5WVvX9qhLrpOeJf7dR+YUWryaXJPbvLQty7cYDZxMHg -SEBS0eO3J/aaH1GGctFz5ieqDmMSn49EG6bV1uahxE0QuU+WecZlHyEOrGl22A97 -1FkDuVmVSYPNzh6xaoXLt1t1x5FV8ZBCXdzakQ8QZsufTT8J4aEbOk8SUQKBgGOp -+vJx2pXt8wiXXomesthPETt0Dxx2hOMkyLaO/sL8P2H/t8ha1KLlElviqaHldt+G -oCotsX9RME7NiYpqH9aV+6fvz6MoRhT+4AveeHSJdqOw5AMB+AgwnQ326gI6otPy -IhDZp6fnuB3INGCLBbMhPCtJVhoIZEZujUcAb3YrAoGAKsXnFjS8dAPol4xMrb3X -x80RaET/OUcSfEksw1I2JtisS1U1BPNPf+uUFzxsVTyyrvXp/49XB06ccGTMoHPi -vKrMeee1/Had7bRUHAp8wUfrssbunrPWyEW4c88f+wxNZCjAxKayWU7sCl1NbqIC -H7kdezEINcAoKbd9B3NW7kE= +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDEhEtJnh2bUnLJ +9bzYngJ9RL/Vvm7fqcWm5acWdBiq3iCnz3sdIf0PuVXfhS7LrRIZtvy4TqXFMzbv +hyRPRaeMowSI7kpuDN1YgUxbiEZA/mHHT7YNLC9Oj51Y7T441w4wnad/bniV6cU+ +BkKEu6w9e1wa2+K8+tobbeVZvUmkrOXDulu5IOsP4YY57ikxIk3Zh/mSZD/r4jjt +dM1Dg48V0SU3KG2JzGf1APNytWD5K1tiM5W3pjLffUtrvNGFYXw3ifadhnz+MYlj +GyBwUGig8y1LBYfcS+korB/JgvLRz3K1GtjQE3ycl4c+tpNa4LtYUt6DIr1FSAuM +Be/CzwGtAgMBAAECggEAeUhoqruh7B1baNd3wHzsbmGCv6jzBqjhqlpr38iw/Ktw +ngDIK7exVgX9QKESu3NKC4LKv/kSB/3Ots/CEgacHIjzoIrodrkL1rad6JPXP/9/ +WyIP6ltNqv+pjZuF3lCjmk+Cc3w7gdIwAFKetQqah6tdsdnpOtbayzjs5pCTJcTU +Lfyc9+5Dw0WGBKiskWxhp/u8t4tKdhUdxPJAQb2CA5a8NlHhU4huYCUJx1qRtjih +gVI5CzGIRnWelyM8XylbVJgglNn9HG74r9OpHFL0yLVv1G5NCiBOj6shlu1NQKsK +ghLnZ8BWupKB9AWZWnGpd6/3fEv9GDhWSIBD5QWNIQKBgQD/UY878A++YF5YzT9T +H1m6jsz0gbtx+pIQrANQOilkw0JFWZ+JXiC/ilNSsYXjl2eOyN+ooZ54DK6Vq88o +ODjVQL5sKh5UUsfwnx/42LFn5h8CyAY6Po9krR3AJYAPMj5lOWZUSOpX9LxMciQ5 +lPQYk1/qS8c7MtRfrUpaNSNHmQKBgQDFCo9ChFrkvMU6VckdKMJSUDWObW1t9pTs ++0u+5iM8MhwJlmsggUGn5OGUPtnZFohwT+j3KNzJ/qnkbF02JOZoLZDRFeniQpYq +rO173DrfhBKmy0oUnk3IVsJ8t4tKRYfn37yVoCGdWV817BaEINtdIeq8y6SW9rOb +Qbmzr2wHNQKBgQDblhzXkv8nYCCkxVm6NtNoRRr3C4DYZYYsepSa8nrZY6nilVNF +xMPrmJ9TFsUtWfFB93eMw/vUCiw5I7wWPkx69KURyCOvqEa3p1PLJStnTZ7MOJZK +j7WqA837jQUXjMHnMzfUM6YBIca1BNItB/PsEwxCKQxf2LaY1ySEcwE1uQKBgQCg +Chmd3z6sNp7C6NZ2tppOnRNC4aJWBEely94T6XyI8fJP3zqXpiSbp42JCRuL9X9Q +KbeAuFHMRunavCFhTstNpmTPTksvGQI7G0Wwqomu7ejwTIGZCZMHu2AwSCv8YUkn +jlPv+6YR1Xs9osoO+1jw5hFw0r6WVz4+Rj38sei+WQKBgDR6yAYpoPf3ggeZjofr +i+LCZTyVb8naHNiZrybGcrnVg0cYmXsrPa3o2yyhFHBXeBYeZchgMluaDbZeM65V +b7nMB2f+qp48ouNnlUQuQypxWRTpriERZm7HMhu3B2e4Cj/3zShW1Vwagi3/uUVF +Il6Ddkj/uUZyWb6K7Cv+40Wk -----END PRIVATE KEY----- From 358f0b55b17b85176ca85a0bcfeb6b3599b9b217 Mon Sep 17 00:00:00 2001 From: WizaXxX Date: Mon, 2 Nov 2020 05:52:23 +0000 Subject: [PATCH 2/8] renew sert --- certs/fullchain.pem | 48 ++++++++++++++++++++--------------------- certs/privkey.pem | 52 ++++++++++++++++++++++----------------------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/certs/fullchain.pem b/certs/fullchain.pem index 36bd346..effbde2 100644 --- a/certs/fullchain.pem +++ b/certs/fullchain.pem @@ -1,34 +1,34 @@ -----BEGIN CERTIFICATE----- -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 -S4Y= +JgYIKwYBBQUHAgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYB +BAHWeQIEAgSB9QSB8gDwAHcAfT7y+I//iFVoJMLAyp5SiXkrxQ54CX8uapdomX4i +8NcAAAF1h4No+AAABAMASDBGAiEAljlqsvxMILaomXQoQqHXMQYIEqgXHCsCh7Wd +6LE68TcCIQCtu3FzrAorAo/LL9mlDyxDydqitlaqmKrbXBrQfoXqlgB1AJQgvB6O +1Y1siHMfgosiLA3R2k1ebE+UPWHbTi9YTaLCAAABdYeDarkAAAQDAEYwRAIgHzmG +FOSVka2+E62VduBqCAvbcYNu0xbdLlGdn2hXptYCIEDm4Vlur85VL+qGbDEi3HwB +fAOBu0SRMMFVYVg9l2xYMA0GCSqGSIb3DQEBCwUAA4IBAQBrnyIwU+NLbiKagF0P +t+nMSR8hZpk+9P+uzf7+GnLqHjHJ3/gC6EHDol8D5nrrVB+y8Yna9EkXbC6uFcGU +pDrdZSp+uuye5UzKia0IAXM76AWzXobqukU8XGYkxMe6geO8niERfGpS8uP9ilHm +qpFoxy5Y1nMajPrQzBxLtEazeQFBmKGL75PSGCUlzALuolFUpcyRiSO5BvkOvfEJ +BNQ50L7GTpve1LLMlbub/tswh09VcFyBpipuHs3w87phYddFgbb91kH1QbFmpcnD +16E2yydyJzApzTgbCIHEe4C95Ccu+IIyla9sC9JX5PbnBNzbHUE86M1o1lHeSavj +K3uf -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ diff --git a/certs/privkey.pem b/certs/privkey.pem index 8442137..e5c6a53 100644 --- a/certs/privkey.pem +++ b/certs/privkey.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDEhEtJnh2bUnLJ -9bzYngJ9RL/Vvm7fqcWm5acWdBiq3iCnz3sdIf0PuVXfhS7LrRIZtvy4TqXFMzbv -hyRPRaeMowSI7kpuDN1YgUxbiEZA/mHHT7YNLC9Oj51Y7T441w4wnad/bniV6cU+ -BkKEu6w9e1wa2+K8+tobbeVZvUmkrOXDulu5IOsP4YY57ikxIk3Zh/mSZD/r4jjt -dM1Dg48V0SU3KG2JzGf1APNytWD5K1tiM5W3pjLffUtrvNGFYXw3ifadhnz+MYlj -GyBwUGig8y1LBYfcS+korB/JgvLRz3K1GtjQE3ycl4c+tpNa4LtYUt6DIr1FSAuM -Be/CzwGtAgMBAAECggEAeUhoqruh7B1baNd3wHzsbmGCv6jzBqjhqlpr38iw/Ktw -ngDIK7exVgX9QKESu3NKC4LKv/kSB/3Ots/CEgacHIjzoIrodrkL1rad6JPXP/9/ -WyIP6ltNqv+pjZuF3lCjmk+Cc3w7gdIwAFKetQqah6tdsdnpOtbayzjs5pCTJcTU -Lfyc9+5Dw0WGBKiskWxhp/u8t4tKdhUdxPJAQb2CA5a8NlHhU4huYCUJx1qRtjih -gVI5CzGIRnWelyM8XylbVJgglNn9HG74r9OpHFL0yLVv1G5NCiBOj6shlu1NQKsK -ghLnZ8BWupKB9AWZWnGpd6/3fEv9GDhWSIBD5QWNIQKBgQD/UY878A++YF5YzT9T -H1m6jsz0gbtx+pIQrANQOilkw0JFWZ+JXiC/ilNSsYXjl2eOyN+ooZ54DK6Vq88o -ODjVQL5sKh5UUsfwnx/42LFn5h8CyAY6Po9krR3AJYAPMj5lOWZUSOpX9LxMciQ5 -lPQYk1/qS8c7MtRfrUpaNSNHmQKBgQDFCo9ChFrkvMU6VckdKMJSUDWObW1t9pTs -+0u+5iM8MhwJlmsggUGn5OGUPtnZFohwT+j3KNzJ/qnkbF02JOZoLZDRFeniQpYq -rO173DrfhBKmy0oUnk3IVsJ8t4tKRYfn37yVoCGdWV817BaEINtdIeq8y6SW9rOb -Qbmzr2wHNQKBgQDblhzXkv8nYCCkxVm6NtNoRRr3C4DYZYYsepSa8nrZY6nilVNF -xMPrmJ9TFsUtWfFB93eMw/vUCiw5I7wWPkx69KURyCOvqEa3p1PLJStnTZ7MOJZK -j7WqA837jQUXjMHnMzfUM6YBIca1BNItB/PsEwxCKQxf2LaY1ySEcwE1uQKBgQCg -Chmd3z6sNp7C6NZ2tppOnRNC4aJWBEely94T6XyI8fJP3zqXpiSbp42JCRuL9X9Q -KbeAuFHMRunavCFhTstNpmTPTksvGQI7G0Wwqomu7ejwTIGZCZMHu2AwSCv8YUkn -jlPv+6YR1Xs9osoO+1jw5hFw0r6WVz4+Rj38sei+WQKBgDR6yAYpoPf3ggeZjofr -i+LCZTyVb8naHNiZrybGcrnVg0cYmXsrPa3o2yyhFHBXeBYeZchgMluaDbZeM65V -b7nMB2f+qp48ouNnlUQuQypxWRTpriERZm7HMhu3B2e4Cj/3zShW1Vwagi3/uUVF -Il6Ddkj/uUZyWb6K7Cv+40Wk +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCfzlo1nMZaAK8B +C4oP354UwFwucpv1fgVA3UvMC98OWrI9LusiVMaZSAbK3dHh0jch5jQRSiQsP4YA +EGogWHmO6QAzsPHjJLeAKq8+odCbdBOmniRdA98Uwl0fsALI1nXD1xsroUtOCWbY +I0tXxJz8UaNZaS96oveIbVflXbFFlzvErakBaK0Mj6Ndt1XK761RAvX0ZJViikI/ +UgZY3wQikKnsZkS4603drzPiBtY3+Pck8yxzJtOuX4AxEC9yFDJb5uGTnijcKccq +zY14et43zVCtoiYllXbklQ+sdwreiAOyHQz23fRwbHAuPcgZ2IOQ1bqGh0cLX+xO +SNyLGcclAgMBAAECggEADcHsDjWC9fidGE/wANHVgB/XT8BaINZKiX0Dq3tSJqA0 +PAQwBfKablO/EfPqv7AjQu3YiayCVLTbSmIfYM19GYqBk/GlwVJF4ejK0W+Iz/k8 +P9nZc5CDwfvBnJrAgp3D4apBEo5+NyekDPNs5w9sHGTC1U2y4rHo8XvIV1yriDwL ++0Uj+NbrKaywB1NAM2ARNJfXXocgLQaxrR1aiSDoJ2DSyh34pmTz2wBxf1m2N3k/ +/fIKKgoLsmX7CPRQFobWXS92W40m4r3FStWvhFwEMmRatXpZmFYt5+XgtuC3hPPY +4dvpbOaT3oF9c3C/KMBlnAGMZKevAFwLsKSMPRuY+QKBgQDMgc/o1F2oNvSA8M+Y +97ADxyFtLMrVXt0vZUs4Vt2vegPdDqZPmkur8Q0YQZ7trLo9InSkMbWZc4aiSDQW +Rl6U8oSDD9h9HB1S45YGgHgg6wW32miWjBK1EYjfvJKdmj5nljXbPhJYOJY7WaY0 +J39OW1nvJJYNPN/Aga37GNv2mwKBgQDICy/SPFbLF37s4i8tgXj9FmbvfVim3sr9 +FLGbtipKZBTqIpfP5XhrBh6upcvAMrL/vZ146mfNOK8Ox8QvLzTk1EsRVT2er/Tb +tBHxDRXcriCSHgs7FQdrbche6QVw6WMG14iq1WF9rXmlOZXq0LN8VkgkCLvKdPnF +Z4BAYl41PwKBgF5pz8J9yH9QX7Dne+/y6Z/U3um4NCwtj4/CA+gOsmnAuufjS4SU +hzrqHlGEegrgI1r1/UOQb3ZYj198Vg+yjRfWnrajKh8YS7FowGpgBRWtawZmHsLi +CADwB3DDbiy0ePr5rgN5tJ5mAXWE/eY2Fd/m7K4rBds2r1YAiIHUCDjhAoGASWBJ +Fz2IvJAOv4crtO5j2bmo4jnBFdxs6q33g90q4ASb41HzC4/pPqCNCpTICuTN4Z7E +r0CT+KPNGofN/1y6cyEns+DnbFiwYRJI7nlVRpAcZFxe1DofcZlgQOgKVeNVroHK +oJcKXpYOI7vesLYC0B258nW9pEKKB42ybmtmkPMCgYEAjuLs4y9ejvdtPDpfOd0m +teXMlgKfUfRspvIaCbAb6y1T4pTtycd2LwSpQzyjpsvmXvLi53vuDWSFIOJ2IMBz +YfyiFOxZS5+xviBiF6TSngdL21ovwHNYaRXThRg1nbmkddBFTEwhGaMOYsb0cORU +7SJBsqHfZh0p2/r5oQaIbPk= -----END PRIVATE KEY----- From 8512350a58809e0a7c055fe5625f33067134167a Mon Sep 17 00:00:00 2001 From: WizaXxX Date: Tue, 1 Dec 2020 08:42:15 +0000 Subject: [PATCH 3/8] renew sert --- certs/fullchain.pem | 44 +++++++++++++++++++------------------- certs/privkey.pem | 52 ++++++++++++++++++++++----------------------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/certs/fullchain.pem b/certs/fullchain.pem index effbde2..477f1ce 100644 --- a/certs/fullchain.pem +++ b/certs/fullchain.pem @@ -1,34 +1,34 @@ -----BEGIN CERTIFICATE----- -MIIFbzCCBFegAwIBAgISBIkShTzfm9sZV84tRbY6RfAvMA0GCSqGSIb3DQEBCwUA +MIIFbzCCBFegAwIBAgISBJmz3Xf+Wa8hs6jlepJiHS14MA0GCSqGSIb3DQEBCwUA MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD -ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDExMDIwNDUyMTdaFw0y -MTAxMzEwNDUyMTdaMBYxFDASBgNVBAMTCzFjZnJlc2guZGV2MIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn85aNZzGWgCvAQuKD9+eFMBcLnKb9X4FQN1L -zAvfDlqyPS7rIlTGmUgGyt3R4dI3IeY0EUokLD+GABBqIFh5jukAM7Dx4yS3gCqv -PqHQm3QTpp4kXQPfFMJdH7ACyNZ1w9cbK6FLTglm2CNLV8Sc/FGjWWkveqL3iG1X -5V2xRZc7xK2pAWitDI+jXbdVyu+tUQL19GSVYopCP1IGWN8EIpCp7GZEuOtN3a8z -4gbWN/j3JPMscybTrl+AMRAvchQyW+bhk54o3CnHKs2NeHreN81QraImJZV25JUP -rHcK3ogDsh0M9t30cGxwLj3IGdiDkNW6hodHC1/sTkjcixnHJQIDAQABo4ICgTCC +ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDEyMDEwNzQyMDlaFw0y +MTAzMDEwNzQyMDlaMBYxFDASBgNVBAMTCzFjZnJlc2guZGV2MIIBIjANBgkqhkiG +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlb9EfbYOSIu4aQaGCb8k8vxcntANYSPjyo2a +EEKx2NqMI5TX3AVWblVzCWyIl0h3/BJS4pYGObrzSZVP/PBWig7tJ4AlpJYY4TVY +ozwoonshYQeTHixTdrflp+LtUnh+1kBTTJ8wJIlaHiq9xj114NB1UleqqiWsPnFc +AiCBHiG28TTVQFDok8WwtiX//8jBKxlSuvltcyed/0hshI3sdXeFlD1sk7gUHmqv +/u+igxGeB3TTuiG864a9qWpff+ah6VR6AaRn4wU/NmnT+xmA8iXnLjOp448pHINg +JnWuleIdzw3+uIJvHbYasmf/1mpj3Ph5BzUBTDc1/8HjnDSAcQIDAQABo4ICgTCC An0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD -AjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTUcYvcaD41Y/eimXxUzDATF0gGlTAf +AjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBS9qxGdqVaNXjFP4c3Y3wmFd/FHzjAf BgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv86jsoTBvBggrBgEFBQcBAQRjMGEw LgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwLmludC14My5sZXRzZW5jcnlwdC5vcmcw LwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0LmludC14My5sZXRzZW5jcnlwdC5vcmcv MDcGA1UdEQQwMC6CDSouMWNmcmVzaC5kZXaCECouczMuMWNmcmVzaC5kZXaCCzFj ZnJlc2guZGV2MEwGA1UdIARFMEMwCAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgw JgYIKwYBBQUHAgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYB -BAHWeQIEAgSB9QSB8gDwAHcAfT7y+I//iFVoJMLAyp5SiXkrxQ54CX8uapdomX4i -8NcAAAF1h4No+AAABAMASDBGAiEAljlqsvxMILaomXQoQqHXMQYIEqgXHCsCh7Wd -6LE68TcCIQCtu3FzrAorAo/LL9mlDyxDydqitlaqmKrbXBrQfoXqlgB1AJQgvB6O -1Y1siHMfgosiLA3R2k1ebE+UPWHbTi9YTaLCAAABdYeDarkAAAQDAEYwRAIgHzmG -FOSVka2+E62VduBqCAvbcYNu0xbdLlGdn2hXptYCIEDm4Vlur85VL+qGbDEi3HwB -fAOBu0SRMMFVYVg9l2xYMA0GCSqGSIb3DQEBCwUAA4IBAQBrnyIwU+NLbiKagF0P -t+nMSR8hZpk+9P+uzf7+GnLqHjHJ3/gC6EHDol8D5nrrVB+y8Yna9EkXbC6uFcGU -pDrdZSp+uuye5UzKia0IAXM76AWzXobqukU8XGYkxMe6geO8niERfGpS8uP9ilHm -qpFoxy5Y1nMajPrQzBxLtEazeQFBmKGL75PSGCUlzALuolFUpcyRiSO5BvkOvfEJ -BNQ50L7GTpve1LLMlbub/tswh09VcFyBpipuHs3w87phYddFgbb91kH1QbFmpcnD -16E2yydyJzApzTgbCIHEe4C95Ccu+IIyla9sC9JX5PbnBNzbHUE86M1o1lHeSavj -K3uf +BAHWeQIEAgSB9QSB8gDwAHYA9lyUL9F3MCIUVBgIMJRWjuNNExkzv98MLyALzE7x +ZOMAAAF2HXdXmAAABAMARzBFAiAe9kuobPRAIZCunGtZ1NuDJ+F9Pz99rEYRuHwx +/wQhjgIhAJPQ+WTzHVuhWpMgU7AyvhllYwR4UvH+z8qalg4uxAjdAHYAb1N2rDHw +MRnYmQCkURX/dxUcEdkCwQApBo2yCJo32RMAAAF2HXdXvQAABAMARzBFAiEA08Kv +/Xg/rIqquc1gZVdkgxAdqclQZVGvY6H9aO0mSPMCIDDZkSzwFX6YVyQ4UGVHuRt/ +oqG06Rhkiz5sLCPAKbatMA0GCSqGSIb3DQEBCwUAA4IBAQA/weMEIsxTJT4L4gcV +3YIvzf1Bk0Ee4/ZNbACtnbLCnWesG4+7Jw97np0+dgE01dsD10XcXfJZ1VZ+LrG+ +lfanojLXunAIcJbHs9g2TFkKMQR3TO9h1jGS2utxu7FFXJPAn72RrIovpkDniB+u +4Ld/jVyb+9MCkdawaaAq50xG7OvCi58fl9RJD6BG7JzZ6xvNLcpKewHAt7fWTmXP +d/8s6k7PZewizXVPAm2tdNPnjD7u/uKqVscB2mqaBvQYsGCseSN+lezUknbHj/Se +hXtJosozbPXVychRU9nht7AKNk0TPoRWBDcRUkiHW67Sx1F80wEwhDoQAGq1G8ZQ +QTog -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ diff --git a/certs/privkey.pem b/certs/privkey.pem index e5c6a53..50fe6a9 100644 --- a/certs/privkey.pem +++ b/certs/privkey.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCfzlo1nMZaAK8B -C4oP354UwFwucpv1fgVA3UvMC98OWrI9LusiVMaZSAbK3dHh0jch5jQRSiQsP4YA -EGogWHmO6QAzsPHjJLeAKq8+odCbdBOmniRdA98Uwl0fsALI1nXD1xsroUtOCWbY -I0tXxJz8UaNZaS96oveIbVflXbFFlzvErakBaK0Mj6Ndt1XK761RAvX0ZJViikI/ -UgZY3wQikKnsZkS4603drzPiBtY3+Pck8yxzJtOuX4AxEC9yFDJb5uGTnijcKccq -zY14et43zVCtoiYllXbklQ+sdwreiAOyHQz23fRwbHAuPcgZ2IOQ1bqGh0cLX+xO -SNyLGcclAgMBAAECggEADcHsDjWC9fidGE/wANHVgB/XT8BaINZKiX0Dq3tSJqA0 -PAQwBfKablO/EfPqv7AjQu3YiayCVLTbSmIfYM19GYqBk/GlwVJF4ejK0W+Iz/k8 -P9nZc5CDwfvBnJrAgp3D4apBEo5+NyekDPNs5w9sHGTC1U2y4rHo8XvIV1yriDwL -+0Uj+NbrKaywB1NAM2ARNJfXXocgLQaxrR1aiSDoJ2DSyh34pmTz2wBxf1m2N3k/ -/fIKKgoLsmX7CPRQFobWXS92W40m4r3FStWvhFwEMmRatXpZmFYt5+XgtuC3hPPY -4dvpbOaT3oF9c3C/KMBlnAGMZKevAFwLsKSMPRuY+QKBgQDMgc/o1F2oNvSA8M+Y -97ADxyFtLMrVXt0vZUs4Vt2vegPdDqZPmkur8Q0YQZ7trLo9InSkMbWZc4aiSDQW -Rl6U8oSDD9h9HB1S45YGgHgg6wW32miWjBK1EYjfvJKdmj5nljXbPhJYOJY7WaY0 -J39OW1nvJJYNPN/Aga37GNv2mwKBgQDICy/SPFbLF37s4i8tgXj9FmbvfVim3sr9 -FLGbtipKZBTqIpfP5XhrBh6upcvAMrL/vZ146mfNOK8Ox8QvLzTk1EsRVT2er/Tb -tBHxDRXcriCSHgs7FQdrbche6QVw6WMG14iq1WF9rXmlOZXq0LN8VkgkCLvKdPnF -Z4BAYl41PwKBgF5pz8J9yH9QX7Dne+/y6Z/U3um4NCwtj4/CA+gOsmnAuufjS4SU -hzrqHlGEegrgI1r1/UOQb3ZYj198Vg+yjRfWnrajKh8YS7FowGpgBRWtawZmHsLi -CADwB3DDbiy0ePr5rgN5tJ5mAXWE/eY2Fd/m7K4rBds2r1YAiIHUCDjhAoGASWBJ -Fz2IvJAOv4crtO5j2bmo4jnBFdxs6q33g90q4ASb41HzC4/pPqCNCpTICuTN4Z7E -r0CT+KPNGofN/1y6cyEns+DnbFiwYRJI7nlVRpAcZFxe1DofcZlgQOgKVeNVroHK -oJcKXpYOI7vesLYC0B258nW9pEKKB42ybmtmkPMCgYEAjuLs4y9ejvdtPDpfOd0m -teXMlgKfUfRspvIaCbAb6y1T4pTtycd2LwSpQzyjpsvmXvLi53vuDWSFIOJ2IMBz -YfyiFOxZS5+xviBiF6TSngdL21ovwHNYaRXThRg1nbmkddBFTEwhGaMOYsb0cORU -7SJBsqHfZh0p2/r5oQaIbPk= +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCVv0R9tg5Ii7hp +BoYJvyTy/Fye0A1hI+PKjZoQQrHY2owjlNfcBVZuVXMJbIiXSHf8ElLilgY5uvNJ +lU/88FaKDu0ngCWklhjhNVijPCiieyFhB5MeLFN2t+Wn4u1SeH7WQFNMnzAkiVoe +Kr3GPXXg0HVSV6qqJaw+cVwCIIEeIbbxNNVAUOiTxbC2Jf//yMErGVK6+W1zJ53/ +SGyEjex1d4WUPWyTuBQeaq/+76KDEZ4HdNO6Ibzrhr2pal9/5qHpVHoBpGfjBT82 +adP7GYDyJecuM6njjykcg2Amda6V4h3PDf64gm8dthqyZ//WamPc+HkHNQFMNzX/ +weOcNIBxAgMBAAECggEAQb6AroSQjs8w/oNLs9nEuh2L+Hm1dhGQv+wdWMg/VsrU +vgZqIwIA6V4ArIGHEoxRiUzuMObXAt+OUp8ISC+ofuKAwlfjrvfrIm0OZlRSLsvK +YtQ1hgjF+BhS7ruVoCCg5yXErJ4zP8dB1n7DZNa0+yfqamVs21jA34VbdN+acISG +4r6Z1aJ/kFZlcuJXP+Mmog7aeKhd3X/JsafZN8wnyAZ1FrUxWKBBSiKzBTAGq/lC +X32hYT7Sni61VJTCiYGByytlL9BeXJR6h9n5tKt4S6gGLO8nxffwkfG4AI8n3HVg +jdixWrYe+xEQeai9yEb+zuSWMT+G7ubSwlh1hcBsRQKBgQDGIVPqAUF7D3K2Yxc0 +3a7qLwqzXHhLI126vCXowOZGJ5kkOn2Zs3uQ1VfjGg1UIEmK0sFL3g8sm2zhF3rb +To9JHL1b7u7+9SS50IjWFvi04e3gPN2PSIPI78dyC0ImohtKM/OJbdj7nQctXQRb +NbV1JJ/y8HjaaJpFN2rbRKlXQwKBgQDBfDj19N0BY+u37kolTfp/xae2ZAEdtEAV +8iEuZgRhW6FsoXw0TV1MxMWP55IQNkc45ZG9e/+Ylld893zf4FcmAf1jUYAWU+lx +q3x+GnZBXQIMkzWoiHzEHkzbiQb838qXCloki7JJ83B7Q759H7d58ehI0u6CNNsX +OduX9YzMOwKBgCGdX+5QvjpRuaWmFDbc8aM7zfX2V1ZwLqPS7h+aMrduWnYiElM0 +d19wQtP+BIrkW3XZIgBsMWjhCcz6vdZdcsP1w07Ir/XDw7Je5ghkp1eRCVnFGdYI +eItr2wvHSzbgw/6H5+bGI001LBWPNYEAEMRKLXT7RZXQr3PU3iVLdeufAoGAJOIW +RaSY4KP4kkZlcfkMcIDwOI+VuuDaepR+iMa/vQNnoTqjX6ED0ReNhaIiMN738ruo +bZOOpLq8EMFo15B/bGpisCUgIqF6VcXX5H4M3ubo9ha12tux1Pzlr8/OOjQ6/VHm +3yKWKQyz+3tte5KpOiDII+G5v65tuV65Ip2XanMCgYByKl/d5GjzTnvXkXW0UZv+ +TY6OudKIF24heYKGfBaKUgNfd1jgXWDuYKuwOs3BAk0piJ6ES1/ij78XgAU8I6yS +Ab6J6Cf/Jj4XfsPf/p0L5Od8IiRNeQ9dWIUKVAqG3G3xlw8ExwKPX7y0diXfwbNj +uTd7MFlzsH1aRRTyOgE7/A== -----END PRIVATE KEY----- From 66d45af0330a7bc0dcbd87f294287b74aa92300f Mon Sep 17 00:00:00 2001 From: WizaXxX Date: Mon, 11 Jan 2021 05:58:44 +0000 Subject: [PATCH 4/8] renew sert --- certs/fullchain.pem | 106 ++++++++++++++++++++++---------------------- certs/privkey.pem | 52 +++++++++++----------- 2 files changed, 78 insertions(+), 80 deletions(-) diff --git a/certs/fullchain.pem b/certs/fullchain.pem index 477f1ce..62b66bc 100644 --- a/certs/fullchain.pem +++ b/certs/fullchain.pem @@ -1,59 +1,57 @@ -----BEGIN CERTIFICATE----- -MIIFbzCCBFegAwIBAgISBJmz3Xf+Wa8hs6jlepJiHS14MA0GCSqGSIb3DQEBCwUA -MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD -ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDEyMDEwNzQyMDlaFw0y -MTAzMDEwNzQyMDlaMBYxFDASBgNVBAMTCzFjZnJlc2guZGV2MIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlb9EfbYOSIu4aQaGCb8k8vxcntANYSPjyo2a -EEKx2NqMI5TX3AVWblVzCWyIl0h3/BJS4pYGObrzSZVP/PBWig7tJ4AlpJYY4TVY -ozwoonshYQeTHixTdrflp+LtUnh+1kBTTJ8wJIlaHiq9xj114NB1UleqqiWsPnFc -AiCBHiG28TTVQFDok8WwtiX//8jBKxlSuvltcyed/0hshI3sdXeFlD1sk7gUHmqv -/u+igxGeB3TTuiG864a9qWpff+ah6VR6AaRn4wU/NmnT+xmA8iXnLjOp448pHINg -JnWuleIdzw3+uIJvHbYasmf/1mpj3Ph5BzUBTDc1/8HjnDSAcQIDAQABo4ICgTCC -An0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD -AjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBS9qxGdqVaNXjFP4c3Y3wmFd/FHzjAf -BgNVHSMEGDAWgBSoSmpjBH3duubRObemRWXv86jsoTBvBggrBgEFBQcBAQRjMGEw -LgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwLmludC14My5sZXRzZW5jcnlwdC5vcmcw -LwYIKwYBBQUHMAKGI2h0dHA6Ly9jZXJ0LmludC14My5sZXRzZW5jcnlwdC5vcmcv -MDcGA1UdEQQwMC6CDSouMWNmcmVzaC5kZXaCECouczMuMWNmcmVzaC5kZXaCCzFj -ZnJlc2guZGV2MEwGA1UdIARFMEMwCAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgw -JgYIKwYBBQUHAgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYB -BAHWeQIEAgSB9QSB8gDwAHYA9lyUL9F3MCIUVBgIMJRWjuNNExkzv98MLyALzE7x -ZOMAAAF2HXdXmAAABAMARzBFAiAe9kuobPRAIZCunGtZ1NuDJ+F9Pz99rEYRuHwx -/wQhjgIhAJPQ+WTzHVuhWpMgU7AyvhllYwR4UvH+z8qalg4uxAjdAHYAb1N2rDHw -MRnYmQCkURX/dxUcEdkCwQApBo2yCJo32RMAAAF2HXdXvQAABAMARzBFAiEA08Kv -/Xg/rIqquc1gZVdkgxAdqclQZVGvY6H9aO0mSPMCIDDZkSzwFX6YVyQ4UGVHuRt/ -oqG06Rhkiz5sLCPAKbatMA0GCSqGSIb3DQEBCwUAA4IBAQA/weMEIsxTJT4L4gcV -3YIvzf1Bk0Ee4/ZNbACtnbLCnWesG4+7Jw97np0+dgE01dsD10XcXfJZ1VZ+LrG+ -lfanojLXunAIcJbHs9g2TFkKMQR3TO9h1jGS2utxu7FFXJPAn72RrIovpkDniB+u -4Ld/jVyb+9MCkdawaaAq50xG7OvCi58fl9RJD6BG7JzZ6xvNLcpKewHAt7fWTmXP -d/8s6k7PZewizXVPAm2tdNPnjD7u/uKqVscB2mqaBvQYsGCseSN+lezUknbHj/Se -hXtJosozbPXVychRU9nht7AKNk0TPoRWBDcRUkiHW67Sx1F80wEwhDoQAGq1G8ZQ -QTog +MIIFPTCCBCWgAwIBAgISA64rtij8zSKvlaf7WENk1wsxMA0GCSqGSIb3DQEBCwUA +MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD +EwJSMzAeFw0yMTAxMTEwNDU4MzhaFw0yMTA0MTEwNDU4MzhaMBYxFDASBgNVBAMT +CzFjZnJlc2guZGV2MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwsX0 +S6CzaoL2dEMKA9sieVc1KuBqrRetnjn54RLtX4wR03dyxezZEbe3Yf2gNfFxtmj7 +kYooAmhB9HQBoZ4ExOZtCL9tojULP2ILniKWvWt0BlPqcGYkiJ9WeMnnMTdqn8rg +Zqxs/A+HL2rKryVGg+nDNf9Qlc1bNYjwqBO26FQVK+QRDaBwjMsBNiDA2V6RTvGA +YmWRMiZdgxdBJB71En4QZJK5A9KSsrrX7LNo8tmcpovs7ZIPqx+khOLJy2qQ0Lud +Hdq48UkgTs4Xs9CsmSRlktft4jHCvSJzArXgkdUKn/asOPJq5n3Zetg08PAehGO1 +NYsWm8KIY5fpZ23GQQIDAQABo4ICZzCCAmMwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud +JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQW +BBTI8JW9en7MDkRNHDrwiCGrJXcM3jAfBgNVHSMEGDAWgBQULrMXt1hWy65QCUDm +H6+dixTCxjBVBggrBgEFBQcBAQRJMEcwIQYIKwYBBQUHMAGGFWh0dHA6Ly9yMy5v +LmxlbmNyLm9yZzAiBggrBgEFBQcwAoYWaHR0cDovL3IzLmkubGVuY3Iub3JnLzA3 +BgNVHREEMDAugg0qLjFjZnJlc2guZGV2ghAqLnMzLjFjZnJlc2guZGV2ggsxY2Zy +ZXNoLmRldjBMBgNVHSAERTBDMAgGBmeBDAECATA3BgsrBgEEAYLfEwEBATAoMCYG +CCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCCAQQGCisGAQQB +1nkCBAIEgfUEgfIA8AB3AG9Tdqwx8DEZ2JkApFEV/3cVHBHZAsEAKQaNsgiaN9kT +AAABdvAGYt0AAAQDAEgwRgIhAOcvhrdnAQlqS3Hjtab6mXthsMfpyhbuAiPfM4TL +jhayAiEA9BHKtOn0eL6h6DJ7xI4TC9tkdq6mCroSZKAVLH3YoosAdQD2XJQv0Xcw +IhRUGAgwlFaO400TGTO/3wwvIAvMTvFk4wAAAXbwBmKlAAAEAwBGMEQCIGjOit28 +c8y3EsXXPHIwGIIKddgg62q6gQOTXQHSpiXLAiB9MHqSPxIEs7wfgr489MiWngAN +3/1pe9ChY7TDdwKHJDANBgkqhkiG9w0BAQsFAAOCAQEAVwjm/13YU0ilr53AhOF4 +2oGneAIvV4HLb1WRIQ+00U0xWYGvAyNrg9d9bXKrT4Hcw0wQNlLVBPmv13XTcUi4 +SgSyA1kveuEPtLj9b7s7s2KlPIrVdQ4ZmqwnvpfC9cbEyMxPYbj3hM9HAAXmt+HM +raru/nB59KLDqYv6VRO9FJ1X7/S/TLnTpdMziEcwSjMPTomxyaiT9zWdCVBYyoIE +U1oZNh0wbnWrgbPxu8+MRaqaorO+mdP7J87EvE9ptZrdb70Y4eh5/iXZ5kQ5yXdH +CllwGGhOsYbBvw9HQgcKT55hFzFzWmukpiCIEiL+A5Az1y7RhkP6R2EAycEjaWTG +aA== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/ +MIIEZTCCA02gAwIBAgIQQAF1BIMUpMghjISpDBbN3zANBgkqhkiG9w0BAQsFADA/ 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== +DkRTVCBSb290IENBIFgzMB4XDTIwMTAwNzE5MjE0MFoXDTIxMDkyOTE5MjE0MFow +MjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxCzAJBgNVBAMT +AlIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwIVKMz2oJTTDxLs +jVWSw/iC8ZmmekKIp10mqrUrucVMsa+Oa/l1yKPXD0eUFFU1V4yeqKI5GfWCPEKp +Tm71O8Mu243AsFzzWTjn7c9p8FoLG77AlCQlh/o3cbMT5xys4Zvv2+Q7RVJFlqnB +U840yFLuta7tj95gcOKlVKu2bQ6XpUA0ayvTvGbrZjR8+muLj1cpmfgwF126cm/7 +gcWt0oZYPRfH5wm78Sv3htzB2nFd1EbjzK0lwYi8YGd1ZrPxGPeiXOZT/zqItkel +/xMY6pgJdz+dU/nPAeX1pnAXFK9jpP+Zs5Od3FOnBv5IhR2haa4ldbsTzFID9e1R +oYvbFQIDAQABo4IBaDCCAWQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8E +BAMCAYYwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5p +ZGVudHJ1c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTE +p7Gkeyxx+tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEE +AYLfEwEBATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2Vu +Y3J5cHQub3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0 +LmNvbS9EU1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYf +r52LFMLGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B +AQsFAAOCAQEA2UzgyfWEiDcx27sT4rP8i2tiEmxYt0l+PAK3qB8oYevO4C5z70kH +ejWEHx2taPDY/laBL21/WKZuNTYQHHPD5b1tXgHXbnL7KqC401dk5VvCadTQsvd8 +S8MXjohyc9z9/G2948kLjmE6Flh9dDYrVYA9x2O+hEPGOaEOa1eePynBgPayvUfL +qjBstzLhWVQLGAkXXmNs+5ZnPBxzDJOLxhF2JIbeQAcH5H0tZrUlo5ZYyOqA7s9p +O5b85o3AM/OJ+CktFBQtfvBhcJVd9wvlwPsk+uyOy2HI7mNxKKgsBTt375teA2Tw +UdHkhVNcsAKX1H7GNNLOEADksd86wuoXvg== -----END CERTIFICATE----- diff --git a/certs/privkey.pem b/certs/privkey.pem index 50fe6a9..37328ba 100644 --- a/certs/privkey.pem +++ b/certs/privkey.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCVv0R9tg5Ii7hp -BoYJvyTy/Fye0A1hI+PKjZoQQrHY2owjlNfcBVZuVXMJbIiXSHf8ElLilgY5uvNJ -lU/88FaKDu0ngCWklhjhNVijPCiieyFhB5MeLFN2t+Wn4u1SeH7WQFNMnzAkiVoe -Kr3GPXXg0HVSV6qqJaw+cVwCIIEeIbbxNNVAUOiTxbC2Jf//yMErGVK6+W1zJ53/ -SGyEjex1d4WUPWyTuBQeaq/+76KDEZ4HdNO6Ibzrhr2pal9/5qHpVHoBpGfjBT82 -adP7GYDyJecuM6njjykcg2Amda6V4h3PDf64gm8dthqyZ//WamPc+HkHNQFMNzX/ -weOcNIBxAgMBAAECggEAQb6AroSQjs8w/oNLs9nEuh2L+Hm1dhGQv+wdWMg/VsrU -vgZqIwIA6V4ArIGHEoxRiUzuMObXAt+OUp8ISC+ofuKAwlfjrvfrIm0OZlRSLsvK -YtQ1hgjF+BhS7ruVoCCg5yXErJ4zP8dB1n7DZNa0+yfqamVs21jA34VbdN+acISG -4r6Z1aJ/kFZlcuJXP+Mmog7aeKhd3X/JsafZN8wnyAZ1FrUxWKBBSiKzBTAGq/lC -X32hYT7Sni61VJTCiYGByytlL9BeXJR6h9n5tKt4S6gGLO8nxffwkfG4AI8n3HVg -jdixWrYe+xEQeai9yEb+zuSWMT+G7ubSwlh1hcBsRQKBgQDGIVPqAUF7D3K2Yxc0 -3a7qLwqzXHhLI126vCXowOZGJ5kkOn2Zs3uQ1VfjGg1UIEmK0sFL3g8sm2zhF3rb -To9JHL1b7u7+9SS50IjWFvi04e3gPN2PSIPI78dyC0ImohtKM/OJbdj7nQctXQRb -NbV1JJ/y8HjaaJpFN2rbRKlXQwKBgQDBfDj19N0BY+u37kolTfp/xae2ZAEdtEAV -8iEuZgRhW6FsoXw0TV1MxMWP55IQNkc45ZG9e/+Ylld893zf4FcmAf1jUYAWU+lx -q3x+GnZBXQIMkzWoiHzEHkzbiQb838qXCloki7JJ83B7Q759H7d58ehI0u6CNNsX -OduX9YzMOwKBgCGdX+5QvjpRuaWmFDbc8aM7zfX2V1ZwLqPS7h+aMrduWnYiElM0 -d19wQtP+BIrkW3XZIgBsMWjhCcz6vdZdcsP1w07Ir/XDw7Je5ghkp1eRCVnFGdYI -eItr2wvHSzbgw/6H5+bGI001LBWPNYEAEMRKLXT7RZXQr3PU3iVLdeufAoGAJOIW -RaSY4KP4kkZlcfkMcIDwOI+VuuDaepR+iMa/vQNnoTqjX6ED0ReNhaIiMN738ruo -bZOOpLq8EMFo15B/bGpisCUgIqF6VcXX5H4M3ubo9ha12tux1Pzlr8/OOjQ6/VHm -3yKWKQyz+3tte5KpOiDII+G5v65tuV65Ip2XanMCgYByKl/d5GjzTnvXkXW0UZv+ -TY6OudKIF24heYKGfBaKUgNfd1jgXWDuYKuwOs3BAk0piJ6ES1/ij78XgAU8I6yS -Ab6J6Cf/Jj4XfsPf/p0L5Od8IiRNeQ9dWIUKVAqG3G3xlw8ExwKPX7y0diXfwbNj -uTd7MFlzsH1aRRTyOgE7/A== +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDCxfRLoLNqgvZ0 +QwoD2yJ5VzUq4GqtF62eOfnhEu1fjBHTd3LF7NkRt7dh/aA18XG2aPuRiigCaEH0 +dAGhngTE5m0Iv22iNQs/YgueIpa9a3QGU+pwZiSIn1Z4yecxN2qfyuBmrGz8D4cv +asqvJUaD6cM1/1CVzVs1iPCoE7boVBUr5BENoHCMywE2IMDZXpFO8YBiZZEyJl2D +F0EkHvUSfhBkkrkD0pKyutfss2jy2Zymi+ztkg+rH6SE4snLapDQu50d2rjxSSBO +zhez0KyZJGWS1+3iMcK9InMCteCR1Qqf9qw48mrmfdl62DTw8B6EY7U1ixabwohj +l+lnbcZBAgMBAAECggEANGF6TrB8L+PilefFlL3lKo7afJp39e8NQSVEX1RwxCZu +UNmp4zLMOeiXh+HmqTsyoqTfKwfltKgHPM/J9IYDsFRr9FNPD7WGPdiHWVLiCTUR +sfX1cZ72qkt3vOpHo8PMiAbOjK5IbQ1cBNOKiMnUiftfBXGRYYglxGL8nacXpKkn +6PLUYeUi159mpRM3xlFWV867KJiWoCMxq0vtg+Gj57sIcdoL3vs9qT7i5B02LC4n +xxuEs3DUVpl29GpjeX6iDbc7Tf7m29J8PdS1zU3LHq7Diu9XpXATtYhefXQP4WKJ +hyq6/ZFny4ws2LOw7WcYAPMLQ3IemDtUkBAbudz5wQKBgQDtPe/DR+WNoJEPEOsF +qQYE/Vxzbj/EHWgG9/6b2biTSqkoC9DezYlpbIH1+julR0IqLBNC+5xxvZBi9Rh+ +Dy5Zk6kUMJgQSTDKEklXjKgcrU2IujgzbkqENSYYDzEP7Mth6S9QQQ2PG4WwdAnG +eNVOFsFLqP1LVnsTTrCjy0yNOQKBgQDSLGZ6hwEabPTRgEwLI+WAfk2WxmXsyu5U +tMJirrwynPSN/U1EAq1uZ8f28zUEw8y5jx8QILx3BjYJXevoao+B9rXDuFB9ElbS +XGa39fRH/MbliVHwgLfctlGdm7VO/VezwdQQ8XuXhuCf06+K6EtOgMq+oNqhN1Yd +qmIVFTaJSQKBgQDHQQTVy9XVzKzorXnnCB4BJNZ4MHmn+la7u6ABP6xRMRy/gKUN +7Czj+XlxoZhk6WN9zgTjdjXgJalWI6pNfeyc2XLhfSrKSt6KaS9mM8GiTD/ZfSXk +tFYrkgQLov6+9E+hTVsqmWiM8D2phNwM8MGeU2hHZohOtTSrc6TR/NavqQKBgFtF +1vdNG+iK+sLksaGA5FEqCK362Ra9hkUY/vX2JlrgmL/1ChIIC6NPxKJ1OkgodAb9 +paLOZKpX8y2cMTAM3ue06Xjm2WWHilbus9keIgkFOKdEPGZyr+ZU8xq8HUABe43g +FiWJiX/jnjcqqihr+xBLlEC3AFtU+bwGW3QGc1mpAoGBAIXJZrBGbSGm5N9eN8HH +dUF5Pv0OkOzPB5Qn2LtdD+7ULkTd5RcRX2pFUk/6VTGq6qD+2yNwVkQ+CaMUGurT +SBRMsWrCEv5bxiz709bNu17Japnabsgq8alr83HdAO3mntammrWCtVsLvwlhwVYW +UMV+5yk9vHSPIEPafF4od8uU -----END PRIVATE KEY----- From 82dcc321c8857b9031879eca9731f7be73c0835f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=AE=D1=80=D0=B8=D0=B9?= Date: Thu, 14 Jan 2021 19:39:28 +0300 Subject: [PATCH 5/8] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B2=20Readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ebd140b..9c62016 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # [1С:Предприятие. Облачная подсистема Фреш](https://v8.1c.ru/tekhnologii/1cfresh/o-tekhnologii/ "1С:Предприятие. Облачная подсистема Фреш") в Docker Позволяет в течении ~30 минут развернуть рабочий стенд облачной подсистемы Фреш с использованием технологии docker. -Может пригодится для: -- Разработки конфигурации которая должно работать в облаке +Может пригодиться для: +- Разработки конфигурации которая должна работать в облаке - Разработки самой технологии Фреш - Тестирования средств адаптации конфигураций -- Так же Фреш можно использовать для централизированной поддержки информационных баз, планирование обновлений, обновления, завершение работы пользователей. +- Так же Фреш можно использовать для централизированной поддержки информационных баз, планирования обновлений, обновления, завершения работы пользователей. - и т.д. @@ -12,9 +12,9 @@ [![Click to go to video](https://i.ibb.co/JcZXS3Q/1.png)](http://www.youtube.com/watch?v=0GESUCIFXwI) ## Системные требования -- Оперативной памяти от 4Гб +- Оперативная память от 4Гб - лучше от 8Гб -- Свободного места от 50Гб +- Свободное место от 50Гб - Необходимое ПО: - [Python 3+](https://www.python.org/downloads/ "Python 3+") - [Docker. Инструкция по установке](https://docs.docker.com/engine/install/ "Docker. Инструкция по установке") @@ -86,7 +86,7 @@ cd docker_fresh - **centos** - является базовым образом для образов **core** и **db** - **core** - платформа 1С, клиентская и серверная часть. Дополнительно содержит **ring, onescript** - **db** - сервер баз дынных Postgres -- **site** - компонент сайта Фреша +- **site** - компонент сайт Фреша - **forum** - компонент форум Фреша - **gate** - компонент шлюз приложений Фреша From 6c09de32156f5a96046596214c9556e8ae9f6945 Mon Sep 17 00:00:00 2001 From: WizaXxX Date: Mon, 1 Feb 2021 08:20:27 +0000 Subject: [PATCH 6/8] renew sert --- certs/fullchain.pem | 46 +++++++++++++++++++-------------------- certs/privkey.pem | 52 ++++++++++++++++++++++----------------------- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/certs/fullchain.pem b/certs/fullchain.pem index 62b66bc..76c0a19 100644 --- a/certs/fullchain.pem +++ b/certs/fullchain.pem @@ -1,33 +1,33 @@ -----BEGIN CERTIFICATE----- -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 -aA== +CCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCCAQUGCisGAQQB +1nkCBAIEgfYEgfMA8QB3AESUZS6w7s6vxEAH2Kj+KMDa5oK+2MsxtT/TM5a1toGo +AAABd1ytnC4AAAQDAEgwRgIhAJ9evctqwxO2YlgL6GuhEFb88rwJFmtT8z0tDbhy +HE6tAiEAj3s5LU3wuTTCJ8CfZnPOSV2lyL3Z2VrQHucB+T5YWzoAdgB9PvL4j/+I +VWgkwsDKnlKJeSvFDngJfy5ql2iZfiLw1wAAAXdcrZxGAAAEAwBHMEUCIDEkzQTZ +HiU3my6rOX59BxFoE9YnOsbpQO4oQ4eePf6aAiEAr0+LPRkt7uV0V1cmM2Mia9l0 +a3lCvnCXZFPiRba0Vc8wDQYJKoZIhvcNAQELBQADggEBAIaFRThVFxFl0VIMDtL3 +ChiqJ2I85oSFuUvZxk1Sh9bQsfPXPi/yEwAX2p15FTAl9JYJisw5ukIkKQVwDK/w +wgc1fMjzRlLA5dVCqLux9Jfl+mPCa/VWm3rK9sjk2dPjWGWOTBI3cW0YtblqNyka +RC9Swq5ip2iJQ/De30mUREgxdXr0NT+TgUgkMMrLSugjaC0z7WhtCFZU1PpBeaoG +uE8LHnWVvzrtnYFhArQUFiqc3l7VUqHh/6MRxo2QOf9aqa9O4HHkMJAs+tL/csln +FAVYsFxBRWZcvONfrvh4HNGrLrFXQEJKbRaEXoHLFbwD50W3gs5e30ObKErBjZST +zdo= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEZTCCA02gAwIBAgIQQAF1BIMUpMghjISpDBbN3zANBgkqhkiG9w0BAQsFADA/ diff --git a/certs/privkey.pem b/certs/privkey.pem index 37328ba..77bce77 100644 --- a/certs/privkey.pem +++ b/certs/privkey.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDCxfRLoLNqgvZ0 -QwoD2yJ5VzUq4GqtF62eOfnhEu1fjBHTd3LF7NkRt7dh/aA18XG2aPuRiigCaEH0 -dAGhngTE5m0Iv22iNQs/YgueIpa9a3QGU+pwZiSIn1Z4yecxN2qfyuBmrGz8D4cv -asqvJUaD6cM1/1CVzVs1iPCoE7boVBUr5BENoHCMywE2IMDZXpFO8YBiZZEyJl2D -F0EkHvUSfhBkkrkD0pKyutfss2jy2Zymi+ztkg+rH6SE4snLapDQu50d2rjxSSBO -zhez0KyZJGWS1+3iMcK9InMCteCR1Qqf9qw48mrmfdl62DTw8B6EY7U1ixabwohj -l+lnbcZBAgMBAAECggEANGF6TrB8L+PilefFlL3lKo7afJp39e8NQSVEX1RwxCZu -UNmp4zLMOeiXh+HmqTsyoqTfKwfltKgHPM/J9IYDsFRr9FNPD7WGPdiHWVLiCTUR -sfX1cZ72qkt3vOpHo8PMiAbOjK5IbQ1cBNOKiMnUiftfBXGRYYglxGL8nacXpKkn -6PLUYeUi159mpRM3xlFWV867KJiWoCMxq0vtg+Gj57sIcdoL3vs9qT7i5B02LC4n -xxuEs3DUVpl29GpjeX6iDbc7Tf7m29J8PdS1zU3LHq7Diu9XpXATtYhefXQP4WKJ -hyq6/ZFny4ws2LOw7WcYAPMLQ3IemDtUkBAbudz5wQKBgQDtPe/DR+WNoJEPEOsF -qQYE/Vxzbj/EHWgG9/6b2biTSqkoC9DezYlpbIH1+julR0IqLBNC+5xxvZBi9Rh+ -Dy5Zk6kUMJgQSTDKEklXjKgcrU2IujgzbkqENSYYDzEP7Mth6S9QQQ2PG4WwdAnG -eNVOFsFLqP1LVnsTTrCjy0yNOQKBgQDSLGZ6hwEabPTRgEwLI+WAfk2WxmXsyu5U -tMJirrwynPSN/U1EAq1uZ8f28zUEw8y5jx8QILx3BjYJXevoao+B9rXDuFB9ElbS -XGa39fRH/MbliVHwgLfctlGdm7VO/VezwdQQ8XuXhuCf06+K6EtOgMq+oNqhN1Yd -qmIVFTaJSQKBgQDHQQTVy9XVzKzorXnnCB4BJNZ4MHmn+la7u6ABP6xRMRy/gKUN -7Czj+XlxoZhk6WN9zgTjdjXgJalWI6pNfeyc2XLhfSrKSt6KaS9mM8GiTD/ZfSXk -tFYrkgQLov6+9E+hTVsqmWiM8D2phNwM8MGeU2hHZohOtTSrc6TR/NavqQKBgFtF -1vdNG+iK+sLksaGA5FEqCK362Ra9hkUY/vX2JlrgmL/1ChIIC6NPxKJ1OkgodAb9 -paLOZKpX8y2cMTAM3ue06Xjm2WWHilbus9keIgkFOKdEPGZyr+ZU8xq8HUABe43g -FiWJiX/jnjcqqihr+xBLlEC3AFtU+bwGW3QGc1mpAoGBAIXJZrBGbSGm5N9eN8HH -dUF5Pv0OkOzPB5Qn2LtdD+7ULkTd5RcRX2pFUk/6VTGq6qD+2yNwVkQ+CaMUGurT -SBRMsWrCEv5bxiz709bNu17Japnabsgq8alr83HdAO3mntammrWCtVsLvwlhwVYW -UMV+5yk9vHSPIEPafF4od8uU +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCrOccBed/QEQ5A +cRXW3Qv5SzskWVGZpt75dWOd7gpRMxFhoMnQj6XO0SqW4zKcv8LvJD9m8vun/2LK +dQye9W0UqzAjZ2ZKXShMRn8BLVH3L3wHUIJvywut/lHTgKDQuNZ38xC38ZDWi4gk +ObYSWt7evEhf9RrCkozApV4jAyQsOpQVcsfzS8wjsOxtfQZn2UnwuRSkRSDjGFb2 +SSsBVyt66+U/jTPm+NH2tbvZJRoBKXho84/MiahRWg7N/K4mi8BYSK09A9jBgyym +EICZZgsZqD8VUlA1xB5c1PbNV+fzMBpSQ183vxmqKiOpupx/d4KW3XLhzqHG2isE +HaViDtrHAgMBAAECggEAIU5f032td3+Z0hctNFpTFe74Vh25rbWz8bpP4kyHXTwd +yWvJVfRbQFuXeTpAghUbCgF3A8OICCm5QcB68AC1cyvJdVmLoDN2vz+HPOdf5kEq +UxHqDWzlnLa3m/iNT4xky3hQbDdlARarKMDBFdjvOUxOl7vJtMdk8aQ5J35Y7vE0 +oWAfPi+2zovp3Zc4hj9m0jr1md6rUj+IMdrSvpZ6kEzn63XOa/WnFjzRIdWZiLWC +PVltItTDP+XZCPNBRPjUHOZf813vPOR/1MMcYJ/DRxDEudVVfMSGBpvZ+uDKFvW/ ++Y+fiiatdTZFmeQjdlka3DH9T0aG67Tpd6TRV+KNwQKBgQDR4/E61tvQ+0fLanml +30BIAjnoKd4PrijpzHDwZZ5zfPQtFmyg+7er2Kxh0nP+wBwwoJS7Bh/zeNa2OT9H +FhwiaLAadXeUshFIDVsEWsQ+vSoB48RT5BVS25qlBGBhfksbsaBsNsQhNbX5S6SA +zp201caAdFND/5cUqvzkNofG3wKBgQDQ111kVtsJP/jTEKWYAnRG5i/5sfuloaPK +UGvGv9gF2lA8DJOky9hsKgHQSyfC2UobyWvf2tulz7xHVcIY5vILi/D+3R4qntUp +aS1PL9li1gajJ9/Ffot5wAFbNW6hNddw3Ygtr85ls29eqBy/gbAXEOq8vojRKZW4 +Mc1vtHxxGQKBgQCxCoRADVv9OvekLXvO3jFqi/YsTqRwtYbtLvVU0WKGJ7APGAso +/yo+WdWN7ebJy2H74neSCeiJhjQWINOvMocovwVMTClB07GgBSPw2F8QTJ9SWL0R +xiH2ciZPaxGhKtZP1dRrcwacvKFyVsu7moyMLIXzdCuH/9+AH3qRRS3iIQKBgQC1 +zlcaS9ahRdS7Aen23GQXeLrZOA2n0oDBVqOMwWQxLC3fKN+7fk4pU6SCjXrO0NUI +PaAwn9nJjoAM5eZ0QVEDpk8lwJ9LYTyWsV5lanVn6oSastLGnnSTiAhmO6zUoQet +1N2BUGRw+vWARP/J4//FBNAlggWfeQFC+fArR8dxuQKBgDfBbAOa+KN8gI/4qxmM +9AjUaGYhw0Orxz4CQDnIPHtcm2plArgr/JWcI7uWVq3t1/IHoItXMtlhj4BvP7sS +BkNTBbSKJMg4MNES+mp9gdHTiXukAQyXFFWf+7tGO/XAIksMrxvY8hNfj7IWx1hV +PeU3KdySNgkdy8kefED2LslN -----END PRIVATE KEY----- From 78502720fa17d07e488455337dae68cdca60bd7d Mon Sep 17 00:00:00 2001 From: WizaXxX Date: Mon, 1 Mar 2021 09:38:17 +0000 Subject: [PATCH 7/8] renew sert --- certs/fullchain.pem | 45 +++++++++++++++++++-------------------- certs/privkey.pem | 52 ++++++++++++++++++++++----------------------- 2 files changed, 48 insertions(+), 49 deletions(-) diff --git a/certs/fullchain.pem b/certs/fullchain.pem index 76c0a19..5b3d753 100644 --- a/certs/fullchain.pem +++ b/certs/fullchain.pem @@ -1,33 +1,32 @@ -----BEGIN CERTIFICATE----- -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 -zdo= +CCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCCAQIGCisGAQQB +1nkCBAIEgfMEgfAA7gB1AFzcQ5L+5qtFRLFemtRW5hA3+9X6R9yhc5SyXub2xw7K +AAABd+0m+F4AAAQDAEYwRAIgYWjjl1bwcKsrYW/AzDAJ2f2gF5Ix6gP8J6oSnbPJ +HW8CIFlknQHwOxXOTfFg3RmPkt2Q0bnJYn8MQaJfc3/CjDgfAHUA9lyUL9F3MCIU +VBgIMJRWjuNNExkzv98MLyALzE7xZOMAAAF37Sb6TwAABAMARjBEAiB/ckUfSaML +Zo5PSsyJK1sjpDhQCI/yE0PPEVHBdwey1wIgHvDw6b4CkoXHFIDz2dVtXz+umZ7u +YYMTZftV36LjJuAwDQYJKoZIhvcNAQELBQADggEBAD1GeQv8mNb5/CefAgjSD2wH +wCGWHOQfROt5bpFmBRmdwEaGwS3q21jNisjKoDT1mby6k/XMfenMOZjvfZPx2f3y +Khx5qdniWDX0fvaln4r5AsEzDg2UFZGbreqdgKltVPZZP6qnXD5ikBoOLr8TO6OC +zGoiRUyi+uNmUtcm3+K9lLvVGAHlSK2ROf8L4wpbFQz9G4E0gvkC53fM7+6/k3xZ +oDpjJ2ftGfT9Rm9pcgADUquc8tVeil/VZkQr3dYH6H9MeRy++F/NcDqj1uVEoQxz +rRRCQxUBFg1qjwBeum+pAjkUhBHndhGN/RVdNh6HjsmXbTwEkbCy4VWylFRsIdY= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEZTCCA02gAwIBAgIQQAF1BIMUpMghjISpDBbN3zANBgkqhkiG9w0BAQsFADA/ diff --git a/certs/privkey.pem b/certs/privkey.pem index 77bce77..9baf0a7 100644 --- a/certs/privkey.pem +++ b/certs/privkey.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCrOccBed/QEQ5A -cRXW3Qv5SzskWVGZpt75dWOd7gpRMxFhoMnQj6XO0SqW4zKcv8LvJD9m8vun/2LK -dQye9W0UqzAjZ2ZKXShMRn8BLVH3L3wHUIJvywut/lHTgKDQuNZ38xC38ZDWi4gk -ObYSWt7evEhf9RrCkozApV4jAyQsOpQVcsfzS8wjsOxtfQZn2UnwuRSkRSDjGFb2 -SSsBVyt66+U/jTPm+NH2tbvZJRoBKXho84/MiahRWg7N/K4mi8BYSK09A9jBgyym -EICZZgsZqD8VUlA1xB5c1PbNV+fzMBpSQ183vxmqKiOpupx/d4KW3XLhzqHG2isE -HaViDtrHAgMBAAECggEAIU5f032td3+Z0hctNFpTFe74Vh25rbWz8bpP4kyHXTwd -yWvJVfRbQFuXeTpAghUbCgF3A8OICCm5QcB68AC1cyvJdVmLoDN2vz+HPOdf5kEq -UxHqDWzlnLa3m/iNT4xky3hQbDdlARarKMDBFdjvOUxOl7vJtMdk8aQ5J35Y7vE0 -oWAfPi+2zovp3Zc4hj9m0jr1md6rUj+IMdrSvpZ6kEzn63XOa/WnFjzRIdWZiLWC -PVltItTDP+XZCPNBRPjUHOZf813vPOR/1MMcYJ/DRxDEudVVfMSGBpvZ+uDKFvW/ -+Y+fiiatdTZFmeQjdlka3DH9T0aG67Tpd6TRV+KNwQKBgQDR4/E61tvQ+0fLanml -30BIAjnoKd4PrijpzHDwZZ5zfPQtFmyg+7er2Kxh0nP+wBwwoJS7Bh/zeNa2OT9H -FhwiaLAadXeUshFIDVsEWsQ+vSoB48RT5BVS25qlBGBhfksbsaBsNsQhNbX5S6SA -zp201caAdFND/5cUqvzkNofG3wKBgQDQ111kVtsJP/jTEKWYAnRG5i/5sfuloaPK -UGvGv9gF2lA8DJOky9hsKgHQSyfC2UobyWvf2tulz7xHVcIY5vILi/D+3R4qntUp -aS1PL9li1gajJ9/Ffot5wAFbNW6hNddw3Ygtr85ls29eqBy/gbAXEOq8vojRKZW4 -Mc1vtHxxGQKBgQCxCoRADVv9OvekLXvO3jFqi/YsTqRwtYbtLvVU0WKGJ7APGAso -/yo+WdWN7ebJy2H74neSCeiJhjQWINOvMocovwVMTClB07GgBSPw2F8QTJ9SWL0R -xiH2ciZPaxGhKtZP1dRrcwacvKFyVsu7moyMLIXzdCuH/9+AH3qRRS3iIQKBgQC1 -zlcaS9ahRdS7Aen23GQXeLrZOA2n0oDBVqOMwWQxLC3fKN+7fk4pU6SCjXrO0NUI -PaAwn9nJjoAM5eZ0QVEDpk8lwJ9LYTyWsV5lanVn6oSastLGnnSTiAhmO6zUoQet -1N2BUGRw+vWARP/J4//FBNAlggWfeQFC+fArR8dxuQKBgDfBbAOa+KN8gI/4qxmM -9AjUaGYhw0Orxz4CQDnIPHtcm2plArgr/JWcI7uWVq3t1/IHoItXMtlhj4BvP7sS -BkNTBbSKJMg4MNES+mp9gdHTiXukAQyXFFWf+7tGO/XAIksMrxvY8hNfj7IWx1hV -PeU3KdySNgkdy8kefED2LslN +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDKdS4jAEZ4caJf +2QejJalc02a/hr3CWKLfAGsOsQJdvJyfUkxJ/AtFqWlMoVomNI8MQ5pFYew3vUyv +Oaf72QBwYFpCydIgeZQ9Fmzva0FSMBCPfBU55QHSdGDQME47OwQ22L4D3hkCqR2P +568rVZINDaxQ+xvh47kYOf8Z6JCq0loelnopV4HE+Y3XGMaKKZz/fnnfqPDFu/F3 +LFHoH2huKobMqhPbIJJH+xfk8fJ46HrPccnAAoVyj4qWPGKSkgLDx4V2G4h2kjtN +PteisSKRrRY/jhVQTl8jOq6CJz9zmQFRIfj+CxqFylJ0G9DyvZU+hVruNBelt3E9 +8A3Hf6+xAgMBAAECggEAEaLlkvz6JpHXkDvqs2abe0+bGsIVE7H+9igmK1B2IU5F +4ocbyDIhlT7twlQn8z4O3AWjkbm3ByABZx5BqOm9ZQyvsDO+jz+oDy497RlNxmgT +eTxY6QMvBnNG37vlhLleY5y76MBXM2kh/yAynTbGE0cGpMNLKYFZ5Wdf9pTQzWB/ +6wZgrHlxcVvPeVspEhW9+VUsT987xuNReLy5I7jsxOtduYvo6V7nE7Fwc6jGCGO9 +Mga98KDpdw15QnA4XwJVd6wWarizgz0kYFNcpc/szxmS9ezzCIV6lflwVd9dbWPe +U/wUb6+JGDpEIbKMa1Gs/IolPlOBUsTn2WYxCGIFZQKBgQDwBs00SgPXG174nkhq +WG0OEi6ZtXt+i0VXstnrT7dHzkx85ZJHJ71iXC8lC/mPynFpDHCxbObkF//djdUX +3m2/MRC2Fti2LWm2Q1ibKaqEtZAG5rN1jcYohS42Tw5KQ2st9yEHdwm04hYPMJmX +hWLiQRvGow1bMNUYiuO9UVZccwKBgQDX7lblVdZtmOlVAF/333X5pXgowtaaoAZk +Ik0GeuXuOsngP7dTNmwuJUKjNGRVLUl79PXi22NIY80ju28aTzd6xc75wYDfHPXG +wVuK8AJrJJrh5nepJ85XMmIaVRnL2veJAtBFhqXiqwq+8CmoPISFx6+4mBDTC1yl +dFAj3QZ+SwKBgFkj/YOk1UZG2P92MSiljGLEZ+AX4TQ+3tLSDlJwuX2GZSuhSrD4 +VkI4QB3/E4DOS04bG6MY8arWKuUKLpB9v75Yp38ofvUxamgRHNALKlO85i9Z8F4A ++A3GYEI1G/aCkURx2idekxFFQbIEd5YpKG8khP9BQM2UFh/WPPvrQCp3AoGALMQx +6bvhB7nC7id0vfvrBoXCopi6SzZP/OSLmYNTNg+kGMS86hiHVw3Mge9zuaD48iT3 +8T9Qlwpx1i2evBKeSurFnUv7vsXPQpSFuQlHRxVAswLH3h7tjXBZnGH2RigwV4xo +x3FB5PtW7/z0dfeN9fpPOPL10fsyCu9RSg4hsX8CgYBk//LNOy4IqGsMJn0VSHTh +LB/wc/7U4wWWiyZ2wszQ24xBBMpLgCHHvF3ZIm/NCfKDr29ygVBkRMND1kyNS/GN +juQisvkrVFhesIJjJ2UqR1K5LO55mxobATxzteXNj78DhuNnKMzzHicmPr9/s868 +LmJZlcCpzGN/jE/79+TIkA== -----END PRIVATE KEY----- From 81199f336502eb914aa26ffa8c9142d15dff520e Mon Sep 17 00:00:00 2001 From: WizaXxX Date: Fri, 12 Mar 2021 22:11:58 +0300 Subject: [PATCH 8/8] =?UTF-8?q?=20=D0=90=D0=B4=D0=B0=D0=BF=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF?= =?UTF-8?q?=D1=82=D1=8B=20=D0=B4=D0=BB=D1=8F=20=D0=BD=D0=BE=D0=B2=D1=8B?= =?UTF-8?q?=D1=85=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D0=B9=20=D0=BF=D0=BB?= =?UTF-8?q?=D0=B0=D1=82=D1=84=D0=BE=D1=80=D0=BC=D1=8B=20fix=20#14=20(#15)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update from https://github.com/1C-Company/docker_fresh (#21) * renew sert * renew sert * renew sert * renew sert * Исправил опечатки в Readme * renew sert * renew sert Co-authored-by: Юрий * Адаптировал скрипты для новых версий платформы (#22) Co-authored-by: Юрий --- docker-compose_pattern.yml | 6 +++--- images/core/dumper.py | 20 +++++++++++++++++--- images/core/entrypoint.sh | 10 ++++++---- images/core/get_platform.sh | 14 ++------------ modules/helper.py | 21 ++++++++++++++------- start.py | 16 +++++++++++++++- 6 files changed, 57 insertions(+), 30 deletions(-) diff --git a/docker-compose_pattern.yml b/docker-compose_pattern.yml index 545b54a..e5b9787 100644 --- a/docker-compose_pattern.yml +++ b/docker-compose_pattern.yml @@ -77,7 +77,7 @@ services: - ./mnt:/mnt - /tmp/.aksusb:/tmp/.aksusb - ../licenses_1c:/var/1C/licenses - - ../conf/core:/opt/1C/v8.3/x86_64/conf + - ../conf/core:PATH_TO_1C_REPLACEconf ports: - 1540-1541:1540-1541 @@ -92,11 +92,11 @@ services: image: fresh/core hostname: ras.HOSTNAMEREPLACE container_name: ras.HOSTNAMEREPLACE - command: /opt/1C/v8.3/x86_64/ras cluster --port=1545 srv:1540 + command: PATH_TO_1C_REPLACEras cluster --port=1545 srv:1540 volumes: - ./artifacts/ras/log:/var/log/1c - ./mnt:/mnt - - ../images/core/conf/logcfg.xml:/opt/1C/v8.3/x86_64/conf/logcfg.xml + - ../images/core/conf/logcfg.xml:PATH_TO_1C_REPLACEconf/logcfg.xml ports: - 1545:1545 diff --git a/images/core/dumper.py b/images/core/dumper.py index 6ae5570..6fd83c4 100644 --- a/images/core/dumper.py +++ b/images/core/dumper.py @@ -12,6 +12,8 @@ import time import uuid +path_to_1c = '' + # define regexps regex_process_pid = re.compile(r'/([^/.]+?)\.(\d+?)\.(\d+?)\.core') regex_offset = re.compile(r'#0\s+?([\dxa-f]+?)\s') @@ -31,6 +33,10 @@ def run_shell(cmd): p = subprocess.Popen(cmd, shell=True, stdin=pipe, stdout=pipe, stderr=pipe, close_fds=True, cwd='/') return p.stdout.read(), p.stderr.read() +def run_shell_get_stdout(cmd): + pipe = subprocess.PIPE + p = subprocess.Popen(cmd, shell=True, stdin=pipe, stdout=pipe, stderr=pipe, close_fds=True, cwd='/') + return p.stdout.read() def run_shell_get_result(cmd): result = subprocess.call(cmd, shell=True) @@ -43,6 +49,14 @@ def check_size_static(core_file): size_2 = os.path.getsize(core_file) return size_1 == size_2 +def get_path_to_1c(): + global path_to_1c + if path_to_1c == '': + result = run_shell_get_stdout("find / -name '1cv8c' | sed 's/1cv8c//g' | sed 's/\.\/opt/\/opt/g'") + path_to_1c = result.decode('utf-8').strip() + return path_to_1c + + # END helper functions-------------------------------------------------------------------------------------------------- # BEGIN prepare date---------------------------------------------------------------------------------------------------- @@ -58,7 +72,7 @@ def get_pid_process_ctime(core_file): def get_platform_offset(core_file, process): # run gdb for getting offset of core - cmd = 'echo -e "bt\nexit" | gdb /opt/1C/v8.3/x86_64/' + process + ' ' + core_file + cmd = 'echo -e "bt\nexit" | gdb ' + get_path_to_1c() + process + ' ' + core_file (gdb_result, gdb_error) = run_shell(cmd) if not gdb_result: @@ -73,7 +87,7 @@ def get_platform_offset(core_file, process): offset = rez.groups()[0] offset = offset[6:-1] # getting platform version - cmd = 'strings /opt/1C/v8.3/x86_64/' + process + """ | grep -oP '[8-9]\.[3-90]\.\d\d?\.\d{2,4}' """ + cmd = 'strings ' + get_path_to_1c() + process + """ | grep -oP '[8-9]\.[3-90]\.\d\d?\.\d{2,4}' """ (ver_result, ver_error) = run_shell(cmd) if ver_result: platform = ver_result.strip() @@ -105,7 +119,7 @@ def make_libs_tar(core_file, process): if os.path.exists(libs_file): os.remove(libs_file) cmd = """echo -e "info shared\nq" | """ - cmd += """ gdb /opt/1C/v8.3/x86_64/""" + process + " " + core_file + """ 2>/dev/null | """ + cmd += """ gdb """ + get_path_to_1c() + process + " " + core_file + """ 2>/dev/null | """ cmd += """ grep 0x0000 | grep -v /opt/1C/v8.3 | grep -v ?? | perl -alne 'print $F[-1]' | """ cmd += """ while read file; do tar --dereference --append -f """ + libs_file + """ $file 2> /dev/null ; done""" stdout, stderr = run_shell(cmd) diff --git a/images/core/entrypoint.sh b/images/core/entrypoint.sh index 681c2e5..35179d5 100644 --- a/images/core/entrypoint.sh +++ b/images/core/entrypoint.sh @@ -2,15 +2,17 @@ set -e +platform_path=$(find / -name "1cv8c" | sed 's/1cv8c//g' | sed 's/\.\/opt/\/opt/g') + if [ "$1" = 'srv' ] then chown -R usr1cv8:grp1cv8 ${COREDATA} ${CORELOGS} - exec gosu usr1cv8 /opt/1C/v8.3/x86_64/ragent -debug -http /d ${COREDATA} + exec gosu usr1cv8 ${platform_path}ragent -debug -http /d ${COREDATA} elif [ "$1" = 'srv+cli' ] then ulimit -c unlimited chown -R usr1cv8:grp1cv8 ${COREDATA} ${CORELOGS} - exec gosu usr1cv8 /opt/1C/v8.3/x86_64/ragent -debug -http /d ${COREDATA} & + exec gosu usr1cv8 ${platform_path}ragent -debug -http /d ${COREDATA} & status=$? if [ $status -ne 0 ]; then echo "Failed to start ragent: $status" @@ -37,7 +39,7 @@ then elif [ "$1" = 'ras' ] then chown -R usr1cv8:grp1cv8 ${CORELOGS} - exec gosu usr1cv8 /opt/1C/v8.3/x86_64/ras cluster + exec gosu usr1cv8 ${platform_path}ras cluster elif [ "$1" = 'cli' ] then chown -R usr1cv8:grp1cv8 ${CORELOGS} @@ -54,7 +56,7 @@ elif [ "$1" = 'agent' ] then chown -R usr1cv8:grp1cv8 ${COREDATA} ${CORELOGS} ${AGENTBASEDIR} exec /usr/bin/Xvfb :99 -screen 0 1680x1050x24 -shmem & - exec /opt/1C/v8.3/x86_64/1cv8 DESIGNER /AgentMode /IBConnectionString "${INFOBASECONNECTIONSTRING}" /AgentBaseDir "${AGENTBASEDIR}" /AgentSSHHostKey "/id_rsa.key" /Visible /AgentListenAddress 0.0.0.0 + exec ${platform_path}1cv8 DESIGNER /AgentMode /IBConnectionString "${INFOBASECONNECTIONSTRING}" /AgentBaseDir "${AGENTBASEDIR}" /AgentSSHHostKey "/id_rsa.key" /Visible /AgentListenAddress 0.0.0.0 fi exec "$@" \ No newline at end of file diff --git a/images/core/get_platform.sh b/images/core/get_platform.sh index cffe8b8..9b3c5fd 100644 --- a/images/core/get_platform.sh +++ b/images/core/get_platform.sh @@ -1,15 +1,5 @@ cd /out_files -DISTR_FILE_VERSION=$(ls | grep "client" | grep -Eo "[0-9]+\_[0-9]+\_[0-9]+\_[0-9]+") -DISTR_VERSION=$(ls | grep "client" | grep -Eo "[0-9]+\_[0-9]+\_[0-9]+\_[0-9]+" | sed 's/_/./g') -DISTR_VER1=$(echo $DISTR_VERSION | cut -d '.' -f 1-3) -DISTR_VER2=$(echo $DISTR_VERSION | cut -d '.' -f 4) -common_file_name=1C_Enterprise83-common-$DISTR_VER1-$DISTR_VER2.x86_64.rpm -server_file_name=1C_Enterprise83-server-$DISTR_VER1-$DISTR_VER2.x86_64.rpm -ws_file_name=1C_Enterprise83-ws-$DISTR_VER1-$DISTR_VER2.x86_64.rpm -client_file_name=1C_Enterprise83-client-$DISTR_VER1-$DISTR_VER2.x86_64.rpm + tar -xvf client*.rpm64.tar.gz --exclude "*thin*.rpm" --exclude "*nls*.rpm" --exclude "license-tools" -C /main_dir/distr + tar -xvf rpm64_*.tar.gz --exclude "*crs*.rpm" --exclude "*nls*.rpm" -C /main_dir/distr -tar -xvf client_$DISTR_FILE_VERSION.rpm64.tar.gz $client_file_name -C /main_dir/distr -tar -xvf rpm64_$DISTR_FILE_VERSION.tar.gz $common_file_name $server_file_name $ws_file_name -C /main_dir/distr - -tar -xvf rpm64_$DISTR_FILE_VERSION.tar.gz "license-tools" -C /main_dir/distr/ diff --git a/modules/helper.py b/modules/helper.py index 82130d6..39defb4 100644 --- a/modules/helper.py +++ b/modules/helper.py @@ -1,10 +1,12 @@ import pathlib import os +path_to_1c = '' sep = str(os.path.sep) this_path = str(pathlib.Path().absolute()) + sep distr_path = this_path + 'distr' + sep + def replace_sep(path): return path.replace('/', sep) @@ -35,7 +37,7 @@ def web_publish_command(host_name, conf_name, internal, descriptor, base_name='' command.append('docker') command.append('exec') command.append('web.' + host_name) - command.append('/opt/1C/v8.3/x86_64/webinst') + command.append('{}webinst'.format(path_to_1c)) command.append('-apache24') command.append('-wsdir') command.append(prefix + '/' + conf_name) @@ -62,7 +64,7 @@ def create_ib_command(host_name, ib_name, file_name, job_block, action): command.append('exec') command.append('-t') command.append('srv.' + host_name) - command.append('/opt/1C/v8.3/x86_64/1cv8') + command.append('{}1cv8'.format(path_to_1c)) command.append('CREATEINFOBASE') command.append('"Srvr=srv;Ref={0};DBMS=PostgreSQL;DBSrvr=/tmp/postgresql/socket;DB={0};DBUID=postgres;LicDstr=Y;Locale=ru_RU;CrSQLDB=Y;SchJobDn={1};"'.format( ib_name, job_block)) @@ -77,7 +79,7 @@ def install_control_ext_command(host_name, ib_name, action): command.append('exec') command.append('-t') command.append('srv.' + host_name) - command.append('/opt/1C/v8.3/x86_64/1cv8') + command.append('{}1cv8'.format(path_to_1c)) command.append('DESIGNER') command.append('/S') command.append('"srv\\{}"'.format(ib_name)) @@ -95,7 +97,7 @@ def install_sm_ext_command(host_name, ib_name, action): command.append('exec') command.append('-t') command.append('srv.' + host_name) - command.append('/opt/1C/v8.3/x86_64/1cv8') + command.append('{}1cv8'.format(path_to_1c)) command.append('DESIGNER') command.append('/S') command.append('"srv\\{}"'.format(ib_name)) @@ -113,7 +115,7 @@ def install_ext_command(host_name, ib_name, action): command.append('exec') command.append('-t') command.append('srv.' + host_name) - command.append('/opt/1C/v8.3/x86_64/1cv8') + command.append('{}1cv8'.format(path_to_1c)) command.append('DESIGNER') command.append('/S') command.append('"srv\\{}"'.format(ib_name)) @@ -131,7 +133,7 @@ def disable_safe_mode(host_name, ib_name, action): command.append('exec') command.append('-t') command.append('srv.' + host_name) - command.append('/opt/1C/v8.3/x86_64/1cv8') + command.append('{}1cv8'.format(path_to_1c)) command.append('ENTERPRICE') command.append('/S') command.append('"srv\\{}"'.format(ib_name)) @@ -233,4 +235,9 @@ def get_host_name(argv): print('parameter -р not specified') exit(1) host_index = argv.index('-h') - return argv[host_index + 1] \ No newline at end of file + return argv[host_index + 1] + + +def init(path): + global path_to_1c + path_to_1c = path \ No newline at end of file diff --git a/start.py b/start.py index e2efd50..4763eb2 100644 --- a/start.py +++ b/start.py @@ -21,6 +21,7 @@ docker_compose_str = 'docker-compose -f workdir/docker-compose.yml ' work_dir = '/out_files/workdir/' work_dir_other = work_dir + 'mnt/other-files/' local_work_dir = helper.replace_sep(helper.this_path + 'workdir/') +path_to_1c = '' class colors: @@ -91,7 +92,7 @@ def print_description(function_to_decorate): task.join() progress_thread.stop() - while progress_thread.isAlive(): + while progress_thread.is_alive(): time.sleep(0.2) if not task.is_good: exit(1) @@ -272,6 +273,7 @@ def renew_docker_compose(): call('cp /out_files/docker-compose_pattern.yml /out_files/workdir/docker-compose.yml') call('sh -c "sed -i \'s/HOSTNAMEREPLACE/{}/\' {}/*.yml"'.format(host_name, work_dir)) + call('sh -c "sed -i \'s/PATH_TO_1C_REPLACE/{}/\' {}/*.yml"'.format(path_to_1c.replace('/','\/'), work_dir)) @print_description @@ -425,6 +427,16 @@ def down_containers(): call(docker_compose_str + 'down', remote=False) +@print_description +def get_path_to_1c(): + """Getting path to 1C""" + + global path_to_1c + cmd = "docker run --rm fresh/core sh -c \"find / -name '1cv8c' | sed 's/1cv8c//g'\"" + pipe = subprocess.PIPE + p = subprocess.Popen(cmd, shell=True, stdin=pipe, stdout=pipe, stderr=pipe, close_fds=True) + path_to_1c = p.stdout.read().decode('utf-8').strip() + print('path to 1C: ' + path_to_1c) global_start_time = datetime.now() print('{}Fresh is starting{} at {}'.format(colors.GREEN, colors.WHITE, global_start_time)) @@ -434,6 +446,8 @@ new_server = '-new' in sys.argv global_debug = '-debug' in sys.argv set_full_host_name(new_server) +get_path_to_1c() +helper.init(path_to_1c) if new_server: renew_workdir()