deploy: changed all domains to new one

also removed tls config from nginx as it is handled by caddy on vm

infrastructure/backend/.env.template

@@ -1,7 +1,7 @@
 DJANGO_SECRET_KEY=secretees
 DJANGO_DEBUG=False
 DJANGO_ALLOWED_HOSTS=*
-DJANGO_CSRF_TRUSTED_ORIGINS=http://localhost,http://127.0.0.1,https://*.final.prodcontest.ru
+DJANGO_CSRF_TRUSTED_ORIGINS=http://localhost,http://127.0.0.1,https://datarush.itqdev.xyz
 DJANGO_CORS_ALLOWED_ORIGINS=*
 DJANGO_INTERNAL_IPS=127.0.0.1
 DJANGO_LANGUAGE_CODE=ru
@@ -15,7 +15,7 @@ DJANGO_SUPERUSER_EMAIL=admin@mail.com
 DJANGO_SUPERUSER_PASSWORD=prooooooood
 
 MINIO_ENDPOINT=minio:9000
-MINIO_CUSTOM_ENDPOINT_URL=https://prod-team-15-minio-2pc0i3lc.final.prodcontest.ru
+MINIO_CUSTOM_ENDPOINT_URL=https://s3.datarush.itqdev.xyz
 MINIO_ACCESS_KEY=admin
 MINIO_SECRET_KEY=password
 

infrastructure/checker/.env.template

@@ -1,2 +1 @@
-REGISTRY_LOGIN=devitq
+DOCKER_IMAGE=registry.gitlab.com/megazordpobeda/datarush/custom-python
-REGISTRY_PASSWORD=prod-zAoUDyHwkgRfQPyVvskH

infrastructure/minio/.env.template

@@ -1,4 +1,4 @@
 MINIO_ROOT_USER=admin
 MINIO_ROOT_PASSWORD=password
 MINIO_VOLUMES=/data
-MINIO_BROWSER_REDIRECT_URL=https://prod-team-15-minio-2pc0i3lc.final.prodcontest.ru/minio/ui/
+MINIO_BROWSER_REDIRECT_URL=https://s3.datarush.itqdev.xyz/minio/ui/

infrastructure/nginx/nginx.conf

@@ -78,16 +78,13 @@ http {
         listen 80 default_server;
         listen [::]:80 default_server;
         server_name _;
-        return 301 https://$host$request_uri;
+        return 444;
     }
 
     server {
-        listen 443 ssl http2 default_server;
+        listen 80 http2;
-        listen [::]:443 ssl http2 default_server;
+        listen [::]:80 http2;
-        server_name prod-team-15-2pc0i3lc.final.prodcontest.ru;
+        server_name datarush.itqdev.xyz;
-
-        ssl_certificate /etc/nginx/certs/fullchain.pem;
-        ssl_certificate_key /etc/nginx/certs/privkey.pem;
 
         add_header X-Frame-Options "SAMEORIGIN" always;
         add_header X-Content-Type-Options "nosniff" always;
@@ -199,12 +196,9 @@ http {
     }
 
     server {
-        listen 443 ssl http2;
+        listen 80 http2;
-        listen [::]:443 ssl http2;
+        listen [::]:80 http2;
-        server_name prod-team-15-minio-2pc0i3lc.final.prodcontest.ru;
+        server_name s3.datarush.itqdev.xyz;
-
-        ssl_certificate /etc/nginx/certs/fullchain.pem;
-        ssl_certificate_key /etc/nginx/certs/privkey.pem;
 
         add_header X-Frame-Options "SAMEORIGIN" always;
         add_header X-Content-Type-Options "nosniff" always;

infrastructure/ssl/cert.pem

@@ -1,22 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDjTCCAxSgAwIBAgISA5ep7QO5wGgN93zJfQTGlkUfMAoGCCqGSM49BAMDMDIx
-CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF
-NjAeFw0yNTAyMjgwNjA2NTlaFw0yNTA1MjkwNjA2NThaMCExHzAdBgNVBAMMFiou
-ZmluYWwucHJvZGNvbnRlc3QucnUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQK
-fXgGLgeNzruo5GW12+DHilbhxha9/MPT8zh7mh7BTWldFRktTTQ64C7yArJUZqCg
-9lzvE/+a2tAMgLXlMUr6o4ICGTCCAhUwDgYDVR0PAQH/BAQDAgeAMB0GA1UdJQQW
-MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBS+
-BpaBU+CxXvOyjQTWxujc8lDZtDAfBgNVHSMEGDAWgBSTJ0aYA6lRaI6Y1sRCSNsj
-v1iU0jBVBggrBgEFBQcBAQRJMEcwIQYIKwYBBQUHMAGGFWh0dHA6Ly9lNi5vLmxl
-bmNyLm9yZzAiBggrBgEFBQcwAoYWaHR0cDovL2U2LmkubGVuY3Iub3JnLzAhBgNV
-HREEGjAYghYqLmZpbmFsLnByb2Rjb250ZXN0LnJ1MBMGA1UdIAQMMAowCAYGZ4EM
-AQIBMIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHcAouMK5EXvva2bfjjtR2d3U9eC
-W4SU1yteGyzEuVCkR+cAAAGVS1/fqAAABAMASDBGAiEAh++tCc2QKpORe/zE33hI
-WZudKHCGgXTSRFagyCBahi4CIQCmtzQXIiPC2YGGR7GkFeEhHbvSSugxz+/8EKsp
-nuFqsgB2ABNK3xq1mEIJeAxv70x6kaQWtyNJzlhXat+u2qfCq+AiAAABlUtf4UEA
-AAQDAEcwRQIgASgk8NgunqM1H9cuY4oiP6PRuH71nv4FChbbnMTb48oCIQCj4vxo
-bdbH5382p/gZh1FibeYB9xd7Dr85HjntYjkrMTAKBggqhkjOPQQDAwNnADBkAjAz
-cQn3S6VPQJ8nUvNEZYvzZrKgP716Xzhjukju77glV9RfS9B3sqiYXU9k59zlKwcC
-MGMy7s814/t7R+rXaYGu7lDRXpzkq356cRxtrtu6WofIyQ6GGaA/jBSDjVlENWYD
-Gw==
------END CERTIFICATE-----

infrastructure/ssl/chain.pem

@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEVzCCAj+gAwIBAgIRALBXPpFzlydw27SHyzpFKzgwDQYJKoZIhvcNAQELBQAw
-TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
-cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw
-WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
-RW5jcnlwdDELMAkGA1UEAxMCRTYwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATZ8Z5G
-h/ghcWCoJuuj+rnq2h25EqfUJtlRFLFhfHWWvyILOR/VvtEKRqotPEoJhC6+QJVV
-6RlAN2Z17TJOdwRJ+HB7wxjnzvdxEP6sdNgA1O1tHHMWMxCcOrLqbGL0vbijgfgw
-gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSTJ0aYA6lRaI6Y1sRCSNsj
-v1iU0jAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB
-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=
------END CERTIFICATE-----

infrastructure/ssl/fullchain.pem

@@ -1,48 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDjTCCAxSgAwIBAgISA5ep7QO5wGgN93zJfQTGlkUfMAoGCCqGSM49BAMDMDIx
-CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF
-NjAeFw0yNTAyMjgwNjA2NTlaFw0yNTA1MjkwNjA2NThaMCExHzAdBgNVBAMMFiou
-ZmluYWwucHJvZGNvbnRlc3QucnUwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAQK
-fXgGLgeNzruo5GW12+DHilbhxha9/MPT8zh7mh7BTWldFRktTTQ64C7yArJUZqCg
-9lzvE/+a2tAMgLXlMUr6o4ICGTCCAhUwDgYDVR0PAQH/BAQDAgeAMB0GA1UdJQQW
-MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBS+
-BpaBU+CxXvOyjQTWxujc8lDZtDAfBgNVHSMEGDAWgBSTJ0aYA6lRaI6Y1sRCSNsj
-v1iU0jBVBggrBgEFBQcBAQRJMEcwIQYIKwYBBQUHMAGGFWh0dHA6Ly9lNi5vLmxl
-bmNyLm9yZzAiBggrBgEFBQcwAoYWaHR0cDovL2U2LmkubGVuY3Iub3JnLzAhBgNV
-HREEGjAYghYqLmZpbmFsLnByb2Rjb250ZXN0LnJ1MBMGA1UdIAQMMAowCAYGZ4EM
-AQIBMIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHcAouMK5EXvva2bfjjtR2d3U9eC
-W4SU1yteGyzEuVCkR+cAAAGVS1/fqAAABAMASDBGAiEAh++tCc2QKpORe/zE33hI
-WZudKHCGgXTSRFagyCBahi4CIQCmtzQXIiPC2YGGR7GkFeEhHbvSSugxz+/8EKsp
-nuFqsgB2ABNK3xq1mEIJeAxv70x6kaQWtyNJzlhXat+u2qfCq+AiAAABlUtf4UEA
-AAQDAEcwRQIgASgk8NgunqM1H9cuY4oiP6PRuH71nv4FChbbnMTb48oCIQCj4vxo
-bdbH5382p/gZh1FibeYB9xd7Dr85HjntYjkrMTAKBggqhkjOPQQDAwNnADBkAjAz
-cQn3S6VPQJ8nUvNEZYvzZrKgP716Xzhjukju77glV9RfS9B3sqiYXU9k59zlKwcC
-MGMy7s814/t7R+rXaYGu7lDRXpzkq356cRxtrtu6WofIyQ6GGaA/jBSDjVlENWYD
-Gw==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIEVzCCAj+gAwIBAgIRALBXPpFzlydw27SHyzpFKzgwDQYJKoZIhvcNAQELBQAw
-TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
-cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw
-WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
-RW5jcnlwdDELMAkGA1UEAxMCRTYwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATZ8Z5G
-h/ghcWCoJuuj+rnq2h25EqfUJtlRFLFhfHWWvyILOR/VvtEKRqotPEoJhC6+QJVV
-6RlAN2Z17TJOdwRJ+HB7wxjnzvdxEP6sdNgA1O1tHHMWMxCcOrLqbGL0vbijgfgw
-gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSTJ0aYA6lRaI6Y1sRCSNsj
-v1iU0jAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB
-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=
------END CERTIFICATE-----

infrastructure/ssl/privkey.pem

@@ -1,5 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgZ50qoTXE2cFD6dkD
-Vwv6YCvVv9DSMDiNqOGDOg3yhAahRANCAAQKfXgGLgeNzruo5GW12+DHilbhxha9
-/MPT8zh7mh7BTWldFRktTTQ64C7yArJUZqCg9lzvE/+a2tAMgLXlMUr6
------END PRIVATE KEY-----

services/checker/main.py

@@ -275,7 +275,7 @@ async def execute_code(request: ExecutionRequest) -> ExecutionResponse:
             result_hash=result_hash,
             error=error[:5000],
         )
-        print(response.model_dump_json())
+
         return response