From 78ef0684fb383ed107f1dae9d2572eda41d1db79 Mon Sep 17 00:00:00 2001 From: ddadmin Date: Wed, 29 Jan 2025 13:08:26 +0300 Subject: [PATCH] update config --- .env | 5 +- configs/{dashboard => admin}/.env | 20 +++--- configs/admin/default | 24 +++++++ configs/cabinet/.env | 3 + configs/cabinet/entrypoint.sh | 10 +++ configs/lms/entrypoint.sh | 10 +++ configs/nginx/conf.d/admin.conf | 21 ++++++ configs/nginx/conf.d/cabinet.conf | 21 ++++++ configs/nginx/conf.d/default.conf | 4 ++ configs/nginx/conf.d/lms.conf | 14 ++-- configs/nginx/conf.d/signer.conf | 16 +++++ configs/nginx/ssl/dot2024.crt | 107 ++++++++++++++++++++++++++++++ configs/nginx/ssl/dot2024.key | 51 ++++++++++++++ configs/nuxt/.env | 2 +- configs/nuxt/entrypoint.sh | 53 ++------------- configs/php/.env | 6 +- configs/php/.env.local | 33 +++++++-- configs/signer/.env | 6 ++ configs/signer/.env.local | 3 + docker-compose.yml | 80 ++++++++++++++++------ 20 files changed, 397 insertions(+), 92 deletions(-) rename configs/{dashboard => admin}/.env (80%) create mode 100644 configs/admin/default create mode 100644 configs/cabinet/.env create mode 100755 configs/cabinet/entrypoint.sh create mode 100755 configs/lms/entrypoint.sh create mode 100644 configs/nginx/conf.d/admin.conf create mode 100644 configs/nginx/conf.d/cabinet.conf create mode 100644 configs/nginx/conf.d/signer.conf create mode 100644 configs/nginx/ssl/dot2024.crt create mode 100644 configs/nginx/ssl/dot2024.key create mode 100644 configs/signer/.env create mode 100644 configs/signer/.env.local diff --git a/.env b/.env index e41598d..c6a2f02 100644 --- a/.env +++ b/.env @@ -4,7 +4,10 @@ NETWORK=staging FRONT_TAG=master DOTDOT_TAG=master LMS_TAG=master -DASHBORD_TAG=v0.0.1 +DASHBORD_TAG=master +SIGNER_TAG=TD-322 +ADMIN_TAG=dashboard +CABINET_TAG=master MYSQL_PORT=0.0.0.0:33067 MYSQL_ROOT_PASSWORD=root diff --git a/configs/dashboard/.env b/configs/admin/.env similarity index 80% rename from configs/dashboard/.env rename to configs/admin/.env index f7d24e6..a481384 100644 --- a/configs/dashboard/.env +++ b/configs/admin/.env @@ -1,11 +1,11 @@ -APP_NAME="DOT-DOT DASHBOARD" -APP_ENV=local -APP_KEY=base64:UdElHcbd1MSsWoLOn8LietbdAhHiyT/C6+dpy+kYfkQ= +APP_NAME="DOT-DOT admin" +APP_ENV=production +APP_KEY=base64:tt8hr1y+cfNtEPQfWtFi9OXEDgko6Qw6uxeNK7ka3YU= APP_DEBUG=true APP_TIMEZONE=UTC -APP_URL=https://stagingdashboard.dot-dot.ru -FRONTEND_URL=https://stagingdashboard.dot-dot.ru -ASSET_URL=https://stagingdashboard.dot-dot.ru +APP_URL=https://stagingadmin.dot-dot.ru +FRONTEND_URL=https://stagingadmin.dot-dot.ru +ASSET_URL=https://stagingadmin.dot-dot.ru APP_EMAIL_DOMAIN="dot-dot.ru" APP_LOCALE=ru @@ -25,6 +25,7 @@ LOG_LEVEL=debug DEFAULT_DB_CONNECTION=dashboard #Параметры подключения к базе панели управления + DASHBOARD_DB_HOST=db DASHBOARD_DB_PORT=3306 DASHBOARD_DB_DATABASE=dashboard @@ -32,11 +33,12 @@ DASHBOARD_DB_USERNAME=root DASHBOARD_DB_PASSWORD=root #Параметры подключения к базе dot-dot + DOT_DOT_DB_HOST=db DOT_DOT_DB_PORT=3306 DOT_DOT_DB_DATABASE=dot -DOT_DOT_DB_USERNAME=root -DOT_DOT_DB_PASSWORD=root +DOT_DOT_DB_USERNAME=dot +DOT_DOT_DB_PASSWORD=dot SESSION_DRIVER=database SESSION_LIFETIME=120 @@ -76,3 +78,5 @@ AWS_USE_PATH_STYLE_ENDPOINT=false VITE_APP_NAME="${APP_NAME}" OCTANE_SERVER=frankenphp + +DOT_DOT_HOST=https://staging.dot-dot.ru diff --git a/configs/admin/default b/configs/admin/default new file mode 100644 index 0000000..44d3dae --- /dev/null +++ b/configs/admin/default @@ -0,0 +1,24 @@ +server { + server_name stagingadmin.dot-dot.ru; + listen 443 ssl; + + ssl_certificate /etc/nginx/ssl/dot2024.crt; + ssl_certificate_key /etc/nginx/ssl/dot2024.key; + + + index index.php index.html index.htm; + root /application/public; + + + location / { + try_files $uri $uri/ /index.php?$args; + } + + location ~ \.php$ { + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name; + fastcgi_pass localhost:9000; + try_files $uri =404; + fastcgi_index index.php; + } +} \ No newline at end of file diff --git a/configs/cabinet/.env b/configs/cabinet/.env new file mode 100644 index 0000000..016da3c --- /dev/null +++ b/configs/cabinet/.env @@ -0,0 +1,3 @@ +NUXT_HOST=0.0.0.0 +NUXT_PORT=3000 +DOMAIN=stagingadmin.dot-dot.ru \ No newline at end of file diff --git a/configs/cabinet/entrypoint.sh b/configs/cabinet/entrypoint.sh new file mode 100755 index 0000000..ddc99b3 --- /dev/null +++ b/configs/cabinet/entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +DOMAIN="${DOMAIN:-lmsadmin.dot-dot.ru}" + +for x in $(grep -lrw "lmsadmin.dot-dot.ru" .nuxt/);do + echo "replace lmsadmin.dot-dot.ru to https://${DOMAIN} in $x" + sed -i -e "s/lmsadmin.dot-dot.ru/${DOMAIN}/g" $x; +done + +"$@" diff --git a/configs/lms/entrypoint.sh b/configs/lms/entrypoint.sh new file mode 100755 index 0000000..9555071 --- /dev/null +++ b/configs/lms/entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh -x + +DOMAIN="${DOMAIN:-lms.dot-dot.ru}" + +for x in $(grep -lrw "lms.dot-dot.ru" .nuxt/);do + echo "replace lms.dot-dot.ru to https://${DOMAIN} in $x" + sed -i -e "s/lms.dot-dot.ru/${DOMAIN}/g" $x; +done + +"$@" diff --git a/configs/nginx/conf.d/admin.conf b/configs/nginx/conf.d/admin.conf new file mode 100644 index 0000000..8c37f9e --- /dev/null +++ b/configs/nginx/conf.d/admin.conf @@ -0,0 +1,21 @@ +server { + listen 443 ssl ; + server_name stagingadmin.dot-dot.ru; + + ssl_certificate /etc/nginx/ssl/dot2024.crt; + ssl_certificate_key /etc/nginx/ssl/dot2024.key; + + client_max_body_size 10m; + + location / { + proxy_pass https://staging-admin-1:443; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_set_header Host $host; + proxy_cache_bypass $http_upgrade; + chunked_transfer_encoding off; + proxy_buffering off; + proxy_cache off; + } +} diff --git a/configs/nginx/conf.d/cabinet.conf b/configs/nginx/conf.d/cabinet.conf new file mode 100644 index 0000000..1e31407 --- /dev/null +++ b/configs/nginx/conf.d/cabinet.conf @@ -0,0 +1,21 @@ +server { + listen 443 ssl ; + server_name stagingcabinet.dot-dot.ru; + + ssl_certificate /etc/nginx/ssl/dot2024.crt; + ssl_certificate_key /etc/nginx/ssl/dot2024.key; + + client_max_body_size 10m; + + location / { + proxy_pass http://cabinet:3000; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_set_header Host $host; + proxy_cache_bypass $http_upgrade; + chunked_transfer_encoding off; + proxy_buffering off; + proxy_cache off; + } +} diff --git a/configs/nginx/conf.d/default.conf b/configs/nginx/conf.d/default.conf index 65c0d01..e9b29f6 100644 --- a/configs/nginx/conf.d/default.conf +++ b/configs/nginx/conf.d/default.conf @@ -1,6 +1,10 @@ server { + listen 443 ssl ; server_name staging.dot-dot.ru; + ssl_certificate /etc/nginx/ssl/dot2024.crt; + ssl_certificate_key /etc/nginx/ssl/dot2024.key; + root /application/public; client_max_body_size 10m; diff --git a/configs/nginx/conf.d/lms.conf b/configs/nginx/conf.d/lms.conf index ec1490b..668efb5 100644 --- a/configs/nginx/conf.d/lms.conf +++ b/configs/nginx/conf.d/lms.conf @@ -1,12 +1,16 @@ -# server { -# listen 80; -# server_name staginglms.dot-dot.ru; -# return 301 https://$server_name$request_uri; -# } +server { + listen 80; + server_name staginglms.dot-dot.ru; + return 301 https://$server_name$request_uri; +} server { + listen 443 ssl ; server_name staginglms.dot-dot.ru; + ssl_certificate /etc/nginx/ssl/dot2024.crt; + ssl_certificate_key /etc/nginx/ssl/dot2024.key; + root /application/public; client_max_body_size 10m; diff --git a/configs/nginx/conf.d/signer.conf b/configs/nginx/conf.d/signer.conf new file mode 100644 index 0000000..551ea10 --- /dev/null +++ b/configs/nginx/conf.d/signer.conf @@ -0,0 +1,16 @@ +server { + listen 80; + server_name stagingsigner.dot-dot.ru; + + location / { + proxy_pass http://signer:8000; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_set_header Host $host; + proxy_cache_bypass $http_upgrade; + chunked_transfer_encoding off; + proxy_buffering off; + proxy_cache off; + } +} \ No newline at end of file diff --git a/configs/nginx/ssl/dot2024.crt b/configs/nginx/ssl/dot2024.crt new file mode 100644 index 0000000..c3da3d4 --- /dev/null +++ b/configs/nginx/ssl/dot2024.crt @@ -0,0 +1,107 @@ +-----BEGIN CERTIFICATE----- +MIIHVjCCBj6gAwIBAgIMUR4H/7XMBL9Q9JAXMA0GCSqGSIb3DQEBCwUAMFUxCzAJ +BgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSswKQYDVQQDEyJH +bG9iYWxTaWduIEdDQyBSNiBBbHBoYVNTTCBDQSAyMDIzMB4XDTI0MDgxNDA0MjQz +MVoXDTI1MDkxNTA0MjQzMFowFzEVMBMGA1UEAwwMKi5kb3QtZG90LnJ1MIICIjAN +BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA8eI42aZ18C3CHE8CEcUhMwCbfPle +RZg0Egj+gqyiGa/RXjpWm0Zq9MKhOPnal0h2VlFxFNAeyRcy/x7QZloUIDegZYUZ +UW4lMYiEwF9jSXINlfuzgKQhMPB9wnJhNt+O1gdO3u0FVy1ChBv6eat480gvi0wq +EEE6YC09OjFRbErlF1jAFL1QIPOw0xqZrafRp+qfK3DJc8IZsuzhVFIV+CyBA897 +zrUwbF7aYTGwKotk6w11L1TZwK1iiUSkvAGOu1V6LMod3WlHE8YICp3lPuEsj9Zr +nJl0x+3/4XSS7ogcInUdFopf9odLD6umGk1xDIA7uCm9hlyA/YQBmyYinngXyfy1 +6WTDLdIsCNzZpiRvbPxbxvAp7Exmqs5xWmb4qSYSThdZgp/ucJUiN3MWbYcc9fP2 +/wifmes9OlfoAV/QlrpehpaP86VavkS0rBrUGf0OSdC0w79ZAllZeamU9zLHWwIi +LfpzmlqCC9EXrK0GWTl/K2CLgYifoIi8m3053kKKVIXLfuYSlotv9y3hRKxkW0b6 +dtLhP3LjN+lvR7BNKTCNhafyIuHLcXHnj6yKkSYoH/wd/rkQCjlQx8dG419ouW9t +oiSch6x4O/aLyFY3aO4/GnoECLUyUtsrPowF87QE6iiaxI6EokW9HF9hN85OxQ+u +wd7w3gTvSLWR3DcCAwEAAaOCA2IwggNeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMB +Af8EAjAAMIGZBggrBgEFBQcBAQSBjDCBiTBJBggrBgEFBQcwAoY9aHR0cDovL3Nl +Y3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3NnY2NyNmFscGhhc3NsY2EyMDIz +LmNydDA8BggrBgEFBQcwAYYwaHR0cDovL29jc3AuZ2xvYmFsc2lnbi5jb20vZ3Nn +Y2NyNmFscGhhc3NsY2EyMDIzMFcGA1UdIARQME4wCAYGZ4EMAQIBMEIGCisGAQQB +oDIKAQMwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20v +cmVwb3NpdG9yeS8wRAYDVR0fBD0wOzA5oDegNYYzaHR0cDovL2NybC5nbG9iYWxz +aWduLmNvbS9nc2djY3I2YWxwaGFzc2xjYTIwMjMuY3JsMCMGA1UdEQQcMBqCDCou +ZG90LWRvdC5ydYIKZG90LWRvdC5ydTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB +BQUHAwIwHwYDVR0jBBgwFoAUvQW384qTPHPLefoPhRKhd5YYkXQwHQYDVR0OBBYE +FEFaB0lwsh68jY4d3zGJ8RSUenjoMIIBfQYKKwYBBAHWeQIEAgSCAW0EggFpAWcA +dQCvGBoo1oyj4KmKTJxnqwn4u7wiuq68sTijoZ3T+bYDDQAAAZFPIWD2AAAEAwBG +MEQCIBr9tqm+1D7C4ecXmA7ne6gHVeLgGOFf3jjnYdz80JWhAiASjtZlH8rYzLwF +3AX/Cfo+7KfRG+mbk2FY9OKJuu7bWgB1ABLxTjS9U3JMhAYZw48/ehP457Vih4ic +bTAFhOvlhiY6AAABkU8hYO0AAAQDAEYwRAIgSFiFncqd8KmZrv8brFZAaKzbCjR1 +GU5ygJCv2K9xWnsCIFuwzf8leBa2eSKvSY7MCUgxXgRFl7rYjPjc6Foap0hyAHcA +DeHyMCvTDcFAYhIJ6lUu/Ed0fLHX6TDvDkIetH5OqjQAAAGRTyFhEgAABAMASDBG +AiEAxlxp+G3ArhozCos4yDTtLSB4sZ8496/R0WAlUqRLeRYCIQDKszlCeQNZB83Y +XGVCkPV+unVCmfKuuUJei1Md9GHjhjANBgkqhkiG9w0BAQsFAAOCAQEAg/1URGZb +xq8lMzrDb95Exkqm45FHLVbifPBSqiyCVtqa9VWDkyAQqCHhaCCB0N1YmCZGbXZy +HefWc8f/v4Kxam/8IpUXAH7U7sWZhX6p1yRn6Z5+FnWoyr1I6t/tDv1yBvB2EsKe +jJPLLPq41Aw6QP5EZ8Eks1VREW5aq2a+8WDJKnL3CCCtlIBh6cntADzZBBE2Zb2E +0/lM83sGLj9vAFw/PIkE/OCVobtpcj56O1UYZs/RDbLNhPUmhUhpSHSaiWU7VXeR +PoLgStsJrBZTSg1bdj8HK32lTzKcYspWwvjzbPclllxGzqKLTIdtCA9SbIl+363n +YMEkGJPyfIu4uQ== +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFjDCCA3SgAwIBAgIQfx8skC6D0OO2+zvuR4tegDANBgkqhkiG9w0BAQsFADBM +MSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSNjETMBEGA1UEChMKR2xv +YmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjAeFw0yMzA3MTkwMzQzMjVaFw0y +NjA3MTkwMDAwMDBaMFUxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWdu +IG52LXNhMSswKQYDVQQDEyJHbG9iYWxTaWduIEdDQyBSNiBBbHBoYVNTTCBDQSAy +MDIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA00Jvk5ADppO0rgDn +j1M14XIb032Aas409JJFAb8cUjipFOth7ySLdaWLe3s63oSs5x3eWwzTpX4BFkzZ +bxT1eoJSHfT2M0wZ5QOPcCIjsr+YB8TAvV2yJSyq+emRrN/FtgCSTaWXSJ5jipW8 +SJ/VAuXPMzuAP2yYpuPcjjQ5GyrssDXgu+FhtYxqyFP7BSvx9jQhh5QV5zhLycua +n8n+J0Uw09WRQK6JGQ5HzDZQinkNel+fZZNRG1gE9Qeh+tHBplrkalB1g85qJkPO +J7SoEvKsmDkajggk/sSq7NPyzFaa/VBGZiRRG+FkxCBniGD5618PQ4trcwHyMojS +FObOHQIDAQABo4IBXzCCAVswDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsG +AQUFBwMBBggrBgEFBQcDAjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBS9 +BbfzipM8c8t5+g+FEqF3lhiRdDAfBgNVHSMEGDAWgBSubAWjkxPioufi1xzWx/B/ +yGdToDB7BggrBgEFBQcBAQRvMG0wLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwMi5n +bG9iYWxzaWduLmNvbS9yb290cjYwOwYIKwYBBQUHMAKGL2h0dHA6Ly9zZWN1cmUu +Z2xvYmFsc2lnbi5jb20vY2FjZXJ0L3Jvb3QtcjYuY3J0MDYGA1UdHwQvMC0wK6Ap +oCeGJWh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vcm9vdC1yNi5jcmwwIQYDVR0g +BBowGDAIBgZngQwBAgEwDAYKKwYBBAGgMgoBAzANBgkqhkiG9w0BAQsFAAOCAgEA +fMkkMo5g4mn1ft4d4xR2kHzYpDukhC1XYPwfSZN3A9nEBadjdKZMH7iuS1vF8uSc +g26/30DRPen2fFRsr662ECyUCR4OfeiiGNdoQvcesM9Xpew3HLQP4qHg+s774hNL +vGRD4aKSKwFqLMrcqCw6tEAfX99tFWsD4jzbC6k8tjSLzEl0fTUlfkJaWpvLVkpg +9et8tD8d51bymCg5J6J6wcXpmsSGnksBobac1+nXmgB7jQC9edU8Z41FFo87BV3k +CtrWWsdkQavObMsXUPl/AO8y/jOuAWz0wyvPnKom+o6W4vKDY6/6XPypNdebOJ6m +jyaILp0quoQvhjx87BzENh5s57AIOyIGpS0sDEChVDPzLEfRsH2FJ8/W5woF0nvs +BTqfYSCqblQbHeDDtCj7Mlf8JfqaMuqcbE4rMSyfeHyCdZQwnc/r9ujnth691AJh +xyYeCM04metJIe7cB6d4dFm+Pd5ervY4x32r0uQ1Q0spy1VjNqUJjussYuXNyMmF +HSuLQQ6PrePmH5lcSMQpYKzPoD/RiNVD/PK0O3vuO5vh3o7oKb1FfzoanDsFFTrw +0aLOdRW/tmLPWVNVlAb8ad+B80YJsL4HXYnQG8wYAFb8LhwSDyT9v+C1C1lcIHE7 +nE0AAp9JSHxDYsma9pi4g0Phg3BgOm2euTRzw7R0SzU= +-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIIFgzCCA2ugAwIBAgIORea7A4Mzw4VlSOb/RVEwDQYJKoZIhvcNAQEMBQAwTDEg +MB4GA1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2Jh +bFNpZ24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMTQxMjEwMDAwMDAwWhcNMzQx +MjEwMDAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSNjET +MBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCAiIwDQYJ +KoZIhvcNAQEBBQADggIPADCCAgoCggIBAJUH6HPKZvnsFMp7PPcNCPG0RQssgrRI +xutbPK6DuEGSMxSkb3/pKszGsIhrxbaJ0cay/xTOURQh7ErdG1rG1ofuTToVBu1k +ZguSgMpE3nOUTvOniX9PeGMIyBJQbUJmL025eShNUhqKGoC3GYEOfsSKvGRMIRxD +aNc9PIrFsmbVkJq3MQbFvuJtMgamHvm566qjuL++gmNQ0PAYid/kD3n16qIfKtJw +LnvnvJO7bVPiSHyMEAc4/2ayd2F+4OqMPKq0pPbzlUoSB239jLKJz9CgYXfIWHSw +1CM69106yqLbnQneXUQtkPGBzVeS+n68UARjNN9rkxi+azayOeSsJDa38O+2HBNX +k7besvjihbdzorg1qkXy4J02oW9UivFyVm4uiMVRQkQVlO6jxTiWm05OWgtH8wY2 +SXcwvHE35absIQh1/OZhFj931dmRl4QKbNQCTXTAFO39OfuD8l4UoQSwC+n+7o/h +bguyCLNhZglqsQY6ZZZZwPA1/cnaKI0aEYdwgQqomnUdnjqGBQCe24DWJfncBZ4n +WUx2OVvq+aWh2IMP0f/fMBH5hc8zSPXKbWQULHpYT9NLCEnFlWQaYw55PfWzjMpY +rZxCRXluDocZXFSxZba/jJvcE+kNb7gu3GduyYsRtYQUigAZcIN5kZeR1Bonvzce +MgfYFGM8KEyvAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTAD +AQH/MB0GA1UdDgQWBBSubAWjkxPioufi1xzWx/B/yGdToDAfBgNVHSMEGDAWgBSu +bAWjkxPioufi1xzWx/B/yGdToDANBgkqhkiG9w0BAQwFAAOCAgEAgyXt6NH9lVLN +nsAEoJFp5lzQhN7craJP6Ed41mWYqVuoPId8AorRbrcWc+ZfwFSY1XS+wc3iEZGt +Ixg93eFyRJa0lV7Ae46ZeBZDE1ZXs6KzO7V33EByrKPrmzU+sQghoefEQzd5Mr61 +55wsTLxDKZmOMNOsIeDjHfrYBzN2VAAiKrlNIC5waNrlU/yDXNOd8v9EDERm8tLj +vUYAGm0CuiVdjaExUd1URhxN25mW7xocBFymFe944Hn+Xds+qkxV/ZoVqW/hpvvf +cDDpw+5CRu3CkwWJ+n1jez/QcYF8AOiYrg54NMMl+68KnyBr3TsTjxKM4kEaSHpz +oHdpx7Zcf4LIHv5YGygrqGytXm3ABdJ7t+uA/iU3/gKbaKxCXcPu9czc8FB10jZp +nOZ7BN9uBmm23goJSFmH63sUYHpkqmlD75HHTOwY3WzvUy2MmeFe8nI+z1TIvWfs +pA9MRf/TuTAjB0yPEL+GltmZWrSZVxykzLsViVO6LAUP5MSeGbEYNNVMnbrt9x+v +JJUEeKgDu+6B5dpffItKoZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R +8k8HWV+LLUNS60YMlOH1Zkd5d9VUWx+tJDfLRVpOoERIyNiwmcUVhAn21klJwGW4 +5hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA= +-----END CERTIFICATE----- \ No newline at end of file diff --git a/configs/nginx/ssl/dot2024.key b/configs/nginx/ssl/dot2024.key new file mode 100644 index 0000000..50b5bbd --- /dev/null +++ b/configs/nginx/ssl/dot2024.key @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- \ No newline at end of file diff --git a/configs/nuxt/.env b/configs/nuxt/.env index 80d7236..b04281a 100644 --- a/configs/nuxt/.env +++ b/configs/nuxt/.env @@ -8,7 +8,7 @@ DOMAIN=staging.dot-dot.ru APP_HOST=staging.dot-dot.ru APP_SCHEME=https -APP_ENVIRONMENT=production +APP_ENVIRONMENT=development DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833 YANDEX_METRIKA_ID=50156956 PHONE_KEY=qwefghzcx diff --git a/configs/nuxt/entrypoint.sh b/configs/nuxt/entrypoint.sh index ede5ebd..a1dc972 100755 --- a/configs/nuxt/entrypoint.sh +++ b/configs/nuxt/entrypoint.sh @@ -1,55 +1,10 @@ #!/bin/sh -DOMAIN="${DOMAIN:-dot-dot.local}" -APP_HOST="${APP_HOST:-dot-dot.local}" -API_URL="{API_URL:-${DOMAIN}}" -APP_SCHEME="${APP_SCHEME:-http}" -API_URL="${APP_SCHEME}://${DOMAIN}/" -BASE_URL="${APP_SCHEME}://${DOMAIN}" -APP_ENVIRONMENT="${APP_ENVIRONMENT:-development}" -WS_PROTOCOL=${WS_PROTOCOL:-ws} +DOMAIN="${DOMAIN:-dot-dot.ru}" -for x in $(grep -lr baseURL .nuxt/);do - sed -i -e "s#\"baseURL\":\"http://dot-dot.local\"#\"baseURL\":\"${BASE_URL}\"#g" $x -done - -for x in $(grep -lr APP_SCHEME .nuxt/);do - sed -i -e "s#\"APP_SCHEME\":\"http\"#\"APP_SCHEME\":\"${APP_SCHEME}\"#g" $x - sed -i -e "s#APP_SCHEME:\"http\"#\"APP_SCHEME\":\"${APP_SCHEME}\"#g" $x -done - -for x in $(grep -lr APP_HOST .nuxt/);do - sed -i -e "s#\"APP_HOST\":\"dot-dot.local\"#\"APP_HOST\":\"${APP_HOST}\"#g" $x -done - -for x in $(grep -lr BASE_URL .nuxt/);do - sed -i -e "s#\"BASE_URL\":\"http://dot-dot.local\"#\"BASE_URL\":\"${BASE_URL}\"#g" $x -done - -for x in $(grep -lr API_URL .nuxt/);do - sed -i -e "s#\"API_URL\":\"http://dot-dot.local/\"#\"API_URL\":\"${API_URL}\"#g" $x -done - -for x in $(grep -lr APP_ENVIRONMENT .nuxt/);do - sed -i -e "s#\"APP_ENVIRONMENT\":\"development\"#\"APP_ENVIRONMENT\":\"${APP_ENVIRONMENT}\"#g" $x - sed -i -e "s#\"APP_ENVIRONMENT\": \"development\"#\"APP_ENVIRONMENT\":\"${APP_ENVIRONMENT}\"#g" $x - sed -i -e "s#APP_ENVIRONMENT:\"development\"#\"APP_ENVIRONMENT\":\"${APP_ENVIRONMENT}\"#g" $x -done - -for x in $(grep -lr WS_PROTOCOL .nuxt/);do - sed -i -e "s#\"WS_PROTOCOL\":\"ws\"#\"WS_PROTOCOL\":\"${WS_PROTOCOL}\"#g" $x - sed -i -e "s#WS_PROTOCOL:\"ws\"#\"WS_PROTOCOL\":\"${WS_PROTOCOL}\"#g" $x - sed -i -e "s#\"WS_PROTOCOL\": \"ws\"#\"WS_PROTOCOL\": \"${WS_PROTOCOL}\"#g" $x -done - -for x in $(grep -lr dot-dot.local .nuxt/);do - echo "replace dot-dot.local to ${DOMAIN} in $x" - sed -i -e "s#dot-dot.local#${DOMAIN}#g" $x; -done - -for x in $(grep -lr http://${DOMAIN} .nuxt/);do - echo "replace http://${DOMAIN} to ${APP_SCHEME}://${DOMAIN} in $x" - sed -i -e "s#http://${DOMAIN}#${APP_SCHEME}://${DOMAIN}#g" $x; +for x in $(grep -lrw "dot-dot.ru" .nuxt/);do + echo "replace dot-dot.ru to https://${DOMAIN} in $x" + sed -i -e "s/dot-dot.ru/${DOMAIN}/g" $x; done "$@" diff --git a/configs/php/.env b/configs/php/.env index 49c9ec9..e371adc 100644 --- a/configs/php/.env +++ b/configs/php/.env @@ -136,6 +136,10 @@ MAGIC_API_URL=https://magic-trans.ru/ ML_REGULAR_DIRECTION_HISTORY_ORDER_URL=https://ml.dot-dot.ru/v1/schedule/transport/orders SMS_PROVIDER=prostor-sms -PROSTOR_SMS_END_POINT_URL=http://api.prostor-sms.ru/ +PROSTOR_SMS_END_POINT_URL=http://api.prostor-sms.ru PROSTOR_SMS_LOGIN=secret PROSTOR_SMS_PASSWORD=secret + +ACCOUNTING_AUDIT_URL=https://crm.dot-dot.ru +ACCOUNTING_AUDIT_LOGIN=secret +ACCOUNTING_AUDIT_PASSWORD=secret diff --git a/configs/php/.env.local b/configs/php/.env.local index 010bf9c..72fca57 100644 --- a/configs/php/.env.local +++ b/configs/php/.env.local @@ -1,5 +1,5 @@ CONTAINER_NAME=php -APP_ENV=prod +APP_ENV=dev NotificationBuildServicejSP_KEY=16e93b225c730920ac5741a8d8df788f DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833 @@ -45,10 +45,6 @@ COMAGIC_URL=https://dataapi.comagic.ru/v2.0 COMAGIC_KEY=j769gveux0brdq7wb6insegwtczvz7nsqmuntkqv ###< comagic ### -###> carrier_scoring ### -ML_CARRIER_SCORING=https://ml.dot-dot.ru/v2/classification/carrier/scoring -###< carrier_scoring ### - ###> direction_scoring ### ML_DIRECTION_SCORING_URL=https://ml.dot-dot.ru/v3/classification/direction/confidence ###< direction_scoring ### @@ -118,8 +114,6 @@ ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://ml.dot-dot.ru/v2/schedule/ca ML_REGULAR_DIRECTION_URL=https://ml.dot-dot.ru/v2/schedule/transport -ACCOUNTING_AUDIT_URL="https://crm.dot-dot.ru/TTLBuhreport/hs/TT/reconciliationreport" - ###> YandexTracker ### YTRACKER_API_TOKEN="y0_AgAEA7qkKFmeAAjF8AAAAADXovQd6htdkt7LTDW_sNHCz7qV9zdVHaQ" YTRACKER_ORGANISATION_ID=355207 @@ -154,3 +148,28 @@ USER_TRUST_CHECK_BACKEND=true ###< API_KONTUR_FOCUS### QUEUE_DSN_USER_TRUST=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/USER_TRUST + +PROSTOR_SMS_LOGIN=ap142656 +PROSTOR_SMS_PASSWORD=808350 + +###> OTK ### +OTK_API_END_POINT_URL="https://test-api.otk.su" +OTK_API_TOKEN="Q5vBE9jusg38Rk7wHt2bzycT4K6pePFZ" +###< OTK ### + +SIGNER_URL=https://stagingsigner.dot-dot.ru +SIGNER_API_TOKEN='siofdhgt2349875t3iqhf1h2g*^&^%&^GHJGJCxgf' + +ACCOUNTING_AUDIT_LOGIN=ReportServis +ACCOUNTING_AUDIT_PASSWORD=fE7mubiv + + +ML_CALCULATOR_SPOT_URL=https://ml.dot-dot.ru/v1/price_calculator/spot + +###DD-3705### +ML_CARRIER_SCORING=https://ml.dot-dot.ru/v3/classification/carrier/scoring +QUEUE_DSN_RELEVANT_CARRIER_EXPORT=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/RELEVANT_CARRIER_EXPORT +###DD-3705### + + +FNS_ACCESS_TOKEN=a5639b93fe4e7c9a3f1dd85537e066d36439c352 diff --git a/configs/signer/.env b/configs/signer/.env new file mode 100644 index 0000000..f33b8bb --- /dev/null +++ b/configs/signer/.env @@ -0,0 +1,6 @@ +APP_ENV=dev +APP_SECRET=850da55654c68f779822ea80d2b66a94 +DATABASE_URL=mysql://root:root@db:3306/dot?serverVersion=mariadb-10.3.25 +DOT_DOT_URL='https://staging.dot-dot.ru' + +API_TOKEN='siofdhgt2349875t3iqhf1h2g*^&^%&^GHJGJCxgf' \ No newline at end of file diff --git a/configs/signer/.env.local b/configs/signer/.env.local new file mode 100644 index 0000000..e0fd660 --- /dev/null +++ b/configs/signer/.env.local @@ -0,0 +1,3 @@ +APP_ENV=dev +DOT_DOT_URL=https://staging.dot-dot.ru +API_TOKEN='siofdhgt2349875t3iqhf1h2g*^&^%&^GHJGJCxgf' diff --git a/docker-compose.yml b/docker-compose.yml index c4f705b..a63d31c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,6 +24,11 @@ x-defaults-php: &defaults-php depends_on: - db - rabbitmq + extra_hosts: + - "sentry.dot-dot.ru:192.168.100.111" + - "stagingsigner.dot-dot.ru:192.168.100.110" + - "staging.dot-dot.ru:192.168.100.110" + - "staginglms.dot-dot.ru:192.168.100.110" networks: - dd @@ -85,17 +90,6 @@ services: <<: *defaults-php command: sh -c 'while true; do echo run; ./bin/console app:auction:process; sleep 60;done' - lms: - image: registry.dot-dot.ru/lms:${LMS_TAG} - restart: unless-stopped - command: npm run start - volumes: - - ./configs/lms/.env:/app/.env - env_file: - - ./configs/lms/.env - networks: - - dd - static: image: registry.dot-dot.ru/dot-dot-static:${DOTDOT_TAG} restart: unless-stopped @@ -111,24 +105,36 @@ services: - ./configs/nuxt/entrypoint.sh:/entrypoint.sh env_file: - ./configs/nuxt/.env + entrypoint: /entrypoint.sh networks: - dd - dashboard: - image: registry.dot-dot.ru/dashboard:${DASHBORD_TAG} - command: frankenphp php-server -r /application/public + lms: + image: registry.dot-dot.ru/lms:${LMS_TAG} restart: unless-stopped - environment: - - SERVER_NAME=stagingdashboard.dot-dot.ru + command: npm run start volumes: - - ./configs/dashboard/.env:/application/.env + - ./configs/lms/.env:/app/.env + - ./configs/lms/entrypoint.sh:/entrypoint.sh + env_file: + - ./configs/lms/.env + entrypoint: /entrypoint.sh + networks: + - dd + + admin: + image: registry.dot-dot.ru/admin:${ADMIN_TAG} + restart: unless-stopped + command: sh -c 'php-fpm -D; nginx' + volumes: + - ./configs/admin/default:/etc/nginx/sites-enabled/default + - ./configs/admin/.env:/application/.env + - ./configs/nginx/ssl:/etc/nginx/ssl depends_on: - db networks: dd: - ingress: - aliases: - - ${NETWORK}-dashboard + nginx: image: nginx:1.25.3-alpine3.18 @@ -184,3 +190,37 @@ services: - "--redis.password=${REDIS_PASSWORD}" networks: dd: {} + + signer: + image: registry.dot-dot.ru/signer:${SIGNER_TAG} + command: "frankenphp php-server -l 0.0.0.0:8000 -r ./public" + restart: unless-stopped + privileged: true + volumes: + - ./signeddocs:/documents + - ./configs/signer/.env:/usr/src/signer/backend/.env + - ./configs/signer/.env.local:/usr/src/signer/backend/.env.local + # - ./configs/signer/license.key:/usr/src/signer/license.key + - /dev/bus/usb:/dev/bus/usb + env_file: + - ./configs/signer/.env.local + - ./configs/signer/.env + extra_hosts: + - "staging.dot-dot.ru:192.168.100.110" + - "staginglms.dot-dot.ru:192.168.100.110" + - "stagingsigner.dot-dot.ru:192.168.100.110" + networks: + - dd + + cabinet: + image: registry.dot-dot.ru/dot_dot_cargo_carrier:${CABINET_TAG} + restart: unless-stopped + command: npm run start + volumes: + - ./configs/cabinet/.env:/app/.env + - ./configs/cabinet/entrypoint.sh:/entrypoint.sh + env_file: + - ./configs/cabinet/.env + entrypoint: /entrypoint.sh + networks: + - dd