From 17268785099d17684eedfcf65da7b57929049344 Mon Sep 17 00:00:00 2001 From: HusamAjour Date: Sun, 4 Jun 2023 15:26:26 +0300 Subject: [PATCH 01/25] update the ssl certificate for edraak.dev --- nginx/ssl/chained.crt | 40 ++++++++++++++++++++-------------------- nginx/ssl/private.key | 8 ++++---- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt index 2a6620a751..b260cb310f 100644 --- a/nginx/ssl/chained.crt +++ b/nginx/ssl/chained.crt @@ -1,28 +1,28 @@ -----BEGIN CERTIFICATE----- -MIIEYDCCA0igAwIBAgISBN2Se+qknjuPcCklAN6vfaoUMA0GCSqGSIb3DQEBCwUA +MIIEXzCCA0egAwIBAgISBCc4WefryYbzXD4RvhEUlKhuMA0GCSqGSIb3DQEBCwUA MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD -EwJSMzAeFw0yMzAzMDEwNjQ4MDdaFw0yMzA1MzAwNjQ4MDZaMBcxFTATBgNVBAMM -DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABInlmojh6q+Z -OaE+rsFdoA3soEJoqhz1y9V+8/YnhA90nnwtczb8pfuISvpS6vIw7hPyk9YX/FGN -NVShJE012bKjggJUMIICUDAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB -BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFPORDyjs3ESv -wQhaW4obfYItKlvXMB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG +EwJSMzAeFw0yMzA2MDQxMTIyMTNaFw0yMzA5MDIxMTIyMTJaMBcxFTATBgNVBAMM +DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIszmegHRAg/ +jaE/YbP+Wa4IHzfttnIJUdagbs7CtnVDdtLdy2STvxTXD1aG1H8/9d6rpDPz7aws +beMK7Khs39mjggJTMIICTzAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB +BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFBXBy4rdftNj +j948W9oDetkOTNZWMB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG CCsGAQUFBwEBBEkwRzAhBggrBgEFBQcwAYYVaHR0cDovL3IzLm8ubGVuY3Iub3Jn MCIGCCsGAQUFBzAChhZodHRwOi8vcjMuaS5sZW5jci5vcmcvMCMGA1UdEQQcMBqC DCouZWRyYWFrLmRldoIKZWRyYWFrLmRldjBMBgNVHSAERTBDMAgGBmeBDAECATA3 BgsrBgEEAYLfEwEBATAoMCYGCCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNy -eXB0Lm9yZzCCAQUGCisGAQQB1nkCBAIEgfYEgfMA8QB3AHoyjFTYty22IOo44FIe -6YQWcDIThU070ivBOlejUutSAAABhpwkkLQAAAQDAEgwRgIhAJyHTAHjmm7Lkq81 -5kWW2qJxmyAxkcnEBBTKxeo8ZOebAiEAh5/Nbi29GxKt3enQ0vfbpMHEWeUAnMxj -Ira6ycs+qXcAdgCt9776fP8QyIudPZwePhhqtGcpXc+xDCTKhYY069yCigAAAYac -JJD7AAAEAwBHMEUCID0ILYe9suKLa2itbsKCD+EfCrk6kPICddQ4S9LRC38gAiEA -wobTnZFhoAAcqixYwSHBPm6/kQM4b76hGQPy02lp1FkwDQYJKoZIhvcNAQELBQAD -ggEBAKqc5QZQjog43PNBvCliCRlcVR24ng/NT+fo/qpFteNr9a5a4xMzd8VOGo4H -N+KtREE4byzzguxFu61mDD/mlrJvmg8/OTa9+ix8hsv7g3qafuggzrDVKcBs1jPA -1p5NWgAHdVE1QsV4xsHK6N6hGlpk8BDtw2GHlvklGsZ2gsRytCyZAcZYQnm5ejLt -pIfILukYNWxKVh26ByvROJ/O6FA7pLHvPYBEt5lqdSGuEfSXS5eZkdi9M07fBRrt -uRuYPyUAXn+zRg5VOcCwAB7igKVnNlGxcUGXPLxVqRUOueYYe33RGTOgKCfaIhQf -d5zvqXqgJHCAlU/hQh63xrEhafY= +eXB0Lm9yZzCCAQQGCisGAQQB1nkCBAIEgfUEgfIA8AB3AHoyjFTYty22IOo44FIe +6YQWcDIThU070ivBOlejUutSAAABiIZbp4gAAAQDAEgwRgIhAP4wAsfHHCftL5hS +G2ypje9ePf0CeKdnCfvERDyzYk/7AiEAq1m+99faVqYiY/HfDolG7uhh/swWBWS0 +mXIXV8OA+nYAdQCt9776fP8QyIudPZwePhhqtGcpXc+xDCTKhYY069yCigAAAYiG +W6e4AAAEAwBGMEQCIAywYUbRi+LVi2wQN2impTKe/Z/XBU1XrpVw7slCZnnnAiBH +MHTfEjXjbdHMURr4RDv+s97zG6QrQM1X5caKk/87eDANBgkqhkiG9w0BAQsFAAOC +AQEAm6laj5xCCPv+UK1FMcKkX4fgvoiEOM0uyuTf6KJID9CEiU9N0knq3SUdcCB2 +YY/gi/zjI98Tbe30p9XcsAQ0Rk+v9Of+0K9o5vxDwfO0looA3asswkLrkv5hJdc8 +lqy4hlXybXCEUrWWs+4tDgvWFDwk6PmmyN7fD8Rpqra4V+5UaWF1z/UV4fOWKJ6a +WR1BZtWR6Sm1bISHr4ntXbegHkb4YF0vULVynggd6sUBFrV23JJAqtbF1l8JE4BM +7VZwUA+Oqcc9gvewKdO1Fcz1wAKo2ynsYl4SvxgPhYYBhFowgrS8qcKRvtsAcgfY +z/hkCEycWnV0OxjmWkrbsqz0Ug== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw @@ -84,4 +84,4 @@ MA0GCSqGSIb3DQEBCwUAA4IBAQAKcwBslm7/DlLQrt2M51oGrS+o44+/yQoDFVDC WCLKTVXkcGdtwlfFRjlBz4pYg1htmf5X6DYO8A4jqv2Il9DjXA6USbW1FzXSLr9O he8Y4IWS6wY7bCkjCWDcRQJMEhg76fsO3txE+FiYruq9RUWhiF1myv4Q6W+CyBFC Dfvp7OOGAN6dEOM4+qR9sdjoSYKEBpsr6GtPAQw4dy753ec5 ------END CERTIFICATE----- +-----END CERTIFICATE----- \ No newline at end of file diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key index bb04842028..45721ef557 100644 --- a/nginx/ssl/private.key +++ b/nginx/ssl/private.key @@ -1,5 +1,5 @@ -----BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg/l1eacgHB6arpbrX -0mNE6nLrPoKhHgxMSZYckm+CHxOhRANCAASJ5ZqI4eqvmTmhPq7BXaAN7KBCaKoc -9cvVfvP2J4QPdJ58LXM2/KX7iEr6UuryMO4T8pPWF/xRjTVUoSRNNdmy ------END PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgzManMvW833pjdvg2 +NY0TsA8/XLBXcd+2i6qwMRjg7bqhRANCAASLM5noB0QIP42hP2Gz/lmuCB837bZy +CVHWoG7OwrZ1Q3bS3ctkk78U1w9WhtR/P/Xeq6Qz8+2sLG3jCuyobN/Z +-----END PRIVATE KEY----- \ No newline at end of file From af9dfc20249dfa959aff459fbc4d31cbb251b42f Mon Sep 17 00:00:00 2001 From: hmalabehqrf Date: Sun, 3 Sep 2023 16:45:15 +0300 Subject: [PATCH 02/25] update dev ssl --- nginx/ssl/chained.crt | 41 ++++++++++++++++++++--------------------- nginx/ssl/private.key | 6 +++--- 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt index b260cb310f..0d542aeb19 100644 --- a/nginx/ssl/chained.crt +++ b/nginx/ssl/chained.crt @@ -1,28 +1,27 @@ -----BEGIN CERTIFICATE----- -MIIEXzCCA0egAwIBAgISBCc4WefryYbzXD4RvhEUlKhuMA0GCSqGSIb3DQEBCwUA +MIIEJjCCAw6gAwIBAgISA1/67GlBj8V6Hc04lSEX1OZlMA0GCSqGSIb3DQEBCwUA MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD -EwJSMzAeFw0yMzA2MDQxMTIyMTNaFw0yMzA5MDIxMTIyMTJaMBcxFTATBgNVBAMM -DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIszmegHRAg/ -jaE/YbP+Wa4IHzfttnIJUdagbs7CtnVDdtLdy2STvxTXD1aG1H8/9d6rpDPz7aws -beMK7Khs39mjggJTMIICTzAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB -BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFBXBy4rdftNj -j948W9oDetkOTNZWMB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG +EwJSMzAeFw0yMzA5MDMxMjM1MzZaFw0yMzEyMDIxMjM1MzVaMBcxFTATBgNVBAMM +DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABMM0hNZCozOo +JXTy9sMFz80DdK6BWbBT421kAMk57AsGcBRFpkm4MCRZsVgeSndhjWxpzTXlWwau +r3ntrDqlqEajggIaMIICFjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB +BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFFyb1UY1HYro +EmlAtKYO9TQb/U01MB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG CCsGAQUFBwEBBEkwRzAhBggrBgEFBQcwAYYVaHR0cDovL3IzLm8ubGVuY3Iub3Jn MCIGCCsGAQUFBzAChhZodHRwOi8vcjMuaS5sZW5jci5vcmcvMCMGA1UdEQQcMBqC -DCouZWRyYWFrLmRldoIKZWRyYWFrLmRldjBMBgNVHSAERTBDMAgGBmeBDAECATA3 -BgsrBgEEAYLfEwEBATAoMCYGCCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNy -eXB0Lm9yZzCCAQQGCisGAQQB1nkCBAIEgfUEgfIA8AB3AHoyjFTYty22IOo44FIe -6YQWcDIThU070ivBOlejUutSAAABiIZbp4gAAAQDAEgwRgIhAP4wAsfHHCftL5hS -G2ypje9ePf0CeKdnCfvERDyzYk/7AiEAq1m+99faVqYiY/HfDolG7uhh/swWBWS0 -mXIXV8OA+nYAdQCt9776fP8QyIudPZwePhhqtGcpXc+xDCTKhYY069yCigAAAYiG -W6e4AAAEAwBGMEQCIAywYUbRi+LVi2wQN2impTKe/Z/XBU1XrpVw7slCZnnnAiBH -MHTfEjXjbdHMURr4RDv+s97zG6QrQM1X5caKk/87eDANBgkqhkiG9w0BAQsFAAOC -AQEAm6laj5xCCPv+UK1FMcKkX4fgvoiEOM0uyuTf6KJID9CEiU9N0knq3SUdcCB2 -YY/gi/zjI98Tbe30p9XcsAQ0Rk+v9Of+0K9o5vxDwfO0looA3asswkLrkv5hJdc8 -lqy4hlXybXCEUrWWs+4tDgvWFDwk6PmmyN7fD8Rpqra4V+5UaWF1z/UV4fOWKJ6a -WR1BZtWR6Sm1bISHr4ntXbegHkb4YF0vULVynggd6sUBFrV23JJAqtbF1l8JE4BM -7VZwUA+Oqcc9gvewKdO1Fcz1wAKo2ynsYl4SvxgPhYYBhFowgrS8qcKRvtsAcgfY -z/hkCEycWnV0OxjmWkrbsqz0Ug== +DCouZWRyYWFrLmRldoIKZWRyYWFrLmRldjATBgNVHSAEDDAKMAgGBmeBDAECATCC +AQQGCisGAQQB1nkCBAIEgfUEgfIA8AB3AHoyjFTYty22IOo44FIe6YQWcDIThU07 +0ivBOlejUutSAAABiltBicMAAAQDAEgwRgIhANAcFtbc5md28G5nQXdHWdicIhfA +n6JL0JKsHUp2C58oAiEAsG4BH58txrosAgjueclJl9xCMFlWezH2RTDVuRTiumQA +dQCt9776fP8QyIudPZwePhhqtGcpXc+xDCTKhYY069yCigAAAYpbQY0cAAAEAwBG +MEQCIBeIlE6Vhd1eECa5Fu7wSOmQyQUaDjkFXSwCzIF7kf8IAiALX9Pu4OmTtYEW +nUpDf+MLUiL+a7hk/e6Pn906zEjYHjANBgkqhkiG9w0BAQsFAAOCAQEASrnShuM1 +EI2OSyu0ueyGy583Gspdg7VfJEQDJ/CJhB28fOi9j+Wk1DXbyAVue/BnTkuvi7qD +RNAoZlJZYrgZh8DUsUF5CotSFN/nSP/BPz0uoNq3FgOONdkGnajU5CrlN6QyepBw +Lt+niee7TEtFhfAeExx4MKKuHSjSpykVxsAAtIb3ajasBTPTSRvJ/duMpCN75Of5 +bD61h95THrUdemYKB6FzZl74aS6DSR42G/IrBr9WIVwW0k1TQYMZzRCD///Y0gD3 +LX9qaW7rQW/CcS+m5DdF9sqWRXJsrif8A15sk/Z7dJfLDCTYScNmpJXvCXovhCMa +Z3XexdsbmW2jDw== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key index 45721ef557..1081b5d04b 100644 --- a/nginx/ssl/private.key +++ b/nginx/ssl/private.key @@ -1,5 +1,5 @@ -----BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgzManMvW833pjdvg2 -NY0TsA8/XLBXcd+2i6qwMRjg7bqhRANCAASLM5noB0QIP42hP2Gz/lmuCB837bZy -CVHWoG7OwrZ1Q3bS3ctkk78U1w9WhtR/P/Xeq6Qz8+2sLG3jCuyobN/Z +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgQNZY0eEC9/iEQZaf +eIFULluFS+J0jYwN4tYwdyv+k+2hRANCAATDNITWQqMzqCV08vbDBc/NA3SugVmw +U+NtZADJOewLBnAURaZJuDAkWbFYHkp3YY1sac015VsGrq957aw6pahG -----END PRIVATE KEY----- \ No newline at end of file From b0d50a68724d73570bc59dc8e31056c8a8819c5d Mon Sep 17 00:00:00 2001 From: hmalabehqrf Date: Mon, 4 Dec 2023 12:46:58 +0300 Subject: [PATCH 03/25] update dev ssl --- nginx/ssl/chained.crt | 38 +++++++++++++++++++------------------- nginx/ssl/private.key | 6 +++--- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt index 0d542aeb19..fad4133e93 100644 --- a/nginx/ssl/chained.crt +++ b/nginx/ssl/chained.crt @@ -1,27 +1,27 @@ -----BEGIN CERTIFICATE----- -MIIEJjCCAw6gAwIBAgISA1/67GlBj8V6Hc04lSEX1OZlMA0GCSqGSIb3DQEBCwUA +MIIEJTCCAw2gAwIBAgISA8n51Qr42+SxER7VQnpvlYIpMA0GCSqGSIb3DQEBCwUA MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD -EwJSMzAeFw0yMzA5MDMxMjM1MzZaFw0yMzEyMDIxMjM1MzVaMBcxFTATBgNVBAMM -DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABMM0hNZCozOo -JXTy9sMFz80DdK6BWbBT421kAMk57AsGcBRFpkm4MCRZsVgeSndhjWxpzTXlWwau -r3ntrDqlqEajggIaMIICFjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB -BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFFyb1UY1HYro -EmlAtKYO9TQb/U01MB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG +EwJSMzAeFw0yMzEyMDQwODQ0MzBaFw0yNDAzMDMwODQ0MjlaMBcxFTATBgNVBAMM +DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIjLTeyG9fpQ +h21O49lu5wof22z9hK6vg9VQ3g3FsxJrKEviz6yYvTyqhWJJuUAIWp9QAs9bD6Ch +WiuG2sSFiYejggIZMIICFTAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB +BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFLSyXyllDgUi +7eWIZN3rCBEZbYN1MB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG CCsGAQUFBwEBBEkwRzAhBggrBgEFBQcwAYYVaHR0cDovL3IzLm8ubGVuY3Iub3Jn MCIGCCsGAQUFBzAChhZodHRwOi8vcjMuaS5sZW5jci5vcmcvMCMGA1UdEQQcMBqC DCouZWRyYWFrLmRldoIKZWRyYWFrLmRldjATBgNVHSAEDDAKMAgGBmeBDAECATCC -AQQGCisGAQQB1nkCBAIEgfUEgfIA8AB3AHoyjFTYty22IOo44FIe6YQWcDIThU07 -0ivBOlejUutSAAABiltBicMAAAQDAEgwRgIhANAcFtbc5md28G5nQXdHWdicIhfA -n6JL0JKsHUp2C58oAiEAsG4BH58txrosAgjueclJl9xCMFlWezH2RTDVuRTiumQA -dQCt9776fP8QyIudPZwePhhqtGcpXc+xDCTKhYY069yCigAAAYpbQY0cAAAEAwBG -MEQCIBeIlE6Vhd1eECa5Fu7wSOmQyQUaDjkFXSwCzIF7kf8IAiALX9Pu4OmTtYEW -nUpDf+MLUiL+a7hk/e6Pn906zEjYHjANBgkqhkiG9w0BAQsFAAOCAQEASrnShuM1 -EI2OSyu0ueyGy583Gspdg7VfJEQDJ/CJhB28fOi9j+Wk1DXbyAVue/BnTkuvi7qD -RNAoZlJZYrgZh8DUsUF5CotSFN/nSP/BPz0uoNq3FgOONdkGnajU5CrlN6QyepBw -Lt+niee7TEtFhfAeExx4MKKuHSjSpykVxsAAtIb3ajasBTPTSRvJ/duMpCN75Of5 -bD61h95THrUdemYKB6FzZl74aS6DSR42G/IrBr9WIVwW0k1TQYMZzRCD///Y0gD3 -LX9qaW7rQW/CcS+m5DdF9sqWRXJsrif8A15sk/Z7dJfLDCTYScNmpJXvCXovhCMa -Z3XexdsbmW2jDw== +AQMGCisGAQQB1nkCBAIEgfQEgfEA7wB2AEiw42vapkc0D+VqAvqdMOscUgHLVt0s +gdm7v6s52IRzAAABjDQ3Bg8AAAQDAEcwRQIhAL6b7hfsFReKUgHTx4aTJKKXOIRp +DVqVITSBA4oymYQLAiBrCx8bvUEQ0noihjl3lGWdZCpLqNQLfSqfhtJpO5kmeQB1 +AKLiv9Ye3i8vB6DWTm03p9xlQ7DGtS6i2reK+Jpt9RfYAAABjDQ3BicAAAQDAEYw +RAIgTWmUQKDXzreUKpf/k5MDWhwj+YfBZiE8EbVxZn/UxZACIBhOqIAObI+tkXb6 +P5tDl20po55Sewipl8wh5rTSSxuxMA0GCSqGSIb3DQEBCwUAA4IBAQBviO+eIcoH +/+iW8afRapggKC2Y8+F+Jmjw20BrWfkVldIRVoUjnmIbp/3RZNvgqR4UWmcGihyF +a3B0feVrg85s2LK6aEkOO1hN6VRJrBSJHaiXRZsWsm1u7MK8/9hYxzfTUWrlE54v +9uIIpTP/8s46ruoUX3HVRkifxiFL1SFl1W/HufpcE6yA4vxM5ACC7NZsFAyUQ4Hy +JRZOHTdjdSOi21AwwsIBmRLZH6n8GSTw205iCUZVttHkV3BOkxHV7YiB2FImz9zP +UFkm5bNr7wQbAgSNBOxxwV3VBp5c2iQoqcnvY12uu/VKzkVit7jsDskR5ZiDIkgM +sGxnQJ6tF2Fx -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key index 1081b5d04b..ff70c94bb8 100644 --- a/nginx/ssl/private.key +++ b/nginx/ssl/private.key @@ -1,5 +1,5 @@ -----BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgQNZY0eEC9/iEQZaf -eIFULluFS+J0jYwN4tYwdyv+k+2hRANCAATDNITWQqMzqCV08vbDBc/NA3SugVmw -U+NtZADJOewLBnAURaZJuDAkWbFYHkp3YY1sac015VsGrq957aw6pahG +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgW5WmjZ+T/wIth4Cg +eH69yzzFGkg+TWO2J5KpL1jLEx+hRANCAASIy03shvX6UIdtTuPZbucKH9ts/YSu +r4PVUN4NxbMSayhL4s+smL08qoViSblACFqfUALPWw+goVorhtrEhYmH -----END PRIVATE KEY----- \ No newline at end of file From 84f0288be9638eddb3860570e79ffd2943b5bd6c Mon Sep 17 00:00:00 2001 From: hmalabehqrf Date: Sun, 3 Mar 2024 14:14:46 +0300 Subject: [PATCH 04/25] hmalabeh/new_ssl_dev_cert_03_Mar_2024 --- nginx/ssl/chained.crt | 69 ++++++++++++------------------------------- nginx/ssl/private.key | 6 ++-- 2 files changed, 22 insertions(+), 53 deletions(-) diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt index fad4133e93..0d7c5e704a 100644 --- a/nginx/ssl/chained.crt +++ b/nginx/ssl/chained.crt @@ -1,27 +1,27 @@ -----BEGIN CERTIFICATE----- -MIIEJTCCAw2gAwIBAgISA8n51Qr42+SxER7VQnpvlYIpMA0GCSqGSIb3DQEBCwUA +MIIEJjCCAw6gAwIBAgISBDNj4gej7OO8Ctbkgw2BwFEvMA0GCSqGSIb3DQEBCwUA MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD -EwJSMzAeFw0yMzEyMDQwODQ0MzBaFw0yNDAzMDMwODQ0MjlaMBcxFTATBgNVBAMM -DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIjLTeyG9fpQ -h21O49lu5wof22z9hK6vg9VQ3g3FsxJrKEviz6yYvTyqhWJJuUAIWp9QAs9bD6Ch -WiuG2sSFiYejggIZMIICFTAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB -BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFLSyXyllDgUi -7eWIZN3rCBEZbYN1MB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG +EwJSMzAeFw0yNDAzMDMxMDEwMDRaFw0yNDA2MDExMDEwMDNaMBcxFTATBgNVBAMM +DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNSP8c/XUmNf +yy2B3xJtY4O1uJEL4x27HOURBjX0KIWWrMh9utdqV9Sc0+lUGnB1yy18fsMR/1dM +2UpXDA/seXOjggIaMIICFjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB +BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFCLldLOHhNLL +48k7I0ExzdTiTc3DMB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG CCsGAQUFBwEBBEkwRzAhBggrBgEFBQcwAYYVaHR0cDovL3IzLm8ubGVuY3Iub3Jn MCIGCCsGAQUFBzAChhZodHRwOi8vcjMuaS5sZW5jci5vcmcvMCMGA1UdEQQcMBqC DCouZWRyYWFrLmRldoIKZWRyYWFrLmRldjATBgNVHSAEDDAKMAgGBmeBDAECATCC -AQMGCisGAQQB1nkCBAIEgfQEgfEA7wB2AEiw42vapkc0D+VqAvqdMOscUgHLVt0s -gdm7v6s52IRzAAABjDQ3Bg8AAAQDAEcwRQIhAL6b7hfsFReKUgHTx4aTJKKXOIRp -DVqVITSBA4oymYQLAiBrCx8bvUEQ0noihjl3lGWdZCpLqNQLfSqfhtJpO5kmeQB1 -AKLiv9Ye3i8vB6DWTm03p9xlQ7DGtS6i2reK+Jpt9RfYAAABjDQ3BicAAAQDAEYw -RAIgTWmUQKDXzreUKpf/k5MDWhwj+YfBZiE8EbVxZn/UxZACIBhOqIAObI+tkXb6 -P5tDl20po55Sewipl8wh5rTSSxuxMA0GCSqGSIb3DQEBCwUAA4IBAQBviO+eIcoH -/+iW8afRapggKC2Y8+F+Jmjw20BrWfkVldIRVoUjnmIbp/3RZNvgqR4UWmcGihyF -a3B0feVrg85s2LK6aEkOO1hN6VRJrBSJHaiXRZsWsm1u7MK8/9hYxzfTUWrlE54v -9uIIpTP/8s46ruoUX3HVRkifxiFL1SFl1W/HufpcE6yA4vxM5ACC7NZsFAyUQ4Hy -JRZOHTdjdSOi21AwwsIBmRLZH6n8GSTw205iCUZVttHkV3BOkxHV7YiB2FImz9zP -UFkm5bNr7wQbAgSNBOxxwV3VBp5c2iQoqcnvY12uu/VKzkVit7jsDskR5ZiDIkgM -sGxnQJ6tF2Fx +AQQGCisGAQQB1nkCBAIEgfUEgfIA8AB2ADtTd3U+LbmAToswWwb+QDtn2E/D9Me9 +AA0tcm/h+tQXAAABjgQBtfYAAAQDAEcwRQIhAPvdax1FyK3Gu8MmVpaAW3Bwm3eJ +z6oDWGhhDQQDv5AxAiA1q9oD9IPd+Ib5gzEBX1H5iV5LcnquRfPxt2pSDRxb1wB2 +AO7N0GTV2xrOxVy3nbTNE6Iyh0Z8vOzew1FIWUZxH7WbAAABjgQBtfMAAAQDAEcw +RQIhAOBPkeII5PTgQl81RWm+E46odK3C8tob82aZdAcq1VQtAiA2BajG9cXWAroS +/E0q4pDP9MdJ5LbX4gEtJiMkhyLn8jANBgkqhkiG9w0BAQsFAAOCAQEAns1U2PjE +jnDbK3iQoVU3skn2NSqr1u7qtaiQOSs9rrwxVYYKd9qzkUud3luLvH689V+AgrzQ +++9OFPMkCgNIax6po9pcy4ylTnCm7xHAMhjw8BrY1PW0Vdsw65xef/ltEyU6PWGG +VsuN3b559QtFpx61FZEwy9niMIX3mznOavVSLjleWf1/1g+l0A83BTJQBgfyenN6 +NVT5YzyIvh5m9c+hZf6Mr98nmF3qFU76V1KswKnOGeg8Ffd6ZhY3w8q5EJ0/puYt +Q9QtfhKJ2MPyJGBgfUqFqA+ilkLysBFQD8GulEB2tp3qfwEWcQz4vGn1ATX6prNr +Rcp08/yIO7w3zg== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw @@ -52,35 +52,4 @@ hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+ HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX nLRbwHOoq7hHwg== ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIIFYDCCBEigAwIBAgIQQAF3ITfU6UK47naqPGQKtzANBgkqhkiG9w0BAQsFADA/ -MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT -DkRTVCBSb290IENBIFgzMB4XDTIxMDEyMDE5MTQwM1oXDTI0MDkzMDE4MTQwM1ow -TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh -cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwggIiMA0GCSqGSIb3DQEB -AQUAA4ICDwAwggIKAoICAQCt6CRz9BQ385ueK1coHIe+3LffOJCMbjzmV6B493XC -ov71am72AE8o295ohmxEk7axY/0UEmu/H9LqMZshftEzPLpI9d1537O4/xLxIZpL -wYqGcWlKZmZsj348cL+tKSIG8+TA5oCu4kuPt5l+lAOf00eXfJlII1PoOK5PCm+D -LtFJV4yAdLbaL9A4jXsDcCEbdfIwPPqPrt3aY6vrFk/CjhFLfs8L6P+1dy70sntK -4EwSJQxwjQMpoOFTJOwT2e4ZvxCzSow/iaNhUd6shweU9GNx7C7ib1uYgeGJXDR5 -bHbvO5BieebbpJovJsXQEOEO3tkQjhb7t/eo98flAgeYjzYIlefiN5YNNnWe+w5y -sR2bvAP5SQXYgd0FtCrWQemsAXaVCg/Y39W9Eh81LygXbNKYwagJZHduRze6zqxZ -Xmidf3LWicUGQSk+WT7dJvUkyRGnWqNMQB9GoZm1pzpRboY7nn1ypxIFeFntPlF4 -FQsDj43QLwWyPntKHEtzBRL8xurgUBN8Q5N0s8p0544fAQjQMNRbcTa0B7rBMDBc -SLeCO5imfWCKoqMpgsy6vYMEG6KDA0Gh1gXxG8K28Kh8hjtGqEgqiNx2mna/H2ql -PRmP6zjzZN7IKw0KKP/32+IVQtQi0Cdd4Xn+GOdwiK1O5tmLOsbdJ1Fu/7xk9TND -TwIDAQABo4IBRjCCAUIwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw -SwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5pZGVudHJ1 -c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTEp7Gkeyxx -+tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEEAYLfEwEB -ATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2VuY3J5cHQu -b3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0LmNvbS9E -U1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFHm0WeZ7tuXkAXOACIjIGlj26Ztu -MA0GCSqGSIb3DQEBCwUAA4IBAQAKcwBslm7/DlLQrt2M51oGrS+o44+/yQoDFVDC -5WxCu2+b9LRPwkSICHXM6webFGJueN7sJ7o5XPWioW5WlHAQU7G75K/QosMrAdSW -9MUgNTP52GE24HGNtLi1qoJFlcDyqSMo59ahy2cI2qBDLKobkx/J3vWraV0T9VuG -WCLKTVXkcGdtwlfFRjlBz4pYg1htmf5X6DYO8A4jqv2Il9DjXA6USbW1FzXSLr9O -he8Y4IWS6wY7bCkjCWDcRQJMEhg76fsO3txE+FiYruq9RUWhiF1myv4Q6W+CyBFC -Dfvp7OOGAN6dEOM4+qR9sdjoSYKEBpsr6GtPAQw4dy753ec5 -----END CERTIFICATE----- \ No newline at end of file diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key index ff70c94bb8..1a5ed2454a 100644 --- a/nginx/ssl/private.key +++ b/nginx/ssl/private.key @@ -1,5 +1,5 @@ -----BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgW5WmjZ+T/wIth4Cg -eH69yzzFGkg+TWO2J5KpL1jLEx+hRANCAASIy03shvX6UIdtTuPZbucKH9ts/YSu -r4PVUN4NxbMSayhL4s+smL08qoViSblACFqfUALPWw+goVorhtrEhYmH +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg1dFdIrdOE7LBxRh+ +yOiGub9+RPGmImABH7e9FZu24jehRANCAATUj/HP11JjX8stgd8SbWODtbiRC+Md +uxzlEQY19CiFlqzIfbrXalfUnNPpVBpwdcstfH7DEf9XTNlKVwwP7Hlz -----END PRIVATE KEY----- \ No newline at end of file From eed4355f2321957f3dfd85fdde88b213ef032fb2 Mon Sep 17 00:00:00 2001 From: hmalabehqrf Date: Mon, 1 Apr 2024 10:41:23 +0300 Subject: [PATCH 05/25] upgrade devstack to use mysql8 mongo --- docker-compose-mktg.yml | 2 +- docker-compose-progs.yml | 2 +- docker-compose.yml | 15 ++++++++++++++- provision-lms.sh | 2 +- provision-mktg.sh | 2 +- provision-progs.sh | 2 +- provision.sh | 11 +++++++++-- 7 files changed, 28 insertions(+), 8 deletions(-) diff --git a/docker-compose-mktg.yml b/docker-compose-mktg.yml index 53cf5de570..d33f6e99dd 100644 --- a/docker-compose-mktg.yml +++ b/docker-compose-mktg.yml @@ -22,7 +22,7 @@ services: ports: - "18500:8500" depends_on: - - mysql + - mysql8 - memcached volumes: - ${DEVSTACK_WORKSPACE}/marketing-site:/app diff --git a/docker-compose-progs.yml b/docker-compose-progs.yml index 3ca970fa16..59501c10b4 100644 --- a/docker-compose-progs.yml +++ b/docker-compose-progs.yml @@ -23,7 +23,7 @@ services: ports: - "18800:8800" depends_on: - - mysql + - mysql8 - mongo - memcached volumes: diff --git a/docker-compose.yml b/docker-compose.yml index 646f1d4ae2..8cace14056 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -32,7 +32,7 @@ services: # We disable the journal for a minor performance gain. command: mongod --nojournal container_name: edx.devstack.mongo - image: mongo:4.4.14 + image: mongo:6.0.14 ports: - "27017:27017" volumes: @@ -50,6 +50,18 @@ services: volumes: - mysql_data:/var/lib/mysql + mysql8: + command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci --default-authentication-plugin=mysql_native_password + container_name: edx.devstack.mysql8 + environment: + MYSQL_ROOT_PASSWORD: "" + MYSQL_ALLOW_EMPTY_PASSWORD: "yes" + image: mysql:8.0.31 + ports: + - "3307:3306" + volumes: + - mysql8_data:/var/lib/mysql + router: image: nginx container_name: edraak_dev_router @@ -81,4 +93,5 @@ volumes: elasticsearch_data: mongo_data: mysql_data: + mysql8_data: devpi_data: diff --git a/provision-lms.sh b/provision-lms.sh index a3a29c27ca..3c4eb8b777 100755 --- a/provision-lms.sh +++ b/provision-lms.sh @@ -7,7 +7,7 @@ apps=( lms studio ) echo "** Edx **" echo -e "${GREEN}Creating databases and users...${NC}" docker exec -i edx.devstack.mysql mysql -uroot mysql < provision.sql -docker exec -i edx.devstack.mongo mongo < mongo-provision.js +docker exec -i edx.devstack.mongo mongosh < mongo-provision.js # Load database dumps for the largest databases to save time ./load-db.sh edxapp diff --git a/provision-mktg.sh b/provision-mktg.sh index 5ca7e28e24..1b8dcd0a71 100755 --- a/provision-mktg.sh +++ b/provision-mktg.sh @@ -4,7 +4,7 @@ echo "** Bring Marketing up **" docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d mktg echo "** Creating databases **" -echo "CREATE DATABASE IF NOT EXISTS marketingsite;" | docker exec -i edx.devstack.mysql mysql -uroot mysql +echo "CREATE DATABASE IF NOT EXISTS marketingsite;" | docker exec -i edx.devstack.mysql8 mysql -uroot mysql echo "** Marketing: Copy cacheed files to code dir **" docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'cp -Rn /cache/* /app/.' diff --git a/provision-progs.sh b/provision-progs.sh index a82cf9464d..d4dbd726b3 100755 --- a/provision-progs.sh +++ b/provision-progs.sh @@ -4,7 +4,7 @@ echo "** Bring progs up **" docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d progs echo "** Creating databases **" -echo "CREATE DATABASE IF NOT EXISTS edraakprograms;" | docker exec -i edx.devstack.mysql mysql -uroot mysql +echo "CREATE DATABASE IF NOT EXISTS edraakprograms;" | docker exec -i edx.devstack.mysql8 mysql -uroot mysql echo "** Progs: Setting correct python version **" diff --git a/provision.sh b/provision.sh index 0f043f6d85..7cfbbf2e81 100755 --- a/provision.sh +++ b/provision.sh @@ -23,7 +23,7 @@ if [ "$MOUNT_TYPE" = "-nfs" ]; then fi # Bring the databases online. -docker-compose up -d mysql mongo +docker-compose up -d mysql mongo mysql8 # Ensure the MySQL server is online and usable echo "Waiting for MySQL" @@ -33,12 +33,19 @@ do sleep 1 done +echo "Waiting for MySQL8" +until docker exec -i edx.devstack.mysql8 mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null +do + printf "." + sleep 1 +done + # In the event of a fresh MySQL container, wait a few seconds for the server to restart # This can be removed once https://github.com/docker-library/mysql/issues/245 is resolved. sleep 10 printf "Creating mongo usres" -docker exec -i edx.devstack.mongo mongo < mongo-provision.js +docker exec -i edx.devstack.mongo mongosh < mongo-provision.js echo -e "MySQL ready" From 4ccd98ab875afb92a5f1ead29e689cb9aee71e6f Mon Sep 17 00:00:00 2001 From: qutaiba Date: Wed, 17 Apr 2024 10:28:23 +0300 Subject: [PATCH 06/25] Update memcached image version --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 646f1d4ae2..cfa2f89a9e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,12 +19,12 @@ services: - "9200:9200" - "9300:9300" volumes: - - elasticsearch_data:/usr/share/elasticsearch/data + - elasticsearch_data:/usr/share/elasticsearch/datamake - elasticsearch_data:/usr/share/elasticsearch/logs memcached: container_name: edx.devstack.memcached - image: memcached:1.4.24 + image: memcached:1.4 ports: - "11211:11211" From e63f914ac9d338332312baa211975c7fde0979f8 Mon Sep 17 00:00:00 2001 From: hmalabehqrf Date: Wed, 17 Apr 2024 12:44:31 +0300 Subject: [PATCH 07/25] changes to work on ubuntu 22 --- provision-mktg.sh | 4 ++-- provision-progs.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/provision-mktg.sh b/provision-mktg.sh index 1b8dcd0a71..acafa4eaa2 100755 --- a/provision-mktg.sh +++ b/provision-mktg.sh @@ -8,10 +8,10 @@ echo "CREATE DATABASE IF NOT EXISTS marketingsite;" | docker exec -i edx.devstac echo "** Marketing: Copy cacheed files to code dir **" docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'cp -Rn /cache/* /app/.' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'pip install -r requirements.txt' +docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'pip3 install -r requirements.txt' echo "** Marketing: Migrating databases **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev' +docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python3.8 manage.py migrate --settings=marketingsite.envs.dev' echo "** Marketing: Compiling assets **" docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'rm -rf node_modules/' diff --git a/provision-progs.sh b/provision-progs.sh index d4dbd726b3..93f583e40c 100755 --- a/provision-progs.sh +++ b/provision-progs.sh @@ -12,10 +12,10 @@ docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'update-alterna echo "** Progs: Copy cacheed files to code dir **" #docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'cp -Rn /cache/* /app/.' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'pip install -r requirements.txt' +docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'pip3 install -r requirements.txt' echo "** Progs: Migrating databases **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python manage.py migrate --settings=edraakprograms.dev' +docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python3.8 manage.py migrate --settings=edraakprograms.dev' echo "** Progs: Compiling assets **" docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm rebuild node-sass' From 3cf6eaaf7e67d657201ecc6187639f403679b2d5 Mon Sep 17 00:00:00 2001 From: HusamAjour Date: Sun, 2 Jun 2024 10:39:31 +0300 Subject: [PATCH 08/25] Renew the SSL certificate for edraak.dev --- nginx/ssl/chained.crt | 38 +++++++++++++++++++------------------- nginx/ssl/private.key | 6 +++--- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt index 0d7c5e704a..4ce63648e0 100644 --- a/nginx/ssl/chained.crt +++ b/nginx/ssl/chained.crt @@ -1,27 +1,27 @@ -----BEGIN CERTIFICATE----- -MIIEJjCCAw6gAwIBAgISBDNj4gej7OO8Ctbkgw2BwFEvMA0GCSqGSIb3DQEBCwUA +MIIEJTCCAw2gAwIBAgISBDEV9m6QbkODt+5KEYaFkb8+MA0GCSqGSIb3DQEBCwUA MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD -EwJSMzAeFw0yNDAzMDMxMDEwMDRaFw0yNDA2MDExMDEwMDNaMBcxFTATBgNVBAMM -DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNSP8c/XUmNf -yy2B3xJtY4O1uJEL4x27HOURBjX0KIWWrMh9utdqV9Sc0+lUGnB1yy18fsMR/1dM -2UpXDA/seXOjggIaMIICFjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB -BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFCLldLOHhNLL -48k7I0ExzdTiTc3DMB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG +EwJSMzAeFw0yNDA2MDIwNjM0NDFaFw0yNDA4MzEwNjM0NDBaMBcxFTATBgNVBAMM +DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAxqq7gRS0la +YiTBvIYkGPlm7gvKtYExoCII1dCBtdcTneso325cE2Wa0se+3PtB+/YPhSyzT307 +5e/KWuwdC5CjggIZMIICFTAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB +BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFM4YaiQLzNEB +RJGr20/26HBKmqJcMB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG CCsGAQUFBwEBBEkwRzAhBggrBgEFBQcwAYYVaHR0cDovL3IzLm8ubGVuY3Iub3Jn MCIGCCsGAQUFBzAChhZodHRwOi8vcjMuaS5sZW5jci5vcmcvMCMGA1UdEQQcMBqC DCouZWRyYWFrLmRldoIKZWRyYWFrLmRldjATBgNVHSAEDDAKMAgGBmeBDAECATCC -AQQGCisGAQQB1nkCBAIEgfUEgfIA8AB2ADtTd3U+LbmAToswWwb+QDtn2E/D9Me9 -AA0tcm/h+tQXAAABjgQBtfYAAAQDAEcwRQIhAPvdax1FyK3Gu8MmVpaAW3Bwm3eJ -z6oDWGhhDQQDv5AxAiA1q9oD9IPd+Ib5gzEBX1H5iV5LcnquRfPxt2pSDRxb1wB2 -AO7N0GTV2xrOxVy3nbTNE6Iyh0Z8vOzew1FIWUZxH7WbAAABjgQBtfMAAAQDAEcw -RQIhAOBPkeII5PTgQl81RWm+E46odK3C8tob82aZdAcq1VQtAiA2BajG9cXWAroS -/E0q4pDP9MdJ5LbX4gEtJiMkhyLn8jANBgkqhkiG9w0BAQsFAAOCAQEAns1U2PjE -jnDbK3iQoVU3skn2NSqr1u7qtaiQOSs9rrwxVYYKd9qzkUud3luLvH689V+AgrzQ -++9OFPMkCgNIax6po9pcy4ylTnCm7xHAMhjw8BrY1PW0Vdsw65xef/ltEyU6PWGG -VsuN3b559QtFpx61FZEwy9niMIX3mznOavVSLjleWf1/1g+l0A83BTJQBgfyenN6 -NVT5YzyIvh5m9c+hZf6Mr98nmF3qFU76V1KswKnOGeg8Ffd6ZhY3w8q5EJ0/puYt -Q9QtfhKJ2MPyJGBgfUqFqA+ilkLysBFQD8GulEB2tp3qfwEWcQz4vGn1ATX6prNr -Rcp08/yIO7w3zg== +AQMGCisGAQQB1nkCBAIEgfQEgfEA7wB2AEiw42vapkc0D+VqAvqdMOscUgHLVt0s +gdm7v6s52IRzAAABj9ffOloAAAQDAEcwRQIgYS8PTlAhogJiw0lTpFRPNIyGKTyZ +K0sxW7t9TYjg4osCIQC0rv+P6gEVgyy7xYBEOu1qS1T3CwmKFa2wfiFt6MbUZAB1 +ABmYEHEJ8NZSLjCA0p4/ZLuDbijM+Q9Sju7fzko/FrTKAAABj9ffOnMAAAQDAEYw +RAIgXA6RKRmEO9FztPr7lg88OLvw5JD0GfXYgqdZj6zMMQ0CIHQQOTA027+XOlxm +xH/Mng0FkgW54uEN/Ksm6SveNYykMA0GCSqGSIb3DQEBCwUAA4IBAQBb7Bs7MqQT +JtGyxVTS3Gyt7d86kfc2EOz2RAsPIrREvy28ZvsrC7+Gh0eBzzeK4E0wBbs4R9+O +nQghMHVefPpXBIyxmyytJHzyy3FWKbob5uu5PQAFnPy2OtDB9g3ZKSkMV7gfYqwZ +pMev72tTCraw+rhC88mlQvhyh/4uLEvrnqs4sZcRJLx/fF/qcknzwDdnp8beGHUp +m8SO+aKh3EbO4sLrNxn2CYPcJ+c5xKaLIGUdK+zNUoaHKIUrQRe94sqm+zccCgAb +qW2rhU7A3m1Ec3vzQ6EX//zq3IdcpD5Dg4NvFbUPjVAizNtJ2TWpjEiNMikTQtod +t3SNwy59Jgv4 -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key index 1a5ed2454a..dd8e7abe4b 100644 --- a/nginx/ssl/private.key +++ b/nginx/ssl/private.key @@ -1,5 +1,5 @@ -----BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg1dFdIrdOE7LBxRh+ -yOiGub9+RPGmImABH7e9FZu24jehRANCAATUj/HP11JjX8stgd8SbWODtbiRC+Md -uxzlEQY19CiFlqzIfbrXalfUnNPpVBpwdcstfH7DEf9XTNlKVwwP7Hlz +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgDdaPLqtkejR2yT/7 ++aYMMiFWjA2f+OajmkunMr8Gw2WhRANCAAQMaqu4EUtJWmIkwbyGJBj5Zu4LyrWB +MaAiCNXQgbXXE53rKN9uXBNlmtLHvtz7Qfv2D4Uss099O+XvylrsHQuQ -----END PRIVATE KEY----- \ No newline at end of file From 7a298a8f49baf392cd19100e1767852bbb923e16 Mon Sep 17 00:00:00 2001 From: apple Date: Mon, 5 Aug 2024 00:22:30 +0300 Subject: [PATCH 09/25] edraak_DevStack --- provision.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/provision.sh b/provision.sh index 7cfbbf2e81..6cc12d16f3 100755 --- a/provision.sh +++ b/provision.sh @@ -49,11 +49,6 @@ docker exec -i edx.devstack.mongo mongosh < mongo-provision.js echo -e "MySQL ready" -if $ENABLE_EDX; then - ./provision-lms.sh - # Nothing special needed for studio - docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio -fi if $ENABLE_PROGS; then @@ -81,3 +76,8 @@ fi docker image prune -f echo -e "${GREEN}Provisioning complete!${NC}" +if $ENABLE_EDX; then + ./provision-lms.sh + # Nothing special needed for studio + docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio + From d10c9d96f1f561ff0d7d0af886923bd0f4680dff Mon Sep 17 00:00:00 2001 From: HusamAjour Date: Sun, 4 Aug 2024 12:49:21 +0300 Subject: [PATCH 10/25] Revert "edraak_DevStack" This reverts commit 7a298a8f49baf392cd19100e1767852bbb923e16. --- provision.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/provision.sh b/provision.sh index 6cc12d16f3..7cfbbf2e81 100755 --- a/provision.sh +++ b/provision.sh @@ -49,6 +49,11 @@ docker exec -i edx.devstack.mongo mongosh < mongo-provision.js echo -e "MySQL ready" +if $ENABLE_EDX; then + ./provision-lms.sh + # Nothing special needed for studio + docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio +fi if $ENABLE_PROGS; then @@ -76,8 +81,3 @@ fi docker image prune -f echo -e "${GREEN}Provisioning complete!${NC}" -if $ENABLE_EDX; then - ./provision-lms.sh - # Nothing special needed for studio - docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio - From 3fb7305abb00093f3967e1a5ab67b4f5b9899396 Mon Sep 17 00:00:00 2001 From: hmalabehqrf Date: Sun, 1 Sep 2024 12:16:35 +0300 Subject: [PATCH 11/25] update dev ssl --- nginx/ssl/chained.crt | 94 ++++++++++++++++++++----------------------- nginx/ssl/private.key | 8 ++-- 2 files changed, 47 insertions(+), 55 deletions(-) diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt index 4ce63648e0..3b6423d079 100644 --- a/nginx/ssl/chained.crt +++ b/nginx/ssl/chained.crt @@ -1,55 +1,47 @@ -----BEGIN CERTIFICATE----- -MIIEJTCCAw2gAwIBAgISBDEV9m6QbkODt+5KEYaFkb8+MA0GCSqGSIb3DQEBCwUA -MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD -EwJSMzAeFw0yNDA2MDIwNjM0NDFaFw0yNDA4MzEwNjM0NDBaMBcxFTATBgNVBAMM -DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAxqq7gRS0la -YiTBvIYkGPlm7gvKtYExoCII1dCBtdcTneso325cE2Wa0se+3PtB+/YPhSyzT307 -5e/KWuwdC5CjggIZMIICFTAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB -BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFM4YaiQLzNEB -RJGr20/26HBKmqJcMB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG -CCsGAQUFBwEBBEkwRzAhBggrBgEFBQcwAYYVaHR0cDovL3IzLm8ubGVuY3Iub3Jn -MCIGCCsGAQUFBzAChhZodHRwOi8vcjMuaS5sZW5jci5vcmcvMCMGA1UdEQQcMBqC -DCouZWRyYWFrLmRldoIKZWRyYWFrLmRldjATBgNVHSAEDDAKMAgGBmeBDAECATCC -AQMGCisGAQQB1nkCBAIEgfQEgfEA7wB2AEiw42vapkc0D+VqAvqdMOscUgHLVt0s -gdm7v6s52IRzAAABj9ffOloAAAQDAEcwRQIgYS8PTlAhogJiw0lTpFRPNIyGKTyZ -K0sxW7t9TYjg4osCIQC0rv+P6gEVgyy7xYBEOu1qS1T3CwmKFa2wfiFt6MbUZAB1 -ABmYEHEJ8NZSLjCA0p4/ZLuDbijM+Q9Sju7fzko/FrTKAAABj9ffOnMAAAQDAEYw -RAIgXA6RKRmEO9FztPr7lg88OLvw5JD0GfXYgqdZj6zMMQ0CIHQQOTA027+XOlxm -xH/Mng0FkgW54uEN/Ksm6SveNYykMA0GCSqGSIb3DQEBCwUAA4IBAQBb7Bs7MqQT -JtGyxVTS3Gyt7d86kfc2EOz2RAsPIrREvy28ZvsrC7+Gh0eBzzeK4E0wBbs4R9+O -nQghMHVefPpXBIyxmyytJHzyy3FWKbob5uu5PQAFnPy2OtDB9g3ZKSkMV7gfYqwZ -pMev72tTCraw+rhC88mlQvhyh/4uLEvrnqs4sZcRJLx/fF/qcknzwDdnp8beGHUp -m8SO+aKh3EbO4sLrNxn2CYPcJ+c5xKaLIGUdK+zNUoaHKIUrQRe94sqm+zccCgAb -qW2rhU7A3m1Ec3vzQ6EX//zq3IdcpD5Dg4NvFbUPjVAizNtJ2TWpjEiNMikTQtod -t3SNwy59Jgv4 +MIIDhTCCAwugAwIBAgISA3vnnyo74p8gg0E3ReOVYTfIMAoGCCqGSM49BAMDMDIx +CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF +NTAeFw0yNDA5MDEwODA3MjFaFw0yNDExMzAwODA3MjBaMBcxFTATBgNVBAMMDCou +ZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABPvQrUK0nbVCOUja +8JXVae1f1pg1BJa4rV9lX/7xqgmRHr1gXjOYRKbLzB9c9F7tx5egrJm536To7cbX +ckG4ZOWjggIaMIICFjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUH +AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFDpczHNGEqoLxaP2 +cJlxHSqUfTeNMB8GA1UdIwQYMBaAFJ8rX888IU+dBLftKyzExnCL0tcNMFUGCCsG +AQUFBwEBBEkwRzAhBggrBgEFBQcwAYYVaHR0cDovL2U1Lm8ubGVuY3Iub3JnMCIG +CCsGAQUFBzAChhZodHRwOi8vZTUuaS5sZW5jci5vcmcvMCMGA1UdEQQcMBqCDCou +ZWRyYWFrLmRldoIKZWRyYWFrLmRldjATBgNVHSAEDDAKMAgGBmeBDAECATCCAQQG +CisGAQQB1nkCBAIEgfUEgfIA8AB2ABmYEHEJ8NZSLjCA0p4/ZLuDbijM+Q9Sju7f +zko/FrTKAAABkazVZREAAAQDAEcwRQIhANhePDKQCEaTAL+XyIeZER3SEY0zzr3W +1niKeAcrfaOKAiBayERKMYozCwMPOOgFiHMiwyxxpjwjD6sOIQbwDmyfAwB2AEiw +42vapkc0D+VqAvqdMOscUgHLVt0sgdm7v6s52IRzAAABkazVZU0AAAQDAEcwRQIh +AOtiTs8EUhriQDR3gyO0zH3akV/OjyMZ3fJlWH/H8Z0rAiBEOxXYt7ZPxbDb9TR4 +Bx9JYM+xGLsuYxLMkqQSOWSZFTAKBggqhkjOPQQDAwNoADBlAjByWN52h8IgEDCL +qB7ZGqT/pOwAyCezEfDC2MREp6x+5euk+bOPCGGySaZ0fTkFbcECMQDDynpc2IYi +1Jd26Q3PAnpaIxRG+JDNA/c9FGVr13ivRfSplrFHAnf6LOHoeag+AWQ= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw +MIIEVzCCAj+gAwIBAgIRAIOPbGPOsTmMYgZigxXJ/d4wDQYJKoZIhvcNAQELBQAw TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh -cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw -WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg -RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP -R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx -sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm -NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg -Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG -/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC -AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB -Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA -FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw -AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw -Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB -gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W -PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl -ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz -CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm -lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4 -avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2 -yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O -yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids -hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+ -HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv -MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX -nLRbwHOoq7hHwg== ------END CERTIFICATE----- \ No newline at end of file +cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw +WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg +RW5jcnlwdDELMAkGA1UEAxMCRTUwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNCzqK +a2GOtu/cX1jnxkJFVKtj9mZhSAouWXW0gQI3ULc/FnncmOyhKJdyIBwsz9V8UiBO +VHhbhBRrwJCuhezAUUE8Wod/Bk3U/mDR+mwt4X2VEIiiCFQPmRpM5uoKrNijgfgw +gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD +ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSfK1/PPCFPnQS37SssxMZw +i9LXDTAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB +AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g +BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu +Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAH3KdNEVCQdqk0LKyuNImTKdRJY1C +2uw2SJajuhqkyGPY8C+zzsufZ+mgnhnq1A2KVQOSykOEnUbx1cy637rBAihx97r+ +bcwbZM6sTDIaEriR/PLk6LKs9Be0uoVxgOKDcpG9svD33J+G9Lcfv1K9luDmSTgG +6XNFIN5vfI5gs/lMPyojEMdIzK9blcl2/1vKxO8WGCcjvsQ1nJ/Pwt8LQZBfOFyV +XP8ubAp/au3dc4EKWG9MO5zcx1qT9+NXRGdVWxGvmBFRAajciMfXME1ZuGmk3/GO +koAM7ZkjZmleyokP1LGzmfJcUd9s7eeu1/9/eg5XlXd/55GtYjAM+C4DG5i7eaNq +cm2F+yxYIPt6cbbtYVNJCGfHWqHEQ4FYStUyFnv8sjyqU8ypgZaNJ9aVcWSICLOI +E1/Qv/7oKsnZCWJ926wU6RqG1OYPGOi1zuABhLw61cuPVDT28nQS/e6z95cJXq0e +K1BcaJ6fJZsmbjRgD5p3mvEf5vdQM7MCEvU0tHbsx2I5mHHJoABHb8KVBgWp/lcX +GWiWaeOyB7RP+OfDtvi2OsapxXiV7vNVs7fMlrRjY1joKaqmmycnBvAq14AEbtyL +sVfOS66B8apkeFX2NY4XPEYV4ZSCe8VHPrdrERk2wILG3T/EGmSIkCYVUMSnjmJd +VQD9F6Na/+zmXCc= +-----END CERTIFICATE----- diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key index dd8e7abe4b..bb92a298d0 100644 --- a/nginx/ssl/private.key +++ b/nginx/ssl/private.key @@ -1,5 +1,5 @@ -----BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgDdaPLqtkejR2yT/7 -+aYMMiFWjA2f+OajmkunMr8Gw2WhRANCAAQMaqu4EUtJWmIkwbyGJBj5Zu4LyrWB -MaAiCNXQgbXXE53rKN9uXBNlmtLHvtz7Qfv2D4Uss099O+XvylrsHQuQ ------END PRIVATE KEY----- \ No newline at end of file +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgJEN1jddZXcKev4eL +tuUkAqz+VbIgFxQyg3bPi7XmsnuhRANCAAT70K1CtJ21QjlI2vCV1WntX9aYNQSW +uK1fZV/+8aoJkR69YF4zmESmy8wfXPRe7ceXoKyZud+k6O3G13JBuGTl +-----END PRIVATE KEY----- From b795341a08da8e0fb64aff45ab70eb281d0ab834 Mon Sep 17 00:00:00 2001 From: qutaiba Date: Mon, 23 Sep 2024 11:15:44 +0300 Subject: [PATCH 12/25] Update marketing make file to include build, push image and yarn comman --- mktg.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mktg.mk b/mktg.mk index b4ac8bb84d..bf717dfcab 100644 --- a/mktg.mk +++ b/mktg.mk @@ -24,10 +24,10 @@ mktg.help: mktg.build: - docker build -t eu.gcr.io/openedx-231314/edraak/marketing -f ../marketing-site/Dockerfile ../marketing-site + docker build -t eu.gcr.io/openedx-231314/edraak/marketing:latest -f ../marketing-site/Dockerfile ../marketing-site mktg.pushimage: - docker push eu.gcr.io/openedx-231314/edraak/marketing + docker push eu.gcr.io/openedx-231314/edraak/marketing:latest mktg.migrate: ## Kill the Marketing Django development server. The watcher process will restart it. docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev' @@ -44,6 +44,9 @@ mktg.install_pip: mktg.install_npm: docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npm install +mktg.install_yarn: + docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg yarn + mktg.copy_cache: docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg cp -Rnv /cache/node_modules /cache/.compiled /app From c8046aed0d0a714f84352d362c8093bf98f725f3 Mon Sep 17 00:00:00 2001 From: HusamAjour Date: Sun, 1 Dec 2024 12:22:47 +0300 Subject: [PATCH 13/25] Renew ssl cert for edraak.dev December 2024 --- nginx/ssl/chained.crt | 70 +++++++++++++++++++++---------------------- nginx/ssl/private.key | 6 ++-- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt index 3b6423d079..aaccb02368 100644 --- a/nginx/ssl/chained.crt +++ b/nginx/ssl/chained.crt @@ -1,47 +1,47 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEVzCCAj+gAwIBAgIRAIOPbGPOsTmMYgZigxXJ/d4wDQYJKoZIhvcNAQELBQAw +MIIEVzCCAj+gAwIBAgIRALBXPpFzlydw27SHyzpFKzgwDQYJKoZIhvcNAQELBQAw TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg -RW5jcnlwdDELMAkGA1UEAxMCRTUwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNCzqK -a2GOtu/cX1jnxkJFVKtj9mZhSAouWXW0gQI3ULc/FnncmOyhKJdyIBwsz9V8UiBO -VHhbhBRrwJCuhezAUUE8Wod/Bk3U/mDR+mwt4X2VEIiiCFQPmRpM5uoKrNijgfgw +RW5jcnlwdDELMAkGA1UEAxMCRTYwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATZ8Z5G +h/ghcWCoJuuj+rnq2h25EqfUJtlRFLFhfHWWvyILOR/VvtEKRqotPEoJhC6+QJVV +6RlAN2Z17TJOdwRJ+HB7wxjnzvdxEP6sdNgA1O1tHHMWMxCcOrLqbGL0vbijgfgw gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD -ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSfK1/PPCFPnQS37SssxMZw -i9LXDTAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB +ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSTJ0aYA6lRaI6Y1sRCSNsj +v1iU0jAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu -Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAH3KdNEVCQdqk0LKyuNImTKdRJY1C -2uw2SJajuhqkyGPY8C+zzsufZ+mgnhnq1A2KVQOSykOEnUbx1cy637rBAihx97r+ -bcwbZM6sTDIaEriR/PLk6LKs9Be0uoVxgOKDcpG9svD33J+G9Lcfv1K9luDmSTgG -6XNFIN5vfI5gs/lMPyojEMdIzK9blcl2/1vKxO8WGCcjvsQ1nJ/Pwt8LQZBfOFyV -XP8ubAp/au3dc4EKWG9MO5zcx1qT9+NXRGdVWxGvmBFRAajciMfXME1ZuGmk3/GO -koAM7ZkjZmleyokP1LGzmfJcUd9s7eeu1/9/eg5XlXd/55GtYjAM+C4DG5i7eaNq -cm2F+yxYIPt6cbbtYVNJCGfHWqHEQ4FYStUyFnv8sjyqU8ypgZaNJ9aVcWSICLOI -E1/Qv/7oKsnZCWJ926wU6RqG1OYPGOi1zuABhLw61cuPVDT28nQS/e6z95cJXq0e -K1BcaJ6fJZsmbjRgD5p3mvEf5vdQM7MCEvU0tHbsx2I5mHHJoABHb8KVBgWp/lcX -GWiWaeOyB7RP+OfDtvi2OsapxXiV7vNVs7fMlrRjY1joKaqmmycnBvAq14AEbtyL -sVfOS66B8apkeFX2NY4XPEYV4ZSCe8VHPrdrERk2wILG3T/EGmSIkCYVUMSnjmJd -VQD9F6Na/+zmXCc= +Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAfYt7SiA1sgWGCIpunk46r4AExIRc +MxkKgUhNlrrv1B21hOaXN/5miE+LOTbrcmU/M9yvC6MVY730GNFoL8IhJ8j8vrOL +pMY22OP6baS1k9YMrtDTlwJHoGby04ThTUeBDksS9RiuHvicZqBedQdIF65pZuhp +eDcGBcLiYasQr/EO5gxxtLyTmgsHSOVSBcFOn9lgv7LECPq9i7mfH3mpxgrRKSxH +pOoZ0KXMcB+hHuvlklHntvcI0mMMQ0mhYj6qtMFStkF1RpCG3IPdIwpVCQqu8GV7 +s8ubknRzs+3C/Bm19RFOoiPpDkwvyNfvmQ14XkyqqKK5oZ8zhD32kFRQkxa8uZSu +h4aTImFxknu39waBxIRXE4jKxlAmQc4QjFZoq1KmQqQg0J/1JF8RlFvJas1VcjLv +YlvUB2t6npO6oQjB3l+PNf0DpQH7iUx3Wz5AjQCi6L25FjyE06q6BZ/QlmtYdl/8 +ZYao4SRqPEs/6cAiF+Qf5zg2UkaWtDphl1LKMuTNLotvsX99HP69V2faNyegodQ0 +LyTApr/vT01YPE46vNsDLgK+4cL6TrzC/a4WcmF5SRJ938zrv/duJHLXQIku5v0+ +EwOy59Hdm0PT/Er/84dDV0CSjdR/2XuZM3kpysSKLgD1cKiDA+IRguODCxfO9cyY +Ig46v9mFmBvyH04= -----END CERTIFICATE----- diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key index bb92a298d0..db3e649902 100644 --- a/nginx/ssl/private.key +++ b/nginx/ssl/private.key @@ -1,5 +1,5 @@ -----BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgJEN1jddZXcKev4eL -tuUkAqz+VbIgFxQyg3bPi7XmsnuhRANCAAT70K1CtJ21QjlI2vCV1WntX9aYNQSW -uK1fZV/+8aoJkR69YF4zmESmy8wfXPRe7ceXoKyZud+k6O3G13JBuGTl +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg9ErXtEsDvvV8fy1c +nUfZEYEUeVVMXOSxDArQNsAJiX+hRANCAATKzeot16Z1Qb2cRQRfMvI34bYmcnnm +kgF5BkCpdAbofTqIq01d224u0QYskj1BPmHyowsHoSnV45PneWDFw36d -----END PRIVATE KEY----- From 52dcb9f5b58a7981a191b1a4638e4b32cef525b3 Mon Sep 17 00:00:00 2001 From: hmalabehqrf Date: Mon, 3 Mar 2025 11:46:21 +0300 Subject: [PATCH 14/25] update dev ssl --- nginx/ssl/chained.crt | 32 ++++++++++++++++---------------- nginx/ssl/private.key | 6 +++--- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt index aaccb02368..16145a86ea 100644 --- a/nginx/ssl/chained.crt +++ b/nginx/ssl/chained.crt @@ -1,23 +1,23 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEVzCCAj+gAwIBAgIRALBXPpFzlydw27SHyzpFKzgwDQYJKoZIhvcNAQELBQAw diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key index db3e649902..9a4108817a 100644 --- a/nginx/ssl/private.key +++ b/nginx/ssl/private.key @@ -1,5 +1,5 @@ -----BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg9ErXtEsDvvV8fy1c -nUfZEYEUeVVMXOSxDArQNsAJiX+hRANCAATKzeot16Z1Qb2cRQRfMvI34bYmcnnm -kgF5BkCpdAbofTqIq01d224u0QYskj1BPmHyowsHoSnV45PneWDFw36d +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg6NnaBmyHoMN/qkYq +ddg4PurCSgmAqTNG9DcwdGyORZShRANCAATN9ZcTezEQyPzfXANg+L4oZOEBR+9K +GHtpi2HQznuAbbwHsRfKQa6JMY0CR9Qh19HOPQPpfUmNtI+PRAJ8PJuX -----END PRIVATE KEY----- From 80ee4d16b32dd518449c96eb35ef61b6b6d0af01 Mon Sep 17 00:00:00 2001 From: hmalabehqrf Date: Tue, 27 May 2025 11:03:30 +0300 Subject: [PATCH 15/25] update dev ssl --- nginx/ssl/chained.crt | 37 +++++++++++++++++++------------------ nginx/ssl/private.key | 6 +++--- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt index 16145a86ea..84b45dbb75 100644 --- a/nginx/ssl/chained.crt +++ b/nginx/ssl/chained.crt @@ -1,23 +1,24 @@ -----BEGIN CERTIFICATE----- -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 +sKuy -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEVzCCAj+gAwIBAgIRALBXPpFzlydw27SHyzpFKzgwDQYJKoZIhvcNAQELBQAw diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key index 9a4108817a..f36114f636 100644 --- a/nginx/ssl/private.key +++ b/nginx/ssl/private.key @@ -1,5 +1,5 @@ -----BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg6NnaBmyHoMN/qkYq -ddg4PurCSgmAqTNG9DcwdGyORZShRANCAATN9ZcTezEQyPzfXANg+L4oZOEBR+9K -GHtpi2HQznuAbbwHsRfKQa6JMY0CR9Qh19HOPQPpfUmNtI+PRAJ8PJuX +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgV1FsDi5uRr39v9kQ +pIEowp1OmwzI7m9H2fol/MgsEuqhRANCAAQOfj8c+zA610YUWrvox9BsNI+II6bs +J+L6n/2DcKsqhDy7oVy0W1tROFgtHqGXDbBXk4L1vkwLjQzb+SA8m0fB -----END PRIVATE KEY----- From 4b90f09977be1e820f501e10e85715250086072a Mon Sep 17 00:00:00 2001 From: hmalabehqrf Date: Wed, 14 May 2025 10:43:06 +0300 Subject: [PATCH 16/25] changes for docker upgrade and mac m series --- Makefile | 39 ++++++++++--------- course-generator/create-courses.sh | 2 +- destroy.sh | 2 +- docker-compose-auth-provider.yml | 2 +- docker-compose-edx.yml | 2 +- docker-compose-mktg.yml | 4 +- docker-compose-progs.yml | 4 +- docker-compose.yml | 33 ++++++++-------- healthchecks.sh | 12 +++--- mktg.mk | 20 +++++----- .../add_replace_sensitive_column.sql | 18 +++++++++ .../add_verify_student_constraint.sql | 20 ++++++++++ programs/provision.sh | 2 +- progs.mk | 22 +++++------ provision-b2b.sh | 24 ++++++------ provision-forum.sh | 4 +- provision-lms.sh | 31 ++++++++++----- provision-mktg.sh | 18 ++++----- provision-progs.sh | 26 ++++++------- provision-state-manager-api.sh | 10 ++--- provision.sh | 16 ++++---- provision.sql | 18 ++++++--- setup_native_nfs_docker_osx.sh | 2 +- 23 files changed, 193 insertions(+), 138 deletions(-) mode change 100644 => 100755 Makefile mode change 100644 => 100755 docker-compose-auth-provider.yml mode change 100644 => 100755 docker-compose-edx.yml mode change 100644 => 100755 docker-compose-mktg.yml mode change 100644 => 100755 docker-compose-progs.yml mode change 100644 => 100755 docker-compose.yml mode change 100644 => 100755 mktg.mk create mode 100644 mysql8_edx_fix/add_replace_sensitive_column.sql create mode 100644 mysql8_edx_fix/add_verify_student_constraint.sql mode change 100644 => 100755 progs.mk mode change 100644 => 100755 provision.sql diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 index ef1ede11e0..15eb5bb69c --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ .DEFAULT_GOAL := help .PHONY: requirements -DEVSTACK_WORKSPACE ?= $(shell pwd)/.. +export DEVSTACK_WORKSPACE=$(abspath ../) include .env OS := $(shell uname) @@ -52,7 +52,7 @@ endif export DOCKER_COMPOSE_FILES -export DEVSTACK_WORKSPACE +#export DEVSTACK_WORKSPACE export COMPOSE_PROJECT_NAME include *.mk @@ -80,6 +80,7 @@ dev.checkout: ## Check out "masters" otherwise ./repo.sh checkout dev.clone: ## Clone service repos to the parent directory + @echo "DEVSTACK_WORKSPACE ${DEVSTACK_WORKSPACE}" ./repo.sh clone dev.provision.run: ## Provision all services with local mounted directories @@ -107,7 +108,7 @@ dev.editable-envs: ## Copy env files outside the docker containers so it's edit @make studio-restart dev.up: | check-memory ## Bring up all services with host volumes - docker-compose ${DOCKER_COMPOSE_FILES} up -d + docker compose ${DOCKER_COMPOSE_FILES} up -d edraak.dev.up.hacks: @# Start: Edraak hacks @@ -126,25 +127,25 @@ provision: | dev.provision stop: ## Stop all services (test -d .docker-sync && docker-sync stop) || true ## Ignore failure here - docker-compose ${DOCKER_COMPOSE_FILES} stop + docker compose ${DOCKER_COMPOSE_FILES} stop down: ## Remove all service containers and networks - docker-compose ${DOCKER_COMPOSE_FILES} down + docker compose ${DOCKER_COMPOSE_FILES} down destroy: ## Remove all devstack-related containers, networks, and volumes ./destroy.sh logs: ## View logs from containers running in detached mode - docker-compose ${DOCKER_COMPOSE_FILES} logs -f --tail 10 + docker compose ${DOCKER_COMPOSE_FILES} logs -f --tail 10 %-logs: ## View the logs of the specified service container - docker-compose ${DOCKER_COMPOSE_FILES} logs -f --tail=500 $* + docker compose ${DOCKER_COMPOSE_FILES} logs -f --tail=500 $* pull: - docker-compose ${DOCKER_COMPOSE_FILES} pull --parallel + docker compose ${DOCKER_COMPOSE_FILES} pull validate: ## Validate the devstack configuration - docker-compose ${DOCKER_COMPOSE_FILES} config + docker compose ${DOCKER_COMPOSE_FILES} config backup: ## Write all data volumes to the host. docker run --rm --volumes-from edx.devstack.mysql -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/mysql.tar.gz /var/lib/mysql @@ -161,7 +162,7 @@ restore: ## Restore all data volumes from the host. WARNING: THIS WILL OVERWRIT # TODO: Print out help for this target. Even better if we can iterate over the -# services in docker-compose.yml, and print the actual service names. +# services in docker compose.yml, and print the actual service names. %-shell: ## Run a shell on the specified service container docker exec -it edx.devstack.$* /bin/bash @@ -249,39 +250,39 @@ vnc-passwords: ## Get the VNC passwords for the Chrome and Firefox Selenium cont @docker logs edx.devstack.firefox 2>&1 | grep "VNC password" | tail -1 devpi-password: ## Get the root devpi password for the devpi container - docker-compose exec devpi bash -c "cat /data/server/.serverpassword" + docker compose exec devpi bash -c "cat /data/server/.serverpassword" mysql-shell: ## Run a shell on the mysql container - docker-compose exec mysql bash + docker compose exec mysql bash mysql-shell-edxapp: ## Run a mysql shell on the edxapp database - docker-compose exec mysql bash -c "mysql edxapp" + docker compose exec mysql bash -c "mysql edxapp" mongo-shell: ## Run a shell on the mongo container - docker-compose exec mongo bash + docker compose exec mongo bash ### analytics pipeline commands dev.provision.analytics_pipeline: | check-memory dev.provision.analytics_pipeline.run stop.analytics_pipeline stop ## Provision analyticstack dev environment with all services stopped dev.provision.analytics_pipeline.run: - DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml -f docker-compose-analytics-pipeline.yml" ./provision-analytics-pipeline.sh + DOCKER_COMPOSE_FILES="-f docker compose.yml -f docker compose-host.yml -f docker compose-analytics-pipeline.yml" ./provision-analytics-pipeline.sh analytics-pipeline-shell: ## Run a shell on the analytics pipeline container docker exec -it edx.devstack.analytics_pipeline env TERM=$(TERM) /edx/app/analytics_pipeline/devstack.sh open dev.up.analytics_pipeline: | check-memory ## Bring up analytics pipeline services - docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml -f docker-compose-host.yml up -d analyticspipeline + docker compose -f docker compose.yml -f docker compose-analytics-pipeline.yml -f docker compose-host.yml up -d analyticspipeline pull.analytics_pipeline: ## Update analytics pipeline docker images - docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml pull --parallel + docker compose -f docker compose.yml -f docker compose-analytics-pipeline.yml pull --parallel analytics-pipeline-devstack-test: ## Run analytics pipeline tests in travis build docker exec -u hadoop -i edx.devstack.analytics_pipeline bash -c 'sudo chown -R hadoop:hadoop /edx/app/analytics_pipeline && source /edx/app/hadoop/.bashrc && make develop-local && make docker-test-acceptance-local ONLY_TESTS=edx.analytics.tasks.tests.acceptance.test_internal_reporting_database && make docker-test-acceptance-local ONLY_TESTS=edx.analytics.tasks.tests.acceptance.test_user_activity' stop.analytics_pipeline: ## Stop analytics pipeline services - docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml stop - docker-compose up -d mysql ## restart mysql as other containers need it + docker compose -f docker compose.yml -f docker compose-analytics-pipeline.yml stop + docker compose up -d mysql ## restart mysql as other containers need it hadoop-application-logs-%: ## View hadoop logs by application Id docker exec -it edx.devstack.analytics_pipeline.nodemanager yarn logs -applicationId $* diff --git a/course-generator/create-courses.sh b/course-generator/create-courses.sh index eea96f6589..16b76b2390 100755 --- a/course-generator/create-courses.sh +++ b/course-generator/create-courses.sh @@ -8,7 +8,7 @@ echo "Parsing options" container_error=false for arg in "$@"; do if [ $arg == "--studio" ]; then - if [ ! "$(docker-compose exec lms bash -c 'echo "Course will be created for studio"; exit $?')" ]; then + if [ ! "$(docker compose exec lms bash -c 'echo "Course will be created for studio"; exit $?')" ]; then echo "Issue with studio container" container_error=true else diff --git a/destroy.sh b/destroy.sh index aaf7d7bd14..94520e3326 100755 --- a/destroy.sh +++ b/destroy.sh @@ -5,5 +5,5 @@ set -e read -p "This will delete all data in your devstack. Would you like to proceed? [y/n] " -r if [[ $REPLY =~ ^[Yy]$ ]] then - docker-compose -f docker-compose.yml -f docker-compose-watchers.yml -f docker-compose-state-manager.yml -f docker-compose-host.yml -f docker-compose-analytics-pipeline.yml down -v + docker compose -f docker compose.yml -f docker compose-watchers.yml -f docker compose-state-manager.yml -f docker compose-host.yml -f docker compose-analytics-pipeline.yml down -v fi diff --git a/docker-compose-auth-provider.yml b/docker-compose-auth-provider.yml old mode 100644 new mode 100755 index 5e964af171..994a9bce70 --- a/docker-compose-auth-provider.yml +++ b/docker-compose-auth-provider.yml @@ -8,7 +8,7 @@ # - Every service's container name should be prefixed with "edraak.devstack." to avoid conflicts with other containers # that might be running for the same service. -version: "2.1" +version: '3.3' services: auth-provider: diff --git a/docker-compose-edx.yml b/docker-compose-edx.yml old mode 100644 new mode 100755 index d1a603aac5..2b92fdda09 --- a/docker-compose-edx.yml +++ b/docker-compose-edx.yml @@ -8,7 +8,7 @@ # - Every service's container name should be prefixed with "edx.devstack." to avoid conflicts with other containers # that might be running for the same service. -version: "2.1" +version: '3.3' services: diff --git a/docker-compose-mktg.yml b/docker-compose-mktg.yml old mode 100644 new mode 100755 index d33f6e99dd..b61f45466e --- a/docker-compose-mktg.yml +++ b/docker-compose-mktg.yml @@ -8,7 +8,7 @@ # - Every service's container name should be prefixed with "edraak.devstack." to avoid conflicts with other containers # that might be running for the same service. -version: "2.1" +version: '3.3' services: @@ -22,7 +22,7 @@ services: ports: - "18500:8500" depends_on: - - mysql8 + - mysql - memcached volumes: - ${DEVSTACK_WORKSPACE}/marketing-site:/app diff --git a/docker-compose-progs.yml b/docker-compose-progs.yml old mode 100644 new mode 100755 index 59501c10b4..37e306ae8e --- a/docker-compose-progs.yml +++ b/docker-compose-progs.yml @@ -8,7 +8,7 @@ # - Every service's container name should be prefixed with "edraak.devstack." to avoid conflicts with other containers # that might be running for the same service. -version: "2.1" +version: '3.3' services: @@ -23,7 +23,7 @@ services: ports: - "18800:8800" depends_on: - - mysql8 + - mysql - mongo - memcached volumes: diff --git a/docker-compose.yml b/docker-compose.yml old mode 100644 new mode 100755 index a0807c2803..ada91d9021 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ # - Every service's container name should be prefixed with "edraak.devstack." to avoid conflicts with other containers # that might be running for the same service. -version: "2.1" +version: '3.3' services: @@ -38,29 +38,29 @@ services: volumes: - mongo_data:/data/db - mysql: - command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci - container_name: edx.devstack.mysql - environment: - MYSQL_ROOT_PASSWORD: "" - MYSQL_ALLOW_EMPTY_PASSWORD: "yes" - image: mysql:5.7 - ports: - - "3306:3306" - volumes: - - mysql_data:/var/lib/mysql +# mysql: +# command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci +# container_name: edx.devstack.mysql +# environment: +# MYSQL_ROOT_PASSWORD: "" +# MYSQL_ALLOW_EMPTY_PASSWORD: "yes" +# image: mysql:5.7 +# ports: +# - "3306:3306" +# volumes: +# - mysql_data:/var/lib/mysql - mysql8: + mysql: command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci --default-authentication-plugin=mysql_native_password - container_name: edx.devstack.mysql8 + container_name: edx.devstack.mysql environment: MYSQL_ROOT_PASSWORD: "" MYSQL_ALLOW_EMPTY_PASSWORD: "yes" image: mysql:8.0.31 ports: - - "3307:3306" + - "3306:3306" volumes: - - mysql8_data:/var/lib/mysql + - mysql_data:/var/lib/mysql router: image: nginx @@ -93,5 +93,4 @@ volumes: elasticsearch_data: mongo_data: mysql_data: - mysql8_data: devpi_data: diff --git a/healthchecks.sh b/healthchecks.sh index 8f98dfe855..8e0cbcee1f 100755 --- a/healthchecks.sh +++ b/healthchecks.sh @@ -3,34 +3,34 @@ set -x echo "Checking LMS heartbeat:" curl http://localhost:18000/heartbeat if [ $? -ne 0 ]; then - docker-compose logs + docker compose logs exit 2 fi echo echo "Checking Studio heartbeat:" curl http://localhost:18010/heartbeat # Studio if [ $? -ne 0 ]; then - docker-compose logs + docker compose logs exit 2 fi echo echo "Checking ecommerce health:" curl http://localhost:18130/health/ # Ecommerce if [ $? -ne 0 ]; then - docker-compose logs + docker compose logs exit 2 fi echo echo "Checking discovery health:" curl http://localhost:18381/health/ # Discovery if [ $? -ne 0 ]; then - docker-compose logs + docker compose logs exit 2 fi echo echo "Checking forum health:" curl http://localhost:44567/heartbeat # Forums if [ $? -ne 0 ]; then - docker-compose logs + docker compose logs exit 2 -fi \ No newline at end of file +fi diff --git a/mktg.mk b/mktg.mk old mode 100644 new mode 100755 index bf717dfcab..1eda295e8a --- a/mktg.mk +++ b/mktg.mk @@ -30,33 +30,33 @@ mktg.pushimage: docker push eu.gcr.io/openedx-231314/edraak/marketing:latest mktg.migrate: ## Kill the Marketing Django development server. The watcher process will restart it. - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev' + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev' mktg.langs_push: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg python manage.py langs_push --settings=marketingsite.envs.dev + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg python manage.py langs_push --settings=marketingsite.envs.dev mktg.langs_pull: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg python manage.py langs_pull --settings=marketingsite.envs.dev + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg python manage.py langs_pull --settings=marketingsite.envs.dev mktg.install_pip: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg pip install -r requirements.txt + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg pip install -r requirements.txt mktg.install_npm: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npm install + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npm install mktg.install_yarn: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg yarn + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg yarn mktg.copy_cache: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg cp -Rnv /cache/node_modules /cache/.compiled /app + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg cp -Rnv /cache/node_modules /cache/.compiled /app mktg.dev: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npm run dev + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npm run dev mktg.watch: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npx gulp watch + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npx gulp watch mktg.install_all: | mktg.install_pip mktg.install_npm mktg.dev mktg.migrate mktg.fix-npm: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'chown -R root ~/.npm' + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'chown -R root ~/.npm' diff --git a/mysql8_edx_fix/add_replace_sensitive_column.sql b/mysql8_edx_fix/add_replace_sensitive_column.sql new file mode 100644 index 0000000000..5e0a910689 --- /dev/null +++ b/mysql8_edx_fix/add_replace_sensitive_column.sql @@ -0,0 +1,18 @@ +USE edxapp; + +SET @column_exists := ( + SELECT COUNT(*) FROM information_schema.columns + WHERE table_schema = 'edxapp' + AND table_name = 'enterprise_enterprisecustomer' + AND column_name = 'replace_sensitive_sso_username' +); + +SET @ddl := IF( + @column_exists = 0, + 'ALTER TABLE enterprise_enterprisecustomer ADD COLUMN replace_sensitive_sso_username TINYINT(1) DEFAULT 0;', + 'SELECT "Column already exists";' +); + +PREPARE stmt FROM @ddl; +EXECUTE stmt; +DEALLOCATE PREPARE stmt; diff --git a/mysql8_edx_fix/add_verify_student_constraint.sql b/mysql8_edx_fix/add_verify_student_constraint.sql new file mode 100644 index 0000000000..6fbb392b9b --- /dev/null +++ b/mysql8_edx_fix/add_verify_student_constraint.sql @@ -0,0 +1,20 @@ +USE edxapp; + +-- Check if the constraint already exists +SET @index_exists := ( + SELECT COUNT(*) FROM information_schema.statistics + WHERE table_schema = 'edxapp' + AND table_name = 'verify_student_skippedreverification' + AND index_name = 'unique_skippedreverification' +); + +-- Add the constraint only if it's missing +SET @ddl := IF( + @index_exists = 0, + 'ALTER TABLE verify_student_skippedreverification ADD UNIQUE INDEX unique_skippedreverification (user_id, course_id);', + 'SELECT "Constraint already exists"' +); + +PREPARE stmt FROM @ddl; +EXECUTE stmt; +DEALLOCATE PREPARE stmt; diff --git a/programs/provision.sh b/programs/provision.sh index 8ce3d1567a..c6a6aebe75 100755 --- a/programs/provision.sh +++ b/programs/provision.sh @@ -42,7 +42,7 @@ docker_exec() { /edx/app/$app/$repo/manage.py $cmd " - docker-compose exec "$service" bash -c "$CMDS" + docker compose exec "$service" bash -c "$CMDS" } provision_ida() { diff --git a/progs.mk b/progs.mk old mode 100644 new mode 100755 index 0eabe7b2ea..ca8ee15fda --- a/progs.mk +++ b/progs.mk @@ -32,37 +32,37 @@ progs.pushimage: docker push eu.gcr.io/openedx-231314/edraak/progs progs.migrate: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py migrate --settings=edraakprograms.dev + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py migrate --settings=edraakprograms.dev progs.langs_push: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py langs_push --settings=edraakprograms.dev + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py langs_push --settings=edraakprograms.dev progs.langs_pull: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py langs_pull --settings=edraakprograms.dev + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py langs_pull --settings=edraakprograms.dev progs.install_pip: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs pip install -r requirements.txt + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs pip install -r requirements.txt progs.install_npm: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm install + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm install progs.copy_cache: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs cp -Rnv /cache/node_modules /cache/.compiled /app + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs cp -Rnv /cache/node_modules /cache/.compiled /app progs.dev: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev progs.watch: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev:watch + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev:watch progs.install_all: | progs.install_pip progs.install_npm progs.dev progs.migrate progs.watch_js: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev:watch + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev:watch progs.watch_css: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run watch-scss + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run watch-scss progs.fix-npm: - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'chown -R root ~/.npm' + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'chown -R root ~/.npm' diff --git a/provision-b2b.sh b/provision-b2b.sh index 28ab550882..749538c90c 100755 --- a/provision-b2b.sh +++ b/provision-b2b.sh @@ -1,29 +1,29 @@ set -e echo "** bring b2b container up **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d b2b +docker compose `echo ${DOCKER_COMPOSE_FILES}` up -d b2b echo "** Creating databases **" echo "CREATE DATABASE IF NOT EXISTS b2b;" | docker exec -i edx.devstack.mysql mysql -uroot mysql echo "** b2b: Setting correct python version **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1' echo "** b2b: Copy cacheed files to code dir **" -#docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'cp -Rn /cache/* /app/.' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'pip install -r requirements.txt' +#docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'cp -Rn /cache/* /app/.' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'pip install -r requirements.txt' echo "** b2b: Migrating databases **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'python manage.py migrate --settings=edraakprograms.dev' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'python manage.py migrate --settings=edraakprograms.dev' echo "** b2b: Compiling assets **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm rebuild node-sass' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'chown -R root ~/.npm' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'rm -rf node_modules/' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm install' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm run dev' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm rebuild node-sass' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'chown -R root ~/.npm' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'rm -rf node_modules/' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm install' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm run dev' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev' echo "** b2b: Restarting **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` restart b2b +docker compose `echo ${DOCKER_COMPOSE_FILES}` restart b2b diff --git a/provision-forum.sh b/provision-forum.sh index 793a799b73..1405b2d6ff 100755 --- a/provision-forum.sh +++ b/provision-forum.sh @@ -2,5 +2,5 @@ set -e set -o pipefail set -x -docker-compose $DOCKER_COMPOSE_FILES up -d forum -docker-compose exec forum bash -c 'source /edx/app/forum/ruby_env && cd /edx/app/forum/cs_comments_service && bundle install --deployment --path /edx/app/forum/.gem/' +docker compose $DOCKER_COMPOSE_FILES up -d forum +docker compose exec forum bash -c 'source /edx/app/forum/ruby_env && cd /edx/app/forum/cs_comments_service && bundle install --deployment --path /edx/app/forum/.gem/' diff --git a/provision-lms.sh b/provision-lms.sh index 3c4eb8b777..e1553f338d 100755 --- a/provision-lms.sh +++ b/provision-lms.sh @@ -16,35 +16,46 @@ docker exec -i edx.devstack.mongo mongosh < mongo-provision.js # Bring edxapp containers online for app in "${apps[@]}"; do echo ${DOCKER_COMPOSE_FILES} - docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d $app + docker compose `echo ${DOCKER_COMPOSE_FILES}` up -d $app done echo ${DOCKER_COMPOSE_FILES} -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && NO_PYTHON_UNINSTALL=1 NO_PREREQ_INSTALL=0 paver install_prereqs' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && NO_PYTHON_UNINSTALL=1 NO_PREREQ_INSTALL=0 paver install_prereqs' + +docker cp ./mysql8_edx_fix/add_replace_sensitive_column.sql edx.devstack.mysql:/add_replace_sensitive_column.sql +docker compose exec mysql bash -c "mysql -u root edxapp < /add_replace_sensitive_column.sql" +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && python manage.py lms migrate enterprise 0042 --fake --settings=devstack_docker' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && python manage.py lms migrate enterprise 0046 --fake --settings=devstack_docker' + +docker cp ./mysql8_edx_fix/add_verify_student_constraint.sql edx.devstack.mysql:/add_verify_student_constraint.sql +docker compose exec mysql bash -c "mysql -u root edxapp < /add_verify_student_constraint.sql" +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && python manage.py lms migrate verify_student 0006 --fake --settings=devstack_docker' + + # Run edxapp migrations first since they are needed for the service users and OAuth clients -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_db --settings devstack_docker' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_db --settings devstack_docker' # Create a superuser for edxapp -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user edx edx@example.com --superuser --staff' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && echo "from django.contrib.auth import get_user_model; User = get_user_model(); user = User.objects.get(username=\"edx\"); user.set_password(\"edx\"); user.save()" | python /edx/app/edxapp/edx-platform/manage.py lms shell --settings=devstack_docker' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user edx edx@example.com --superuser --staff' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && echo "from django.contrib.auth import get_user_model; User = get_user_model(); user = User.objects.get(username=\"edx\"); user.set_password(\"edx\"); user.save()" | python /edx/app/edxapp/edx-platform/manage.py lms shell --settings=devstack_docker' # Create an enterprise service user for edxapp -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user enterprise_worker enterprise_worker@example.com' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user enterprise_worker enterprise_worker@example.com' # Enable the LMS-E-Commerce integration -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker configure_commerce' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker configure_commerce' # Create demo course and users -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c '/edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook /edx/app/edx_ansible/edx_ansible/playbooks/demo.yml -v -c local -i "127.0.0.1," --extra-vars="COMMON_EDXAPP_SETTINGS=devstack_docker"' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c '/edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook /edx/app/edx_ansible/edx_ansible/playbooks/demo.yml -v -c local -i "127.0.0.1," --extra-vars="COMMON_EDXAPP_SETTINGS=devstack_docker"' # Fix missing vendor file by clearing the cache -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'rm /edx/app/edxapp/edx-platform/.prereqs_cache/Node_prereqs.sha1' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'rm /edx/app/edxapp/edx-platform/.prereqs_cache/Node_prereqs.sha1' # Create static assets for both LMS and Studio for app in "${apps[@]}"; do - docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec $app bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_assets --settings devstack_docker' + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec $app bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_assets --settings devstack_docker' done # Provision a retirement service account user diff --git a/provision-mktg.sh b/provision-mktg.sh index acafa4eaa2..fdf4d638cf 100755 --- a/provision-mktg.sh +++ b/provision-mktg.sh @@ -1,22 +1,22 @@ set -e echo "** Bring Marketing up **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d mktg +docker compose `echo ${DOCKER_COMPOSE_FILES}` up -d mktg echo "** Creating databases **" -echo "CREATE DATABASE IF NOT EXISTS marketingsite;" | docker exec -i edx.devstack.mysql8 mysql -uroot mysql +echo "CREATE DATABASE IF NOT EXISTS marketingsite;" | docker exec -i edx.devstack.mysql mysql -uroot mysql echo "** Marketing: Copy cacheed files to code dir **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'cp -Rn /cache/* /app/.' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'pip3 install -r requirements.txt' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'cp -Rn /cache/* /app/.' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'pip3 install -r requirements.txt' echo "** Marketing: Migrating databases **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python3.8 manage.py migrate --settings=marketingsite.envs.dev' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python3.8 manage.py migrate --settings=marketingsite.envs.dev' echo "** Marketing: Compiling assets **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'rm -rf node_modules/' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'yarn' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'npm run dev' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'rm -rf node_modules/' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'yarn' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'npm run dev' echo "** Marketing: Restarting **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` restart mktg +docker compose `echo ${DOCKER_COMPOSE_FILES}` restart mktg diff --git a/provision-progs.sh b/provision-progs.sh index 93f583e40c..e9cd061c64 100755 --- a/provision-progs.sh +++ b/provision-progs.sh @@ -1,30 +1,30 @@ set -e echo "** Bring progs up **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d progs +docker compose `echo ${DOCKER_COMPOSE_FILES}` up -d progs echo "** Creating databases **" -echo "CREATE DATABASE IF NOT EXISTS edraakprograms;" | docker exec -i edx.devstack.mysql8 mysql -uroot mysql +echo "CREATE DATABASE IF NOT EXISTS edraakprograms;" | docker exec -i edx.devstack.mysql mysql -uroot mysql echo "** Progs: Setting correct python version **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1' echo "** Progs: Copy cacheed files to code dir **" -#docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'cp -Rn /cache/* /app/.' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'pip3 install -r requirements.txt' +#docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'cp -Rn /cache/* /app/.' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'pip3 install -r requirements.txt' echo "** Progs: Migrating databases **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python3.8 manage.py migrate --settings=edraakprograms.dev' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python3.8 manage.py migrate --settings=edraakprograms.dev' echo "** Progs: Compiling assets **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm rebuild node-sass' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'chown -R root ~/.npm' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'rm -rf node_modules/' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm install' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm rebuild node-sass' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'chown -R root ~/.npm' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'rm -rf node_modules/' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm install' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm run dev' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.static' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm run dev' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.static' echo "** Progs: Restarting **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` restart progs +docker compose `echo ${DOCKER_COMPOSE_FILES}` restart progs diff --git a/provision-state-manager-api.sh b/provision-state-manager-api.sh index ff9b308d2a..fb94246e8e 100755 --- a/provision-state-manager-api.sh +++ b/provision-state-manager-api.sh @@ -1,8 +1,8 @@ set -e echo "** state-manager-api: starting **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d state-manager-api -docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d state-manager-mysql +docker compose `echo ${DOCKER_COMPOSE_FILES}` up -d state-manager-api +docker compose `echo ${DOCKER_COMPOSE_FILES}` up -d state-manager-mysql echo "Waiting for state-manager-mysql" until docker exec -i edraak.devstack.state_manager_mysql mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null @@ -15,9 +15,9 @@ done sleep 5 echo "** state-manager-api: Create/Upgrade DB **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec state-manager-api bash -c 'flask create-db' -docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec state-manager-api bash -c 'flask db upgrade' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec state-manager-api bash -c 'flask create-db' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec state-manager-api bash -c 'flask db upgrade' echo "** state-manager-api: Restarting **" -docker-compose `echo ${DOCKER_COMPOSE_FILES}` restart state-manager-api +docker compose `echo ${DOCKER_COMPOSE_FILES}` restart state-manager-api diff --git a/provision.sh b/provision.sh index 7cfbbf2e81..9137444d7a 100755 --- a/provision.sh +++ b/provision.sh @@ -23,7 +23,7 @@ if [ "$MOUNT_TYPE" = "-nfs" ]; then fi # Bring the databases online. -docker-compose up -d mysql mongo mysql8 +docker compose up -d mysql mongo # Ensure the MySQL server is online and usable echo "Waiting for MySQL" @@ -33,12 +33,12 @@ do sleep 1 done -echo "Waiting for MySQL8" -until docker exec -i edx.devstack.mysql8 mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null -do - printf "." - sleep 1 -done +#echo "Waiting for MySQL8" +#until docker exec -i edx.devstack.mysql8 mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null +#do +# printf "." +# sleep 1 +#done # In the event of a fresh MySQL container, wait a few seconds for the server to restart # This can be removed once https://github.com/docker-library/mysql/issues/245 is resolved. @@ -52,7 +52,7 @@ echo -e "MySQL ready" if $ENABLE_EDX; then ./provision-lms.sh # Nothing special needed for studio - docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio + docker compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio fi diff --git a/provision.sql b/provision.sql old mode 100644 new mode 100755 index 60692a4f42..cb25769f16 --- a/provision.sql +++ b/provision.sql @@ -1,21 +1,27 @@ CREATE DATABASE IF NOT EXISTS credentials; -GRANT ALL ON credentials.* TO 'credentials001'@'%' IDENTIFIED BY 'password'; +CREATE USER IF NOT EXISTS 'credentials001'@'%' IDENTIFIED WITH mysql_native_password BY 'password'; +GRANT ALL ON credentials.* TO 'credentials001'@'%'; CREATE DATABASE IF NOT EXISTS discovery; -GRANT ALL ON discovery.* TO 'discov001'@'%' IDENTIFIED BY 'password'; +CREATE USER IF NOT EXISTS 'discov001'@'%' IDENTIFIED WITH mysql_native_password BY 'password'; +GRANT ALL ON discovery.* TO 'discov001'@'%'; CREATE DATABASE IF NOT EXISTS ecommerce; -GRANT ALL ON ecommerce.* TO 'ecomm001'@'%' IDENTIFIED BY 'password'; +CREATE USER IF NOT EXISTS 'ecomm001'@'%' IDENTIFIED WITH mysql_native_password BY 'password'; +GRANT ALL ON ecommerce.* TO 'ecomm001'@'%'; CREATE DATABASE IF NOT EXISTS edxmktg; -GRANT ALL ON edxmktg.* TO 'edxmktg001'@'%' IDENTIFIED BY 'password'; +CREATE USER IF NOT EXISTS 'edxmktg001'@'%' IDENTIFIED WITH mysql_native_password BY 'password'; +GRANT ALL ON edxmktg.* TO 'edxmktg001'@'%'; CREATE DATABASE IF NOT EXISTS notes; -GRANT ALL ON notes.* TO 'notes001'@'%' IDENTIFIED BY 'password'; +CREATE USER IF NOT EXISTS 'notes001'@'%' IDENTIFIED WITH mysql_native_password BY 'password'; +GRANT ALL ON notes.* TO 'notes001'@'%'; CREATE DATABASE IF NOT EXISTS edxapp; CREATE DATABASE IF NOT EXISTS edxapp_csmh; -GRANT ALL ON edxapp.* TO 'edxapp001'@'%' IDENTIFIED BY 'password'; +CREATE USER IF NOT EXISTS 'edxapp001'@'%' IDENTIFIED WITH mysql_native_password BY 'password'; +GRANT ALL ON edxapp.* TO 'edxapp001'@'%'; GRANT ALL ON edxapp_csmh.* TO 'edxapp001'@'%'; FLUSH PRIVILEGES; diff --git a/setup_native_nfs_docker_osx.sh b/setup_native_nfs_docker_osx.sh index 9a7d6fd93d..6abdab8d9a 100755 --- a/setup_native_nfs_docker_osx.sh +++ b/setup_native_nfs_docker_osx.sh @@ -39,7 +39,7 @@ open -a Docker while ! docker ps > /dev/null 2>&1 ; do sleep 2; done echo "== Stopping running docker containers..." -docker-compose down > /dev/null 2>&1 +docker compose down > /dev/null 2>&1 docker volume prune -f > /dev/null osascript -e 'quit app "Docker"' From d6d63033c73d568a922fded45964bd94ba8659f1 Mon Sep 17 00:00:00 2001 From: qrawashdeh Date: Wed, 18 Jun 2025 14:32:47 +0300 Subject: [PATCH 17/25] docker build for m chips and disable studio and devpi --- docker-compose-auth-provider.yml | 2 +- docker-compose-edx.yml | 80 ++++++++++++++++---------------- docker-compose-mktg.yml | 2 +- docker-compose-progs.yml | 2 +- docker-compose.yml | 24 +++++----- provision-lms.sh | 2 +- provision.sh | 2 +- 7 files changed, 57 insertions(+), 57 deletions(-) diff --git a/docker-compose-auth-provider.yml b/docker-compose-auth-provider.yml index 994a9bce70..3a58cde46c 100755 --- a/docker-compose-auth-provider.yml +++ b/docker-compose-auth-provider.yml @@ -12,7 +12,7 @@ version: '3.3' services: auth-provider: - image: eu.gcr.io/openedx-231314/edraak/auth.provider:v1.0 + image: eu.gcr.io/openedx-231314/edraak/auth.provider:20250617-113934-m container_name: edraak.devstack.auth.provider environment: NO_PYTHON_UNINSTALL: 1 diff --git a/docker-compose-edx.yml b/docker-compose-edx.yml index 2b92fdda09..ffb2261705 100755 --- a/docker-compose-edx.yml +++ b/docker-compose-edx.yml @@ -17,7 +17,7 @@ services: command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py lms runserver 0.0.0.0:18000 --settings devstack_docker; sleep 2; done' container_name: edx.devstack.lms depends_on: - - devpi + #- devpi - mysql - memcached - mongo @@ -44,36 +44,36 @@ services: - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached - ~/.ssh/:/root/.ssh - studio: - command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py cms runserver 0.0.0.0:18010 --settings devstack_docker; sleep 200000; done' - container_name: edx.devstack.studio - depends_on: - - devpi - - mysql - - memcached - - mongo - # Allows attachment to the Studio service using 'docker attach '. - stdin_open: true - tty: true - environment: - BOK_CHOY_HOSTNAME: edx.devstack.studio - BOK_CHOY_LMS_PORT: 18103 - BOK_CHOY_CMS_PORT: 18131 - EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo - NO_PYTHON_UNINSTALL: 0 - NO_PREREQ_INSTALL: 0 - image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3.2 - ports: - - "18010:18010" - - "19877:19877" # JS test debugging - - "18103:18103" - - "18131:18131" - volumes: - - edxapp_studio_assets:/edx/var/edxapp/staticfiles/ - - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached - - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules - - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached - - ~/.ssh/:/root/.ssh +# studio: +# command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py cms runserver 0.0.0.0:18010 --settings devstack_docker; sleep 200000; done' +# container_name: edx.devstack.studio +# depends_on: +# - devpi +# - mysql +# - memcached +# - mongo +# # Allows attachment to the Studio service using 'docker attach '. +# stdin_open: true +# tty: true +# environment: +# BOK_CHOY_HOSTNAME: edx.devstack.studio +# BOK_CHOY_LMS_PORT: 18103 +# BOK_CHOY_CMS_PORT: 18131 +# EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo +# NO_PYTHON_UNINSTALL: 0 +# NO_PREREQ_INSTALL: 0 +# image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3.2 +# ports: +# - "18010:18010" +# - "19877:19877" # JS test debugging +# - "18103:18103" +# - "18131:18131" +# volumes: +# - edxapp_studio_assets:/edx/var/edxapp/staticfiles/ +# - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached +# - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules +# - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached +# - ~/.ssh/:/root/.ssh # forum: # command: bash -c 'source /edx/app/forum/ruby_env && source /edx/app/forum/devstack_forum_env && cd /edx/app/forum/cs_comments_service && bundle install && while true; do ruby app.rb -o 0.0.0.0 ; sleep 200000; done' @@ -89,19 +89,19 @@ services: # - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached # - ~/.ssh/:/root/.ssh - devpi: - container_name: edx.devstack.devpi - image: edxops/devpi:${OPENEDX_RELEASE:-latest} - ports: - - "3141:3141" - volumes: - - devpi_data:/data +# devpi: +# container_name: edx.devstack.devpi +# image: edxops/devpi:${OPENEDX_RELEASE:-latest} +# ports: +# - "3141:3141" +# volumes: +# - devpi_data:/data router: depends_on: - lms - - studio + #- studio # - mktg - progs volumes: @@ -110,5 +110,5 @@ services: volumes: edxapp_lms_assets: - edxapp_studio_assets: + #edxapp_studio_assets: edxapp_node_modules: diff --git a/docker-compose-mktg.yml b/docker-compose-mktg.yml index b61f45466e..b294723dfd 100755 --- a/docker-compose-mktg.yml +++ b/docker-compose-mktg.yml @@ -13,7 +13,7 @@ version: '3.3' services: mktg: - image: eu.gcr.io/openedx-231314/edraak/marketing + image: eu.gcr.io/openedx-231314/edraak/marketing:20250519-122918-m environment: NODE_ENV: development command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8500 --settings=marketingsite.envs.dev; sleep 2; done' diff --git a/docker-compose-progs.yml b/docker-compose-progs.yml index 37e306ae8e..83583ba064 100755 --- a/docker-compose-progs.yml +++ b/docker-compose-progs.yml @@ -13,7 +13,7 @@ version: '3.3' services: progs: - image: eu.gcr.io/openedx-231314/edraak/progs + image: eu.gcr.io/openedx-231314/edraak/progs:20250519-123649-m environment: PROGS_CFG: /app/docker.json NODE_ENV: development diff --git a/docker-compose.yml b/docker-compose.yml index ada91d9021..65428d9a6f 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,19 +12,19 @@ version: '3.3' services: - elasticsearch: - container_name: edx.devstack.elasticsearch - image: edxops/elasticsearch:devstack - ports: - - "9200:9200" - - "9300:9300" - volumes: - - elasticsearch_data:/usr/share/elasticsearch/datamake - - elasticsearch_data:/usr/share/elasticsearch/logs +# elasticsearch: +# container_name: edx.devstack.elasticsearch +# image: edxops/elasticsearch:devstack +# ports: +# - "9200:9200" +# - "9300:9300" +# volumes: +# - elasticsearch_data:/usr/share/elasticsearch/datamake +# - elasticsearch_data:/usr/share/elasticsearch/logs memcached: container_name: edx.devstack.memcached - image: memcached:1.4 + image: memcached:1.6 ports: - "11211:11211" @@ -90,7 +90,7 @@ services: - auth.edraak.dev volumes: - elasticsearch_data: + #elasticsearch_data: mongo_data: mysql_data: - devpi_data: + #devpi_data: diff --git a/provision-lms.sh b/provision-lms.sh index e1553f338d..844ac56522 100755 --- a/provision-lms.sh +++ b/provision-lms.sh @@ -2,7 +2,7 @@ set -e set -o pipefail set -x -apps=( lms studio ) +apps=( lms ) echo "** Edx **" echo -e "${GREEN}Creating databases and users...${NC}" diff --git a/provision.sh b/provision.sh index 9137444d7a..823bbe1187 100755 --- a/provision.sh +++ b/provision.sh @@ -52,7 +52,7 @@ echo -e "MySQL ready" if $ENABLE_EDX; then ./provision-lms.sh # Nothing special needed for studio - docker compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio + #docker compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio fi From c410cc61c32839d96fb36b862ca236dc77499572 Mon Sep 17 00:00:00 2001 From: qrawashdeh Date: Sun, 22 Jun 2025 11:23:44 +0300 Subject: [PATCH 18/25] change to the images that works on Intel and M series --- docker-compose-auth-provider.yml | 2 +- docker-compose-mktg.yml | 2 +- docker-compose-progs.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose-auth-provider.yml b/docker-compose-auth-provider.yml index 3a58cde46c..a66eb014db 100755 --- a/docker-compose-auth-provider.yml +++ b/docker-compose-auth-provider.yml @@ -12,7 +12,7 @@ version: '3.3' services: auth-provider: - image: eu.gcr.io/openedx-231314/edraak/auth.provider:20250617-113934-m + image: eu.gcr.io/openedx-231314/edraak/auth.provider:20250618-160217-m container_name: edraak.devstack.auth.provider environment: NO_PYTHON_UNINSTALL: 1 diff --git a/docker-compose-mktg.yml b/docker-compose-mktg.yml index b294723dfd..1c8c7d5cb5 100755 --- a/docker-compose-mktg.yml +++ b/docker-compose-mktg.yml @@ -13,7 +13,7 @@ version: '3.3' services: mktg: - image: eu.gcr.io/openedx-231314/edraak/marketing:20250519-122918-m + image: eu.gcr.io/openedx-231314/edraak/marketing:20250618-153829-m environment: NODE_ENV: development command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8500 --settings=marketingsite.envs.dev; sleep 2; done' diff --git a/docker-compose-progs.yml b/docker-compose-progs.yml index 83583ba064..ef737ac043 100755 --- a/docker-compose-progs.yml +++ b/docker-compose-progs.yml @@ -13,7 +13,7 @@ version: '3.3' services: progs: - image: eu.gcr.io/openedx-231314/edraak/progs:20250519-123649-m + image: eu.gcr.io/openedx-231314/edraak/progs:20250618-155233-m environment: PROGS_CFG: /app/docker.json NODE_ENV: development From 446548659d3bea60207ca8cf42a12a605d1c0511 Mon Sep 17 00:00:00 2001 From: hmalabehqrf Date: Wed, 2 Jul 2025 11:12:41 +0300 Subject: [PATCH 19/25] cleanup --- docker-compose-edx.yml | 18 +++++++++++++++--- docker-compose.yml | 20 ++++++-------------- provision.sh | 7 ------- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/docker-compose-edx.yml b/docker-compose-edx.yml index ffb2261705..d2fbb5f483 100755 --- a/docker-compose-edx.yml +++ b/docker-compose-edx.yml @@ -44,6 +44,8 @@ services: - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached - ~/.ssh/:/root/.ssh +# This been commented out cuz it's no longer needed in the local development +# # studio: # command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py cms runserver 0.0.0.0:18010 --settings devstack_docker; sleep 200000; done' # container_name: edx.devstack.studio @@ -75,6 +77,8 @@ services: # - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached # - ~/.ssh/:/root/.ssh +# This been commented out cuz it's no longer needed in the local development +# # forum: # command: bash -c 'source /edx/app/forum/ruby_env && source /edx/app/forum/devstack_forum_env && cd /edx/app/forum/cs_comments_service && bundle install && while true; do ruby app.rb -o 0.0.0.0 ; sleep 200000; done' # container_name: edx.devstack.forum @@ -89,6 +93,8 @@ services: # - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached # - ~/.ssh/:/root/.ssh +# This been commented out cuz it's no longer needed in the local development +# # devpi: # container_name: edx.devstack.devpi # image: edxops/devpi:${OPENEDX_RELEASE:-latest} @@ -101,14 +107,20 @@ services: router: depends_on: - lms - #- studio -# - mktg - progs + +# This been commented out cuz it's no longer needed in the local development +# +# - studio +# - mktg volumes: - ./nginx/edx.conf:/etc/nginx/conf.d/edx.conf volumes: edxapp_lms_assets: - #edxapp_studio_assets: edxapp_node_modules: + + # This been commented out cuz it's no longer needed in the local development + # + #edxapp_studio_assets: diff --git a/docker-compose.yml b/docker-compose.yml index 65428d9a6f..a003aff624 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,6 +12,8 @@ version: '3.3' services: +# This been commented out cuz it's no longer needed in the local development +# # elasticsearch: # container_name: edx.devstack.elasticsearch # image: edxops/elasticsearch:devstack @@ -38,18 +40,6 @@ services: volumes: - mongo_data:/data/db -# mysql: -# command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci -# container_name: edx.devstack.mysql -# environment: -# MYSQL_ROOT_PASSWORD: "" -# MYSQL_ALLOW_EMPTY_PASSWORD: "yes" -# image: mysql:5.7 -# ports: -# - "3306:3306" -# volumes: -# - mysql_data:/var/lib/mysql - mysql: command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci --default-authentication-plugin=mysql_native_password container_name: edx.devstack.mysql @@ -90,7 +80,9 @@ services: - auth.edraak.dev volumes: - #elasticsearch_data: mongo_data: mysql_data: - #devpi_data: +# This been commented out cuz it's no longer needed in the local development +# +# elasticsearch_data: +# devpi_data: diff --git a/provision.sh b/provision.sh index 823bbe1187..977330ab44 100755 --- a/provision.sh +++ b/provision.sh @@ -33,13 +33,6 @@ do sleep 1 done -#echo "Waiting for MySQL8" -#until docker exec -i edx.devstack.mysql8 mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null -#do -# printf "." -# sleep 1 -#done - # In the event of a fresh MySQL container, wait a few seconds for the server to restart # This can be removed once https://github.com/docker-library/mysql/issues/245 is resolved. sleep 10 From 6d6bf9957472f7e6ae5f8c869b8161b0a9518548 Mon Sep 17 00:00:00 2001 From: HusamAjour Date: Mon, 25 Aug 2025 11:38:35 +0300 Subject: [PATCH 20/25] Renew the dev cert --- nginx/ssl/chained.crt | 72 +++++++++++++++++++++---------------------- nginx/ssl/private.key | 6 ++-- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt index 84b45dbb75..a28e54d465 100644 --- a/nginx/ssl/chained.crt +++ b/nginx/ssl/chained.crt @@ -1,48 +1,48 @@ -----BEGIN CERTIFICATE----- -MIIDjzCCAxagAwIBAgISBQQdx1YV2jrl7vwy9kZu0F1ZMAoGCCqGSM49BAMDMDIx +MIIDkjCCAxigAwIBAgISBU2yI22unsW/2Cmy7tkcSslIMAoGCCqGSM49BAMDMDIx CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF -NjAeFw0yNTA1MjcwNzAyNTJaFw0yNTA4MjUwNzAyNTFaMBcxFTATBgNVBAMMDCou -ZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABA5+Pxz7MDrXRhRa -u+jH0Gw0j4gjpuwn4vqf/YNwqyqEPLuhXLRbW1E4WC0eoZcNsFeTgvW+TAuNDNv5 -IDybR8GjggIlMIICITAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUH -AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFF8VjIHYJVwXXXNH -DeEndiY61EUTMB8GA1UdIwQYMBaAFJMnRpgDqVFojpjWxEJI2yO/WJTSMDIGCCsG -AQUFBwEBBCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL2U2LmkubGVuY3Iub3JnLzAj +NzAeFw0yNTA4MjUwNzM0MzBaFw0yNTExMjMwNzM0MjlaMBcxFTATBgNVBAMMDCou +ZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABN3crHaiPklqaEPj +F2+0elpUhHG4/juhZd4PjJJ0dktpXxdOHzgl1KbYCtoUSHC1MeFjafuciM1UJAe0 +8pObDpGjggInMIICIzAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUH +AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFC9A4F5mY4zvHy7i +aMwaLbQ0SXWEMB8GA1UdIwQYMBaAFK5IntyHHUSgb9qi5WB0BHjCnACAMDIGCCsG +AQUFBwEBBCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL2U3LmkubGVuY3Iub3JnLzAj BgNVHREEHDAaggwqLmVkcmFhay5kZXaCCmVkcmFhay5kZXYwEwYDVR0gBAwwCjAI -BgZngQwBAgEwLQYDVR0fBCYwJDAioCCgHoYcaHR0cDovL2U2LmMubGVuY3Iub3Jn -LzkwLmNybDCCAQMGCisGAQQB1nkCBAIEgfQEgfEA7wB1AN3cyjSV1+EWBeeVMvrH -n/g9HFDf2wA6FBJ2Ciysu8gqAAABlxDCrJIAAAQDAEYwRAIgVYY4OEPLlxpjN8C3 -XN+s+qXeKVfxk5W6TByPJSwvtbMCIHynieCHCSRUgPSeZKDEqBvx1NL2VPIxXr2v -XcoBBTwLAHYAzPsPaoVxCWX+lZtTzumyfCLphVwNl422qX5UwP5MDbAAAAGXEMK0 -NAAABAMARzBFAiEA9Z6W7H/VVm1aaaOLk+TbkD2g5RXNltrhDFJyvPYcCrQCIGEC -b2FWxzrxwAW3z3Ybrsw/f0rjVLkXJvpPOnZw+juRMAoGCCqGSM49BAMDA2cAMGQC -MCTIyIRGiZu9b0wPZK9hniYZDLHnliHhDLNCZEgqanCbaR3z8SWru35PjV2lyfLT -6QIwCe+tcjDzZ6jbkMe3esNGQ7CSMQ+KCSP0GnA/tUc3Fzd9iwIZ0kxM02qsvvH2 -sKuy +BgZngQwBAgEwLQYDVR0fBCYwJDAioCCgHoYcaHR0cDovL2U3LmMubGVuY3Iub3Jn +LzczLmNybDCCAQUGCisGAQQB1nkCBAIEgfYEgfMA8QB3AKRCxQZJYGFUjw/U6pz7 +ei0mRU2HqX8v30VZ9idPOoRUAAABmOBb+KkAAAQDAEgwRgIhAKYTMZp09bBKmdkN +58+3pSVoJN5Rsz8QgycqOmzcDkdTAiEA5FCi0LOI/9QabjrKTX/9/WrTOfdMteQs +RQud5Ob8H7wAdgDM+w9qhXEJZf6Vm1PO6bJ8IumFXA2XjbapflTA/kwNsAAAAZjg +W/jEAAAEAwBHMEUCICZyP559MOrIK/muOI2pjBouxGo6Pzwmov7jXF0gqLIgAiEA +hPyxqzq/7SoxPlFneAn8oWw8obk584ziDQ4E024xgXIwCgYIKoZIzj0EAwMDaAAw +ZQIwRPCgJjL3b022Nx6J+TdthLMOaIugaoeKiTxRV5KCTUdiGVa6hHUubE58M+oJ +DRcCAjEAwIY4xRF/QVCsxiV2B8oOK9i9gXLLF5AU10ebRxF4MXa0GGcKB2i4rCCc +ayd8FMGr -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEVzCCAj+gAwIBAgIRALBXPpFzlydw27SHyzpFKzgwDQYJKoZIhvcNAQELBQAw +MIIEVzCCAj+gAwIBAgIRAKp18eYrjwoiCWbTi7/UuqEwDQYJKoZIhvcNAQELBQAw TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg -RW5jcnlwdDELMAkGA1UEAxMCRTYwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATZ8Z5G -h/ghcWCoJuuj+rnq2h25EqfUJtlRFLFhfHWWvyILOR/VvtEKRqotPEoJhC6+QJVV -6RlAN2Z17TJOdwRJ+HB7wxjnzvdxEP6sdNgA1O1tHHMWMxCcOrLqbGL0vbijgfgw +RW5jcnlwdDELMAkGA1UEAxMCRTcwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARB6AST +CFh/vjcwDMCgQer+VtqEkz7JANurZxLP+U9TCeioL6sp5Z8VRvRbYk4P1INBmbef +QHJFHCxcSjKmwtvGBWpl/9ra8HW0QDsUaJW2qOJqceJ0ZVFT3hbUHifBM/2jgfgw gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD -ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSTJ0aYA6lRaI6Y1sRCSNsj -v1iU0jAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB +ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSuSJ7chx1EoG/aouVgdAR4 +wpwAgDAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu -Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAfYt7SiA1sgWGCIpunk46r4AExIRc -MxkKgUhNlrrv1B21hOaXN/5miE+LOTbrcmU/M9yvC6MVY730GNFoL8IhJ8j8vrOL -pMY22OP6baS1k9YMrtDTlwJHoGby04ThTUeBDksS9RiuHvicZqBedQdIF65pZuhp -eDcGBcLiYasQr/EO5gxxtLyTmgsHSOVSBcFOn9lgv7LECPq9i7mfH3mpxgrRKSxH -pOoZ0KXMcB+hHuvlklHntvcI0mMMQ0mhYj6qtMFStkF1RpCG3IPdIwpVCQqu8GV7 -s8ubknRzs+3C/Bm19RFOoiPpDkwvyNfvmQ14XkyqqKK5oZ8zhD32kFRQkxa8uZSu -h4aTImFxknu39waBxIRXE4jKxlAmQc4QjFZoq1KmQqQg0J/1JF8RlFvJas1VcjLv -YlvUB2t6npO6oQjB3l+PNf0DpQH7iUx3Wz5AjQCi6L25FjyE06q6BZ/QlmtYdl/8 -ZYao4SRqPEs/6cAiF+Qf5zg2UkaWtDphl1LKMuTNLotvsX99HP69V2faNyegodQ0 -LyTApr/vT01YPE46vNsDLgK+4cL6TrzC/a4WcmF5SRJ938zrv/duJHLXQIku5v0+ -EwOy59Hdm0PT/Er/84dDV0CSjdR/2XuZM3kpysSKLgD1cKiDA+IRguODCxfO9cyY -Ig46v9mFmBvyH04= +Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAjx66fDdLk5ywFn3CzA1w1qfylHUD +aEf0QZpXcJseddJGSfbUUOvbNR9N/QQ16K1lXl4VFyhmGXDT5Kdfcr0RvIIVrNxF +h4lqHtRRCP6RBRstqbZ2zURgqakn/Xip0iaQL0IdfHBZr396FgknniRYFckKORPG +yM3QKnd66gtMst8I5nkRQlAg/Jb+Gc3egIvuGKWboE1G89NTsN9LTDD3PLj0dUMr +OIuqVjLB8pEC6yk9enrlrqjXQgkLEYhXzq7dLafv5Vkig6Gl0nuuqjqfp0Q1bi1o +yVNAlXe6aUXw92CcghC9bNsKEO1+M52YY5+ofIXlS/SEQbvVYYBLZ5yeiglV6t3S +M6H+vTG0aP9YHzLn/KVOHzGQfXDP7qM5tkf+7diZe7o2fw6O7IvN6fsQXEQQj8TJ +UXJxv2/uJhcuy/tSDgXwHM8Uk34WNbRT7zGTGkQRX0gsbjAea/jYAoWv0ZvQRwpq +Pe79D/i7Cep8qWnA+7AE/3B3S/3dEEYmc0lpe1366A/6GEgk3ktr9PEoQrLChs6I +tu3wnNLB2euC8IKGLQFpGtOO/2/hiAKjyajaBP25w1jF0Wl8Bbqne3uZ2q1GyPFJ +YRmT7/OXpmOH/FVLtwS+8ng1cAmpCujPwteJZNcDG0sF2n/sc0+SQf49fdyUK0ty ++VUwFj9tmWxyR/M= -----END CERTIFICATE----- diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key index f36114f636..9b2edcfc39 100644 --- a/nginx/ssl/private.key +++ b/nginx/ssl/private.key @@ -1,5 +1,5 @@ -----BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgV1FsDi5uRr39v9kQ -pIEowp1OmwzI7m9H2fol/MgsEuqhRANCAAQOfj8c+zA610YUWrvox9BsNI+II6bs -J+L6n/2DcKsqhDy7oVy0W1tROFgtHqGXDbBXk4L1vkwLjQzb+SA8m0fB +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgZ7Xe96u25s9+ygh0 +QcA4OZp0R6GzDJlJxOmJa6rRyq+hRANCAATd3Kx2oj5JamhD4xdvtHpaVIRxuP47 +oWXeD4ySdHZLaV8XTh84JdSm2AraFEhwtTHhY2n7nIjNVCQHtPKTmw6R -----END PRIVATE KEY----- From 94484ed83e67bf128dc44ee7371d521611f22a64 Mon Sep 17 00:00:00 2001 From: HusamAjour Date: Sun, 23 Nov 2025 11:38:22 +0300 Subject: [PATCH 21/25] Update SSL certificate --- nginx/ssl/chained.crt | 84 +++++++++++++++++++++---------------------- nginx/ssl/private.key | 6 ++-- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt index a28e54d465..cc9f2108f6 100644 --- a/nginx/ssl/chained.crt +++ b/nginx/ssl/chained.crt @@ -1,48 +1,48 @@ -----BEGIN CERTIFICATE----- -MIIDkjCCAxigAwIBAgISBU2yI22unsW/2Cmy7tkcSslIMAoGCCqGSM49BAMDMDIx +MIIDkzCCAxigAwIBAgISBStj03jNkC9tVx2W3TlU61I4MAoGCCqGSM49BAMDMDIx CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF -NzAeFw0yNTA4MjUwNzM0MzBaFw0yNTExMjMwNzM0MjlaMBcxFTATBgNVBAMMDCou -ZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABN3crHaiPklqaEPj -F2+0elpUhHG4/juhZd4PjJJ0dktpXxdOHzgl1KbYCtoUSHC1MeFjafuciM1UJAe0 -8pObDpGjggInMIICIzAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUH -AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFC9A4F5mY4zvHy7i -aMwaLbQ0SXWEMB8GA1UdIwQYMBaAFK5IntyHHUSgb9qi5WB0BHjCnACAMDIGCCsG -AQUFBwEBBCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL2U3LmkubGVuY3Iub3JnLzAj +ODAeFw0yNTExMjMwNzM1MjVaFw0yNjAyMjEwNzM1MjRaMBcxFTATBgNVBAMMDCou +ZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNs7Buu92wdfjXIQ +FoyPEvq5C7oeXx2L1YncgWvYMe5Ymct7bcSdhP4F2O3+FW+8Q0uBuoho1xlNFKl8 +zClyzUOjggInMIICIzAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUH +AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFB3+ihBmD/OU/jaC +0+PFboCBVDlsMB8GA1UdIwQYMBaAFI8NE6L2Ln7RUGwzGDhdWY4jcpHKMDIGCCsG +AQUFBwEBBCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL2U4LmkubGVuY3Iub3JnLzAj BgNVHREEHDAaggwqLmVkcmFhay5kZXaCCmVkcmFhay5kZXYwEwYDVR0gBAwwCjAI -BgZngQwBAgEwLQYDVR0fBCYwJDAioCCgHoYcaHR0cDovL2U3LmMubGVuY3Iub3Jn -LzczLmNybDCCAQUGCisGAQQB1nkCBAIEgfYEgfMA8QB3AKRCxQZJYGFUjw/U6pz7 -ei0mRU2HqX8v30VZ9idPOoRUAAABmOBb+KkAAAQDAEgwRgIhAKYTMZp09bBKmdkN -58+3pSVoJN5Rsz8QgycqOmzcDkdTAiEA5FCi0LOI/9QabjrKTX/9/WrTOfdMteQs -RQud5Ob8H7wAdgDM+w9qhXEJZf6Vm1PO6bJ8IumFXA2XjbapflTA/kwNsAAAAZjg -W/jEAAAEAwBHMEUCICZyP559MOrIK/muOI2pjBouxGo6Pzwmov7jXF0gqLIgAiEA -hPyxqzq/7SoxPlFneAn8oWw8obk584ziDQ4E024xgXIwCgYIKoZIzj0EAwMDaAAw -ZQIwRPCgJjL3b022Nx6J+TdthLMOaIugaoeKiTxRV5KCTUdiGVa6hHUubE58M+oJ -DRcCAjEAwIY4xRF/QVCsxiV2B8oOK9i9gXLLF5AU10ebRxF4MXa0GGcKB2i4rCCc -ayd8FMGr +BgZngQwBAgEwLQYDVR0fBCYwJDAioCCgHoYcaHR0cDovL2U4LmMubGVuY3Iub3Jn +LzU3LmNybDCCAQUGCisGAQQB1nkCBAIEgfYEgfMA8QB2AMs49xWJfIShRF9bwd37 +yW7ymlnNRwppBYWwyxTDFFjnAAABmq/ZKUQAAAQDAEcwRQIgMtX4A3z30bQGLlP8 +mbWoYWwBVVvlthqcyFn7kqhRsxUCIQDwQAMJgczX0pvRCrLuXWQ4ghq4IjqWhH44 +AuVtQumE6QB3AA5XlLzzrqk+MxssmQez95Dfm8I9cTIl3SGpJaxhxU4hAAABmq/Z +KS8AAAQDAEgwRgIhAOlhcixmpWt5kjLcvforx5lA0EM2enFP5CHC7tt8Wap3AiEA +lKoFwRBqv+fAWf90cxHduiiQiPQrIiKexqPmJyCahN8wCgYIKoZIzj0EAwMDaQAw +ZgIxAJV4f/mKlz4z2LULc9dnd6fG2nILfLTCjJAJWOfVCTADiCL31Pk9EnyqoPvg +08MucAIxAM7hcHyWeFjyFGIeuYfZq0lsXLEz4EU9ttYS3cWP/Fx2EK/3Pv7YtlPe +vFZBcYT6jQ== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEVzCCAj+gAwIBAgIRAKp18eYrjwoiCWbTi7/UuqEwDQYJKoZIhvcNAQELBQAw -TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh -cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw -WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg -RW5jcnlwdDELMAkGA1UEAxMCRTcwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARB6AST -CFh/vjcwDMCgQer+VtqEkz7JANurZxLP+U9TCeioL6sp5Z8VRvRbYk4P1INBmbef -QHJFHCxcSjKmwtvGBWpl/9ra8HW0QDsUaJW2qOJqceJ0ZVFT3hbUHifBM/2jgfgw -gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD -ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSuSJ7chx1EoG/aouVgdAR4 -wpwAgDAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB -AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g -BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu -Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAjx66fDdLk5ywFn3CzA1w1qfylHUD -aEf0QZpXcJseddJGSfbUUOvbNR9N/QQ16K1lXl4VFyhmGXDT5Kdfcr0RvIIVrNxF -h4lqHtRRCP6RBRstqbZ2zURgqakn/Xip0iaQL0IdfHBZr396FgknniRYFckKORPG -yM3QKnd66gtMst8I5nkRQlAg/Jb+Gc3egIvuGKWboE1G89NTsN9LTDD3PLj0dUMr -OIuqVjLB8pEC6yk9enrlrqjXQgkLEYhXzq7dLafv5Vkig6Gl0nuuqjqfp0Q1bi1o -yVNAlXe6aUXw92CcghC9bNsKEO1+M52YY5+ofIXlS/SEQbvVYYBLZ5yeiglV6t3S -M6H+vTG0aP9YHzLn/KVOHzGQfXDP7qM5tkf+7diZe7o2fw6O7IvN6fsQXEQQj8TJ -UXJxv2/uJhcuy/tSDgXwHM8Uk34WNbRT7zGTGkQRX0gsbjAea/jYAoWv0ZvQRwpq -Pe79D/i7Cep8qWnA+7AE/3B3S/3dEEYmc0lpe1366A/6GEgk3ktr9PEoQrLChs6I -tu3wnNLB2euC8IKGLQFpGtOO/2/hiAKjyajaBP25w1jF0Wl8Bbqne3uZ2q1GyPFJ -YRmT7/OXpmOH/FVLtwS+8ng1cAmpCujPwteJZNcDG0sF2n/sc0+SQf49fdyUK0ty -+VUwFj9tmWxyR/M= +MIIEVjCCAj6gAwIBAgIQY5WTY8JOcIJxWRi/w9ftVjANBgkqhkiG9w0BAQsFADBP +MQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFy +Y2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMTAeFw0yNDAzMTMwMDAwMDBa +Fw0yNzAzMTIyMzU5NTlaMDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBF +bmNyeXB0MQswCQYDVQQDEwJFODB2MBAGByqGSM49AgEGBSuBBAAiA2IABNFl8l7c +S7QMApzSsvru6WyrOq44ofTUOTIzxULUzDMMNMchIJBwXOhiLxxxs0LXeb5GDcHb +R6EToMffgSZjO9SNHfY9gjMy9vQr5/WWOrQTZxh7az6NSNnq3u2ubT6HTKOB+DCB +9TAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB +MBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFI8NE6L2Ln7RUGwzGDhdWY4j +cpHKMB8GA1UdIwQYMBaAFHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEB +BCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzATBgNVHSAE +DDAKMAgGBmeBDAECATAnBgNVHR8EIDAeMBygGqAYhhZodHRwOi8veDEuYy5sZW5j +ci5vcmcvMA0GCSqGSIb3DQEBCwUAA4ICAQBnE0hGINKsCYWi0Xx1ygxD5qihEjZ0 +RI3tTZz1wuATH3ZwYPIp97kWEayanD1j0cDhIYzy4CkDo2jB8D5t0a6zZWzlr98d +AQFNh8uKJkIHdLShy+nUyeZxc5bNeMp1Lu0gSzE4McqfmNMvIpeiwWSYO9w82Ob8 +otvXcO2JUYi3svHIWRm3+707DUbL51XMcY2iZdlCq4Wa9nbuk3WTU4gr6LY8MzVA +aDQG2+4U3eJ6qUF10bBnR1uuVyDYs9RhrwucRVnfuDj29CMLTsplM5f5wSV5hUpm +Uwp/vV7M4w4aGunt74koX71n4EdagCsL/Yk5+mAQU0+tue0JOfAV/R6t1k+Xk9s2 +HMQFeoxppfzAVC04FdG9M+AC2JWxmFSt6BCuh3CEey3fE52Qrj9YM75rtvIjsm/1 +Hl+u//Wqxnu1ZQ4jpa+VpuZiGOlWrqSP9eogdOhCGisnyewWJwRQOqK16wiGyZeR +xs/Bekw65vwSIaVkBruPiTfMOo0Zh4gVa8/qJgMbJbyrwwG97z/PRgmLKCDl8z3d +tA0Z7qq7fta0Gl24uyuB05dqI5J1LvAzKuWdIjT1tP8qCoxSE/xpix8hX2dt3h+/ +jujUgFPFZ0EVZ0xSyBNRF3MboGZnYXFUxpNjTWPKpagDHJQmqrAcDmWJnMsFY3jS +u1igv3OefnWjSQ== -----END CERTIFICATE----- diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key index 9b2edcfc39..a84417e1a8 100644 --- a/nginx/ssl/private.key +++ b/nginx/ssl/private.key @@ -1,5 +1,5 @@ -----BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgZ7Xe96u25s9+ygh0 -QcA4OZp0R6GzDJlJxOmJa6rRyq+hRANCAATd3Kx2oj5JamhD4xdvtHpaVIRxuP47 -oWXeD4ySdHZLaV8XTh84JdSm2AraFEhwtTHhY2n7nIjNVCQHtPKTmw6R +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgabDEaDqXqUOQDk6t +NVS1XsbKvNT+M2r/k14IkVW4uTOhRANCAATbOwbrvdsHX41yEBaMjxL6uQu6Hl8d +i9WJ3IFr2DHuWJnLe23EnYT+Bdjt/hVvvENLgbqIaNcZTRSpfMwpcs1D -----END PRIVATE KEY----- From 6961049e7a6e1794ce02c76570e00581d3dcc1d8 Mon Sep 17 00:00:00 2001 From: HusamAjour Date: Sun, 23 Nov 2025 11:38:39 +0300 Subject: [PATCH 22/25] Update some make commands --- mktg.mk | 2 +- progs.mk | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mktg.mk b/mktg.mk index 1eda295e8a..5b2c3d561b 100755 --- a/mktg.mk +++ b/mktg.mk @@ -54,7 +54,7 @@ mktg.dev: docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npm run dev mktg.watch: - docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npx gulp watch + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npx gulp watcher mktg.install_all: | mktg.install_pip mktg.install_npm mktg.dev mktg.migrate diff --git a/progs.mk b/progs.mk index ca8ee15fda..ca6931721e 100755 --- a/progs.mk +++ b/progs.mk @@ -34,6 +34,9 @@ progs.pushimage: progs.migrate: docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py migrate --settings=edraakprograms.dev +progs.makemigrations: + docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py makemigrations --settings=edraakprograms.dev + progs.langs_push: docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py langs_push --settings=edraakprograms.dev From eeca6e0d6fc57da974814f0d398a3ba7dfc1c10e Mon Sep 17 00:00:00 2001 From: hmalabehqrf Date: Sun, 30 Nov 2025 15:33:55 +0300 Subject: [PATCH 23/25] update_doc --- README.rst | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index ba8ec816af..d35c3ba013 100644 --- a/README.rst +++ b/README.rst @@ -115,7 +115,26 @@ sure you have the needed permission. gcloud auth login gcloud auth configure-docker -5. Run the provision command, if you haven't already, to configure the various +5. Clean up any Docker artifacts (containers, images, and volumes) to ensure a + fresh start. + + .. code:: sh + + docker system prune -a + + .. note:: + + The prune command removes all stopped containers, unused networks, + dangling images, and build cache. Review Docker's documentation if you + need to keep specific resources. + +6. Pull the required images. + + .. code:: sh + + make pull + +7. Run the provision command, if you haven't already, to configure the various services with superusers (for development without the auth service) and tenants (for multi-tenancy). @@ -132,7 +151,19 @@ sure you have the needed permission. make dev.provision -6. Start the services. This command will mount the repositories under the + .. note:: + + The first run of ``make dev.provision`` is expected to fail. After the + initial failure, update ``.env`` to disable EDX, then rerun the provision + command. When the migration finishes, stop any running containers before + starting the development stack again. + + .. code:: sh + + make dev.provision + make stop + +8. Start the services. This command will mount the repositories under the DEVSTACK\_WORKSPACE directory. **NOTE:** it may take up to 60 seconds for the LMS to start, even after the ``make dev.up`` command outputs ``done``. @@ -146,6 +177,31 @@ sure you have the needed permission. # .env file content +When copying the ``.env`` file for a fresh setup, it should resemble the +configuration below. Adjust service flags as needed—particularly +``ENABLE_EDX`` if you need to disable the service after the first migration +attempt. + +.. code:: sh + + ## env ## + PROGS_CFG=/app/docker.json + + # Change mount type to "-nfs" to enable nfs, otherwise leave it empty + MOUNT_TYPE= + + # Enable disable services + ENABLE_PROGS=true + ENABLE_B2B=false + ENABLE_MKTG=true + ENABLE_EDX=true + + ENABLE_STATE_MANAGER=false + ENABLE_JUDGE=false + ENABLE_ANALYTICS=false + ENABLE_AUTH=true + ENABLE_NOTIFIER=false + MOUNT_TYPE: set to -nfs to enable NFS support or leave empty to use default docker engine From 9bd78055ca122f2f3d25b9a6239969be527140bb Mon Sep 17 00:00:00 2001 From: HusamAjour Date: Mon, 23 Feb 2026 12:00:57 +0300 Subject: [PATCH 24/25] renew ssl cert for february 2026 --- nginx/ssl/chained.crt | 85 +++++++++++++++++++++---------------------- nginx/ssl/private.key | 6 +-- 2 files changed, 45 insertions(+), 46 deletions(-) diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt index cc9f2108f6..f1a74a21ef 100644 --- a/nginx/ssl/chained.crt +++ b/nginx/ssl/chained.crt @@ -1,48 +1,47 @@ -----BEGIN CERTIFICATE----- -MIIDkzCCAxigAwIBAgISBStj03jNkC9tVx2W3TlU61I4MAoGCCqGSM49BAMDMDIx +MIIDhjCCAwygAwIBAgISBkk3w7qzrw1RBhqqFGJQo3LQMAoGCCqGSM49BAMDMDIx CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF -ODAeFw0yNTExMjMwNzM1MjVaFw0yNjAyMjEwNzM1MjRaMBcxFTATBgNVBAMMDCou -ZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNs7Buu92wdfjXIQ -FoyPEvq5C7oeXx2L1YncgWvYMe5Ymct7bcSdhP4F2O3+FW+8Q0uBuoho1xlNFKl8 -zClyzUOjggInMIICIzAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUH -AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFB3+ihBmD/OU/jaC -0+PFboCBVDlsMB8GA1UdIwQYMBaAFI8NE6L2Ln7RUGwzGDhdWY4jcpHKMDIGCCsG -AQUFBwEBBCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL2U4LmkubGVuY3Iub3JnLzAj -BgNVHREEHDAaggwqLmVkcmFhay5kZXaCCmVkcmFhay5kZXYwEwYDVR0gBAwwCjAI -BgZngQwBAgEwLQYDVR0fBCYwJDAioCCgHoYcaHR0cDovL2U4LmMubGVuY3Iub3Jn -LzU3LmNybDCCAQUGCisGAQQB1nkCBAIEgfYEgfMA8QB2AMs49xWJfIShRF9bwd37 -yW7ymlnNRwppBYWwyxTDFFjnAAABmq/ZKUQAAAQDAEcwRQIgMtX4A3z30bQGLlP8 -mbWoYWwBVVvlthqcyFn7kqhRsxUCIQDwQAMJgczX0pvRCrLuXWQ4ghq4IjqWhH44 -AuVtQumE6QB3AA5XlLzzrqk+MxssmQez95Dfm8I9cTIl3SGpJaxhxU4hAAABmq/Z -KS8AAAQDAEgwRgIhAOlhcixmpWt5kjLcvforx5lA0EM2enFP5CHC7tt8Wap3AiEA -lKoFwRBqv+fAWf90cxHduiiQiPQrIiKexqPmJyCahN8wCgYIKoZIzj0EAwMDaQAw -ZgIxAJV4f/mKlz4z2LULc9dnd6fG2nILfLTCjJAJWOfVCTADiCL31Pk9EnyqoPvg -08MucAIxAM7hcHyWeFjyFGIeuYfZq0lsXLEz4EU9ttYS3cWP/Fx2EK/3Pv7YtlPe -vFZBcYT6jQ== +NzAeFw0yNjAyMjMwNzMyNDdaFw0yNjA1MjQwNzMyNDZaMBcxFTATBgNVBAMMDCou +ZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDiNe92BPQFPK/n4 ++OTF/IWAOcNJIk/frSDFu8IrQ1iRpAXu1dA5GWzuudITwXQ1MyWBOMfwuPdn84Oa +ghbMsHajggIbMIICFzAOBgNVHQ8BAf8EBAMCB4AwEwYDVR0lBAwwCgYIKwYBBQUH +AwEwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU1VkqMXdpoigpk1gq2s4UbKNhoEEw +HwYDVR0jBBgwFoAUrkie3IcdRKBv2qLlYHQEeMKcAIAwMgYIKwYBBQUHAQEEJjAk +MCIGCCsGAQUFBzAChhZodHRwOi8vZTcuaS5sZW5jci5vcmcvMCMGA1UdEQQcMBqC +DCouZWRyYWFrLmRldoIKZWRyYWFrLmRldjATBgNVHSAEDDAKMAgGBmeBDAECATAt +BgNVHR8EJjAkMCKgIKAehhxodHRwOi8vZTcuYy5sZW5jci5vcmcvODEuY3JsMIIB +AwYKKwYBBAHWeQIEAgSB9ASB8QDvAHUAyzj3FYl8hKFEX1vB3fvJbvKaWc1HCmkF +hbDLFMMUWOcAAAGciZ/OvAAABAMARjBEAiAVYoGTGP/V4tIL1R9hUWw8mV9iH9Z7 +MUM6TOgcKteJQAIgRLYGFIwOyIAOoyAU0M2FRpjGxVfsfjJsQ9ZGJaOD8JcAdgCW +l2S/VViXrfdDh2g3CEJ36fA61fak8zZuRqQ/D8qpxgAAAZyJn871AAAEAwBHMEUC +IDePzebmWLNbT8zzAIBLPocERfInRxX85hK64IO+cbdEAiEAsbV9qbhDTrAXii6c +GzSBSWey01MG/XJ4Db8zVvb0mOYwCgYIKoZIzj0EAwMDaAAwZQIwOSNql4rMtLfa +bTFYM4GM/KYQTTe3yG0I19TdnuZXQdB/RAHMct8CCUjId4ARTtf/AjEA2Jp4FVPI +AQ8ATL13r+FN7LFOVf4E0EKjCdTMrntzaJbM6XR7pWJknql49kKcUlhf -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEVjCCAj6gAwIBAgIQY5WTY8JOcIJxWRi/w9ftVjANBgkqhkiG9w0BAQsFADBP -MQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFy -Y2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMTAeFw0yNDAzMTMwMDAwMDBa -Fw0yNzAzMTIyMzU5NTlaMDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBF -bmNyeXB0MQswCQYDVQQDEwJFODB2MBAGByqGSM49AgEGBSuBBAAiA2IABNFl8l7c -S7QMApzSsvru6WyrOq44ofTUOTIzxULUzDMMNMchIJBwXOhiLxxxs0LXeb5GDcHb -R6EToMffgSZjO9SNHfY9gjMy9vQr5/WWOrQTZxh7az6NSNnq3u2ubT6HTKOB+DCB -9TAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB -MBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFI8NE6L2Ln7RUGwzGDhdWY4j -cpHKMB8GA1UdIwQYMBaAFHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEB -BCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzATBgNVHSAE -DDAKMAgGBmeBDAECATAnBgNVHR8EIDAeMBygGqAYhhZodHRwOi8veDEuYy5sZW5j -ci5vcmcvMA0GCSqGSIb3DQEBCwUAA4ICAQBnE0hGINKsCYWi0Xx1ygxD5qihEjZ0 -RI3tTZz1wuATH3ZwYPIp97kWEayanD1j0cDhIYzy4CkDo2jB8D5t0a6zZWzlr98d -AQFNh8uKJkIHdLShy+nUyeZxc5bNeMp1Lu0gSzE4McqfmNMvIpeiwWSYO9w82Ob8 -otvXcO2JUYi3svHIWRm3+707DUbL51XMcY2iZdlCq4Wa9nbuk3WTU4gr6LY8MzVA -aDQG2+4U3eJ6qUF10bBnR1uuVyDYs9RhrwucRVnfuDj29CMLTsplM5f5wSV5hUpm -Uwp/vV7M4w4aGunt74koX71n4EdagCsL/Yk5+mAQU0+tue0JOfAV/R6t1k+Xk9s2 -HMQFeoxppfzAVC04FdG9M+AC2JWxmFSt6BCuh3CEey3fE52Qrj9YM75rtvIjsm/1 -Hl+u//Wqxnu1ZQ4jpa+VpuZiGOlWrqSP9eogdOhCGisnyewWJwRQOqK16wiGyZeR -xs/Bekw65vwSIaVkBruPiTfMOo0Zh4gVa8/qJgMbJbyrwwG97z/PRgmLKCDl8z3d -tA0Z7qq7fta0Gl24uyuB05dqI5J1LvAzKuWdIjT1tP8qCoxSE/xpix8hX2dt3h+/ -jujUgFPFZ0EVZ0xSyBNRF3MboGZnYXFUxpNjTWPKpagDHJQmqrAcDmWJnMsFY3jS -u1igv3OefnWjSQ== +MIIEVzCCAj+gAwIBAgIRAKp18eYrjwoiCWbTi7/UuqEwDQYJKoZIhvcNAQELBQAw +TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh +cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw +WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg +RW5jcnlwdDELMAkGA1UEAxMCRTcwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARB6AST +CFh/vjcwDMCgQer+VtqEkz7JANurZxLP+U9TCeioL6sp5Z8VRvRbYk4P1INBmbef +QHJFHCxcSjKmwtvGBWpl/9ra8HW0QDsUaJW2qOJqceJ0ZVFT3hbUHifBM/2jgfgw +gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD +ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSuSJ7chx1EoG/aouVgdAR4 +wpwAgDAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB +AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g +BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu +Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAjx66fDdLk5ywFn3CzA1w1qfylHUD +aEf0QZpXcJseddJGSfbUUOvbNR9N/QQ16K1lXl4VFyhmGXDT5Kdfcr0RvIIVrNxF +h4lqHtRRCP6RBRstqbZ2zURgqakn/Xip0iaQL0IdfHBZr396FgknniRYFckKORPG +yM3QKnd66gtMst8I5nkRQlAg/Jb+Gc3egIvuGKWboE1G89NTsN9LTDD3PLj0dUMr +OIuqVjLB8pEC6yk9enrlrqjXQgkLEYhXzq7dLafv5Vkig6Gl0nuuqjqfp0Q1bi1o +yVNAlXe6aUXw92CcghC9bNsKEO1+M52YY5+ofIXlS/SEQbvVYYBLZ5yeiglV6t3S +M6H+vTG0aP9YHzLn/KVOHzGQfXDP7qM5tkf+7diZe7o2fw6O7IvN6fsQXEQQj8TJ +UXJxv2/uJhcuy/tSDgXwHM8Uk34WNbRT7zGTGkQRX0gsbjAea/jYAoWv0ZvQRwpq +Pe79D/i7Cep8qWnA+7AE/3B3S/3dEEYmc0lpe1366A/6GEgk3ktr9PEoQrLChs6I +tu3wnNLB2euC8IKGLQFpGtOO/2/hiAKjyajaBP25w1jF0Wl8Bbqne3uZ2q1GyPFJ +YRmT7/OXpmOH/FVLtwS+8ng1cAmpCujPwteJZNcDG0sF2n/sc0+SQf49fdyUK0ty ++VUwFj9tmWxyR/M= -----END CERTIFICATE----- diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key index a84417e1a8..989959efd1 100644 --- a/nginx/ssl/private.key +++ b/nginx/ssl/private.key @@ -1,5 +1,5 @@ -----BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgabDEaDqXqUOQDk6t -NVS1XsbKvNT+M2r/k14IkVW4uTOhRANCAATbOwbrvdsHX41yEBaMjxL6uQu6Hl8d -i9WJ3IFr2DHuWJnLe23EnYT+Bdjt/hVvvENLgbqIaNcZTRSpfMwpcs1D +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgSEKoWZ6cNHlT0/C3 +jIn0t0vcIhE1zbvS1++AL+XJdYyhRANCAAQ4jXvdgT0BTyv5+PjkxfyFgDnDSSJP +360gxbvCK0NYkaQF7tXQORls7rnSE8F0NTMlgTjH8Lj3Z/ODmoIWzLB2 -----END PRIVATE KEY----- From 9c80b8622de731d90eda170c531bb4d03013f497 Mon Sep 17 00:00:00 2001 From: hmalabehqrf Date: Mon, 1 Jun 2026 09:23:50 +0300 Subject: [PATCH 25/25] update_ssl_01_05_2026 --- nginx/ssl/chained.crt | 120 +++++++++++++++++++++++++++--------------- nginx/ssl/private.key | 6 +-- 2 files changed, 80 insertions(+), 46 deletions(-) diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt index f1a74a21ef..6f82c16d06 100644 --- a/nginx/ssl/chained.crt +++ b/nginx/ssl/chained.crt @@ -1,47 +1,81 @@ -----BEGIN CERTIFICATE----- -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 +p32QsqAiAA== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEVzCCAj+gAwIBAgIRAKp18eYrjwoiCWbTi7/UuqEwDQYJKoZIhvcNAQELBQAw -TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh -cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw -WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg -RW5jcnlwdDELMAkGA1UEAxMCRTcwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARB6AST -CFh/vjcwDMCgQer+VtqEkz7JANurZxLP+U9TCeioL6sp5Z8VRvRbYk4P1INBmbef -QHJFHCxcSjKmwtvGBWpl/9ra8HW0QDsUaJW2qOJqceJ0ZVFT3hbUHifBM/2jgfgw -gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD -ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSuSJ7chx1EoG/aouVgdAR4 -wpwAgDAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB -AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g -BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu -Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAjx66fDdLk5ywFn3CzA1w1qfylHUD -aEf0QZpXcJseddJGSfbUUOvbNR9N/QQ16K1lXl4VFyhmGXDT5Kdfcr0RvIIVrNxF -h4lqHtRRCP6RBRstqbZ2zURgqakn/Xip0iaQL0IdfHBZr396FgknniRYFckKORPG -yM3QKnd66gtMst8I5nkRQlAg/Jb+Gc3egIvuGKWboE1G89NTsN9LTDD3PLj0dUMr -OIuqVjLB8pEC6yk9enrlrqjXQgkLEYhXzq7dLafv5Vkig6Gl0nuuqjqfp0Q1bi1o -yVNAlXe6aUXw92CcghC9bNsKEO1+M52YY5+ofIXlS/SEQbvVYYBLZ5yeiglV6t3S -M6H+vTG0aP9YHzLn/KVOHzGQfXDP7qM5tkf+7diZe7o2fw6O7IvN6fsQXEQQj8TJ -UXJxv2/uJhcuy/tSDgXwHM8Uk34WNbRT7zGTGkQRX0gsbjAea/jYAoWv0ZvQRwpq -Pe79D/i7Cep8qWnA+7AE/3B3S/3dEEYmc0lpe1366A/6GEgk3ktr9PEoQrLChs6I -tu3wnNLB2euC8IKGLQFpGtOO/2/hiAKjyajaBP25w1jF0Wl8Bbqne3uZ2q1GyPFJ -YRmT7/OXpmOH/FVLtwS+8ng1cAmpCujPwteJZNcDG0sF2n/sc0+SQf49fdyUK0ty -+VUwFj9tmWxyR/M= +MIICizCCAhGgAwIBAgIQXd1w3TH4AchcGGp6BLgK/jAKBggqhkjOPQQDAzAuMQsw +CQYDVQQGEwJVUzENMAsGA1UEChMESVNSRzEQMA4GA1UEAxMHUm9vdCBZRTAeFw0y +NTA5MDMwMDAwMDBaFw0yODA5MDIyMzU5NTlaMDMxCzAJBgNVBAYTAlVTMRYwFAYD +VQQKEw1MZXQncyBFbmNyeXB0MQwwCgYDVQQDEwNZRTEwdjAQBgcqhkjOPQIBBgUr +gQQAIgNiAAQHZVB1/mimla2hfSurylScjPMZaOJXLz/NnAc2sylm8WDyhU9Ccp+z +ASQi5vSwGGJjSGklkD9fdPR8GpyDIOIjCEfrnbt/v+ZSEPLLEGbaM6EccDbN7p9x +teIm2Avf+ryjge4wgeswDgYDVR0PAQH/BAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUF +BwMBMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFLsgykcL/tflnPmPCSqj +jDdFsbzYMB8GA1UdIwQYMBaAFKPIJlqOoUzQNWP8myPIOq5W809WMDIGCCsGAQUF +BwEBBCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL3llLmkubGVuY3Iub3JnLzATBgNV +HSAEDDAKMAgGBmeBDAECATAnBgNVHR8EIDAeMBygGqAYhhZodHRwOi8veWUuYy5s +ZW5jci5vcmcvMAoGCCqGSM49BAMDA2gAMGUCMQDgjUEahFT/h3DRakqiPZpLvPgf +Zwkt6K2EOMmh1nvEzl83eMLYcod4GCl3b0J1Nn0CMBNYmEQJb4CEG5WoOe7aRn/L +VKu6saHmHEynI7ysIPd8zQsK1HdmhlHKlw9Z5GpGvA== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICpjCCAiugAwIBAgIRAIchZfw0tuX7qK3Vs3BftTowCgYIKoZIzj0EAwMwTzEL +MAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNo +IEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDIwHhcNMjYwNTEzMDAwMDAwWhcN +MzIwOTAyMjM1OTU5WjAuMQswCQYDVQQGEwJVUzENMAsGA1UEChMESVNSRzEQMA4G +A1UEAxMHUm9vdCBZRTB2MBAGByqGSM49AgEGBSuBBAAiA2IABDwS/6vhrcVqcbBo ++wgdI3fwn9x7DNJJOY/lTOti0vkwuRN87RhEhTH17E7XyFjWsPYhIPt/wzOqxTd2 +b+4ZJNy9ID04YywF9U5zasDVyGSNErVNtz8uSGh5izW87j77GaOB6zCB6DAOBgNV +HQ8BAf8EBAMCAQYwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB +/zAdBgNVHQ4EFgQUo8gmWo6hTNA1Y/ybI8g6rlbzT1YwHwYDVR0jBBgwFoAUfEKW +rt5LSDv6kviejM9ti6lyN5UwMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzAChhZo +dHRwOi8veDIuaS5sZW5jci5vcmcvMBMGA1UdIAQMMAowCAYGZ4EMAQIBMCcGA1Ud +HwQgMB4wHKAaoBiGFmh0dHA6Ly94Mi5jLmxlbmNyLm9yZy8wCgYIKoZIzj0EAwMD +aQAwZgIxAMU19WCtmxVND8UHBZRoma49Z7jPs64Dma0eTu1OChVbB/2J7GV3nvYK +Ax54uk1G9QIxAO0miLVJu8PLNiXXXkiE/gsK3CTRTF/aeo4bMX42Zw40csRU6AC2 +6hSW1/IWaas6dg== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIEcDCCAligAwIBAgIQbI8dxyfHEX97r4U6yYD5zTANBgkqhkiG9w0BAQsFADBP +MQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFy +Y2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMTAeFw0yNjA1MTMwMDAwMDBa +Fw0zMjA5MDIyMzU5NTlaME8xCzAJBgNVBAYTAlVTMSkwJwYDVQQKEyBJbnRlcm5l +dCBTZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNSRyBSb290IFgy +MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEzZvVn4CDCuwJSvMWSj5cz3es3mcFDR0H +ttwW+1qLFNvicWDEukWVEYmO6gbf9yoWHKS5xcUy4APgHoIYOIvXRdgKam7mAHf7 +AlF9ItgKbppbd9/w+kHsOdx1ymgHDB/qo4H1MIHyMA4GA1UdDwEB/wQEAwIBBjAd +BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAd +BgNVHQ4EFgQUfEKWrt5LSDv6kviejM9ti6lyN5UwHwYDVR0jBBgwFoAUebRZ5nu2 +5eQBc4AIiMgaWPbpm24wMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzAChhZodHRw +Oi8veDEuaS5sZW5jci5vcmcvMBMGA1UdIAQMMAowCAYGZ4EMAQIBMCcGA1UdHwQg +MB4wHKAaoBiGFmh0dHA6Ly94MS5jLmxlbmNyLm9yZy8wDQYJKoZIhvcNAQELBQAD +ggIBAD2/e9frmMxNpCV03qUHegg+MV2wz9644YoXdqtH8RyWYcBO7xfjjGEXdU1e +/o0OkEFiynUCOSIk/vLLo7ttz6CPAeNlWfC0XNkoGeWgK6jjXvozBaGuGH5n0Ufo +shMeWTuURqNN5G00sSXDTBrpp2+mgvdZQjb8K11TYMA25QA+YHNfbIEL0BniAhKS +2gsnJjSzrdZLI+EZ7SEyqdR2rkjd1KutLDU+n3TFyxjniZVGur4YlhMP3mY/dV95 +IruAkkjOZier6hGBdEgZXXvaCz9u9iVEadsIE75pAGL8oHV5vxdARDiotRpul1IN +/UZwzAbrfUFcw1HkAcYD/mlZfnQ2ieCF2MS7j3Vhv7JPDKp45fmykmzYNSrumRW0 +upFFKDBOoF7hsOb7oLyHS+Uft6jOUfOrogj8YUx38hKb2K20r42OgsSdDdxdeYWc +MS3Sb6mwJeSZEYxJ2gaXnDSPaKhhrNkYwljyVQyr4Nq+MEJytXNTnHqaAcrNwZlV +pcJL1KBnMrMjP7eanvUwL3FYj3cF17jtboLt7gLoi4+2rWZFvn+w54jmd/FIuhhZ +cEaU/wvU6BUNMtcVquVGHp7itQeDth5j+XL3j4WJ2SABwzUl6OeYdgpIt/ITZa+p +TT0mQ/r5XyA4MEAiabn7XJjvCERlF2dcn2wqJw+CreTkkQ2R -----END CERTIFICATE----- diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key index 989959efd1..b577126ba5 100644 --- a/nginx/ssl/private.key +++ b/nginx/ssl/private.key @@ -1,5 +1,5 @@ -----BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgSEKoWZ6cNHlT0/C3 -jIn0t0vcIhE1zbvS1++AL+XJdYyhRANCAAQ4jXvdgT0BTyv5+PjkxfyFgDnDSSJP -360gxbvCK0NYkaQF7tXQORls7rnSE8F0NTMlgTjH8Lj3Z/ODmoIWzLB2 +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgUCDfmBaU0DMCp/sT +0YtT20/s3a4lGb1fWN/saVim6l6hRANCAARidtEg6BLG/amWPIMZve1OSvbuxe3F +a5vKxL0tGVlQp/bUEeFoKpdCMac4fwbYyBXVpy92h6AoqMSLBqYsbuHJ -----END PRIVATE KEY-----