diff --git a/.env b/.env index 419cfa8..6fbd610 100644 --- a/.env +++ b/.env @@ -1,5 +1,5 @@ -1COMPOSE_PROJECT_NAME=tqo -NETWORK=tqo +1COMPOSE_PROJECT_NAME=eks +NETWORK=eks FRONT_TAG=139.1 DOTDOT_TAG=139.1 @@ -8,7 +8,7 @@ ADMIN_TAG=master LANDING_TAG=master CABINET_TAG=DD-4159 -MYSQL_PORT=0.0.0.0:33064 +MYSQL_PORT=0.0.0.0:33065 MYSQL_ROOT_PASSWORD=seeFiethae8enga6ohNi MYSQL_DATABASE=dot MYSQL_USER=dot diff --git a/configs/admin/.env b/configs/admin/.env index 56102e4..08ae0d4 100644 --- a/configs/admin/.env +++ b/configs/admin/.env @@ -3,10 +3,10 @@ APP_ENV=production APP_KEY=base64:IsI2/a6+WLRl5owxc1i5F+bbOZi7DjaS0IMEoxg14c0= APP_DEBUG=true APP_TIMEZONE=UTC -APP_URL=https://tqoadmin.spottorg.ru -FRONTEND_URL=https://tqoadmin.spottorg.ru -ASSET_URL=https://tqoadmin.spottorg.ru -APP_EMAIL_DOMAIN="tqo.spottorg.ru" +APP_URL=https://eksadmin.spottorg.ru +FRONTEND_URL=https://eksadmin.spottorg.ru +ASSET_URL=https://eksadmin.spottorg.ru +APP_EMAIL_DOMAIN="eks.spottorg.ru" APP_LOCALE=ru APP_FALLBACK_LOCALE=ru @@ -77,4 +77,4 @@ AWS_USE_PATH_STYLE_ENDPOINT=false VITE_APP_NAME="${APP_NAME}" -DOT_DOT_HOST=https://tqolms.spottorg.ru +DOT_DOT_HOST=https://ekslms.spottorg.ru diff --git a/configs/admin/default b/configs/admin/default index 5061e0a..2e47fc3 100644 --- a/configs/admin/default +++ b/configs/admin/default @@ -1,5 +1,5 @@ server { - server_name tqoadmin.spottorg.ru; + server_name eksadmin.spottorg.ru; listen 443 ssl; ssl_certificate /etc/letsencrypt/live/spottorg.ru/fullchain.pem; diff --git a/configs/cabinet/.env b/configs/cabinet/.env index 66e3ba4..6df16ea 100755 --- a/configs/cabinet/.env +++ b/configs/cabinet/.env @@ -2,11 +2,11 @@ NUXT_HOST=0.0.0.0 NUXT_PORT=3000 NUXT_ENV_DEVALUE_LOG_LEVEL=silent WS_PROTOCOL=wss -BASE_URL=tqo.spottorg.ru -API_URL=https://tqolms.spottorg.ru/ -DOMAIN=tqo.spottorg.ru +BASE_URL=eks.spottorg.ru +API_URL=https://ekslms.spottorg.ru/ +DOMAIN=eks.spottorg.ru -APP_HOST=tqolms.spottorg.ru +APP_HOST=ekslms.spottorg.ru APP_SCHEME=https APP_ENVIRONMENT=production DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833 diff --git a/configs/centrifugo/config.json b/configs/centrifugo/config.json index 52d19d7..cd86e45 100644 --- a/configs/centrifugo/config.json +++ b/configs/centrifugo/config.json @@ -4,7 +4,7 @@ "admin_secret": "ca0a7656-f589-42e6-9e49-98dd3c5beb46", "api_key": "aa7443fb-e623-4363-91ac-ef25908b1403", "admin": true, - "allowed_origins": ["https://tqolms.spottorg.ru", "https://tqo.spottorg.ru"], + "allowed_origins": ["https://ekslms.spottorg.ru", "https://eks.spottorg.ru"], "allow_subscribe_for_client": true, "allow_user_limited_channels": true } diff --git a/configs/landing/config.php b/configs/landing/config.php index 818db29..96985a5 100644 --- a/configs/landing/config.php +++ b/configs/landing/config.php @@ -15,7 +15,7 @@ return [ 'recipients' => [ // Получателей может быть несколько 0 => [ - 'email' => 'rzaharov@tqo.spottorg.ru', + 'email' => 'rzaharov@eks.spottorg.ru', 'name' => 'Менеджер' ] ], diff --git a/configs/lms/.env b/configs/lms/.env index 9a2320d..0c83267 100755 --- a/configs/lms/.env +++ b/configs/lms/.env @@ -2,11 +2,11 @@ NUXT_HOST=0.0.0.0 NUXT_PORT=3000 NUXT_ENV_DEVALUE_LOG_LEVEL=silent WS_PROTOCOL=wss -BASE_URL=https://tqolms.spottorg.ru/ -API_URL=https://tqolms.spottorg.ru/ -DOMAIN=tqolms.spottorg.ru +BASE_URL=https://ekslms.spottorg.ru/ +API_URL=https://ekslms.spottorg.ru/ +DOMAIN=ekslms.spottorg.ru -APP_HOST=tqolms.spottorg.ru +APP_HOST=ekslms.spottorg.ru APP_SCHEME=https APP_ENVIRONMENT=production DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833 diff --git a/configs/nginx/conf.d/admin.conf b/configs/nginx/conf.d/admin.conf index 1307118..902eb80 100644 --- a/configs/nginx/conf.d/admin.conf +++ b/configs/nginx/conf.d/admin.conf @@ -1,20 +1,20 @@ server { listen 80; - server_name tqoadmin.spottorg.ru; + server_name eksadmin.spottorg.ru; return 301 https://$server_name$request_uri; } server { listen 443 ssl; - server_name tqoadmin.spottorg.ru; + server_name eksadmin.spottorg.ru; ssl_certificate /etc/nginx/ssl/spottorg.crt; ssl_certificate_key /etc/nginx/ssl/spottorg.key; client_max_body_size 10m; - access_log /var/log/nginx/tqoadmin.spottorg.ru_access.log json; - error_log /var/log/nginx/tqoadmin.spottorg.ru_error.log; + access_log /var/log/nginx/eksadmin.spottorg.ru_access.log json; + error_log /var/log/nginx/eksadmin.spottorg.ru_error.log; location / { proxy_pass https://admin:443; diff --git a/configs/nginx/conf.d/cabinet.conf b/configs/nginx/conf.d/cabinet.conf index dc01a9c..5f58641 100644 --- a/configs/nginx/conf.d/cabinet.conf +++ b/configs/nginx/conf.d/cabinet.conf @@ -1,6 +1,6 @@ server { listen 443 ssl ; - server_name tqo.spottorg.ru; + server_name eks.spottorg.ru; ssl_certificate /etc/nginx/ssl/spottorg.crt; ssl_certificate_key /etc/nginx/ssl/spottorg.key; diff --git a/configs/nginx/conf.d/demo.conf b/configs/nginx/conf.d/demo.conf index 4d56ad3..f97021a 100755 --- a/configs/nginx/conf.d/demo.conf +++ b/configs/nginx/conf.d/demo.conf @@ -1,12 +1,12 @@ server { listen 80; - server_name lmstqo.spottorg.ru; + server_name lmseks.spottorg.ru; return 301 https://$server_name$request_uri; } server { listen 443 ssl; - server_name lmstqo.spottorg.ru; + server_name lmseks.spottorg.ru; ssl_certificate /etc/nginx/ssl/spottorg.crt; ssl_certificate_key /etc/nginx/ssl/spottorg.key; diff --git a/configs/nginx/conf.d/demows.conf b/configs/nginx/conf.d/demows.conf index f86e5b8..69de20c 100644 --- a/configs/nginx/conf.d/demows.conf +++ b/configs/nginx/conf.d/demows.conf @@ -1,6 +1,6 @@ server { listen 80; - server_name wstqo.spottorg.ru; + server_name wseks.spottorg.ru; return 301 https://$server_name$request_uri; } @@ -10,10 +10,10 @@ upstream centrifugo { server { listen 443 ssl; - server_name wstqo.spottorg.ru; + server_name wseks.spottorg.ru; - access_log /var/log/nginx/wstqo.spottorg.ru_access.log json; - error_log /var/log/nginx/wstqo.spottorg.ru_error.log; + access_log /var/log/nginx/wseks.spottorg.ru_access.log json; + error_log /var/log/nginx/wseks.spottorg.ru_error.log; ssl_certificate /etc/nginx/ssl/spottorg.crt; ssl_certificate_key /etc/nginx/ssl/spottorg.key; diff --git a/configs/nginx/conf.d/landing.conf b/configs/nginx/conf.d/landing.conf index 9587339..b702f30 100644 --- a/configs/nginx/conf.d/landing.conf +++ b/configs/nginx/conf.d/landing.conf @@ -1,20 +1,20 @@ server { listen 80; - server_name landingtqo.spottorg.ru; + server_name landingeks.spottorg.ru; return 301 https://$server_name$request_uri; } server { listen 443 ssl; - server_name landingtqo.spottorg.ru; + server_name landingeks.spottorg.ru; ssl_certificate /etc/nginx/ssl/spottorg.crt; ssl_certificate_key /etc/nginx/ssl/spottorg.key; client_max_body_size 10m; - access_log /var/log/nginx/landingtqo.spottorg.ru_access.log json; - error_log /var/log/nginx/landingtqo.spottorg.ru_error.log; + access_log /var/log/nginx/landingeks.spottorg.ru_access.log json; + error_log /var/log/nginx/landingeks.spottorg.ru_error.log; location / { proxy_pass http://landing:80; diff --git a/configs/nginx/conf.d/lms.conf b/configs/nginx/conf.d/lms.conf index fe7a036..86eef9c 100755 --- a/configs/nginx/conf.d/lms.conf +++ b/configs/nginx/conf.d/lms.conf @@ -1,18 +1,18 @@ server { listen 80; - server_name tqolms.spottorg.ru; + server_name ekslms.spottorg.ru; return 301 https://$server_name$request_uri; } server { listen 443 ssl; - server_name tqolms.spottorg.ru; + server_name ekslms.spottorg.ru; ssl_certificate /etc/nginx/ssl/spottorg.crt; ssl_certificate_key /etc/nginx/ssl/spottorg.key; - access_log /var/log/nginx/tqolms.spottorg.ru_access.log json; - error_log /var/log/nginx/tqolms.spottorg.ru_error.log; + access_log /var/log/nginx/ekslms.spottorg.ru_access.log json; + error_log /var/log/nginx/ekslms.spottorg.ru_error.log; root /application/public; diff --git a/configs/nginx/conf.d/rabbitmq.conf b/configs/nginx/conf.d/rabbitmq.conf index 6b7c6d6..7d6fdde 100755 --- a/configs/nginx/conf.d/rabbitmq.conf +++ b/configs/nginx/conf.d/rabbitmq.conf @@ -1,15 +1,15 @@ server { listen 80; - server_name rabbitmqtqo.spottorg.ru; + server_name rabbitmqeks.spottorg.ru; return 301 https://$server_name$request_uri; } server { listen 443 ssl; - server_name rabbitmqtqo.spottorg.ru; + server_name rabbitmqeks.spottorg.ru; - access_log /var/log/nginx/rabbitmqlmstqo.spottorg.ru_access.log json; - error_log /var/log/nginx/rabbitmqlmstqo.spottorg.ru_error.log; + access_log /var/log/nginx/rabbitmqlmseks.spottorg.ru_access.log json; + error_log /var/log/nginx/rabbitmqlmseks.spottorg.ru_error.log; ssl_certificate /etc/nginx/ssl/spottorg.crt; ssl_certificate_key /etc/nginx/ssl/spottorg.key; diff --git a/configs/nuxt/.env b/configs/nuxt/.env index aa8a7f4..c40b69f 100755 --- a/configs/nuxt/.env +++ b/configs/nuxt/.env @@ -2,11 +2,11 @@ NUXT_HOST=0.0.0.0 NUXT_PORT=3000 NUXT_ENV_DEVALUE_LOG_LEVEL=silent WS_PROTOCOL=wss -BASE_URL=tqolms.spottorg.ru -API_URL=https://tqolms.spottorg.ru/ -DOMAIN=tqolms.spottorg.ru +BASE_URL=ekslms.spottorg.ru +API_URL=https://ekslms.spottorg.ru/ +DOMAIN=ekslms.spottorg.ru -APP_HOST=tqolms.spottorg.ru +APP_HOST=ekslms.spottorg.ru APP_SCHEME=https APP_ENVIRONMENT=production DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833 diff --git a/configs/nuxt/entrypoint.sh b/configs/nuxt/entrypoint.sh index 350c4cb..f2a2ff9 100755 --- a/configs/nuxt/entrypoint.sh +++ b/configs/nuxt/entrypoint.sh @@ -1,10 +1,10 @@ #!/bin/sh -DOMAIN="${DOMAIN:-tqo.spottorg.ru}" +DOMAIN="${DOMAIN:-eks.spottorg.ru}" -for x in $(grep -lrw "tqo.spottorg.ru" .nuxt/);do - echo "replace tqo.spottorg.ru to https://${DOMAIN} in $x" - sed -i -e "s/tqo.spottorg.ru/${DOMAIN}/g" $x; +for x in $(grep -lrw "eks.spottorg.ru" .nuxt/);do + echo "replace eks.spottorg.ru to https://${DOMAIN} in $x" + sed -i -e "s/eks.spottorg.ru/${DOMAIN}/g" $x; done "$@" diff --git a/configs/php/.env b/configs/php/.env index f78ae7a..bd65fdd 100755 --- a/configs/php/.env +++ b/configs/php/.env @@ -9,7 +9,7 @@ DATABASE_URL_DOT=mysql://root:seeFiethae8enga6ohNi@db:3306/dot?serverVersion=mar DATABASE_URL_DOT_STATISTIC=mysql://root:seeFiethae8enga6ohNi@db:3306/dot_statistic?serverVersion=mariadb-10.3.25 DOCUMENT_ROOT=/application -APP_HOST=lmstqo.spottorg.ru +APP_HOST=lmseks.spottorg.ru APP_SCHEME=https MAILER_DSN=null://null @@ -53,13 +53,13 @@ FNS_ACCESS_TOKEN=secret GOOGLE_MAPS_ACCESS_KEY=secret GOOGLE_MAPS_BASE_URL=https://maps.google.com -ML_CALCULATOR_URL=https://calc.dev.tqo.spottorg.ru/v1/calculate +ML_CALCULATOR_URL=https://calc.dev.eks.spottorg.ru/v1/calculate -ML_REGULAR_DIRECTION_URL=https://calc.dev.tqo.spottorg.ru/v2/schedule/transport -ML_REGULAR_DIRECTION_CHAIN_URL=https://calc.dev.tqo.spottorg.ru/v1/schedule/chains -ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://calc.dev.tqo.spottorg.ru/v1/schedule/carrier/scoring -ML_REGULAR_DIRECTION_CHAIN_RELEVANCE_CARRIERS_URL=https://calc.dev.tqo.spottorg.ru/v1/schedule/chains/carrier/scoring -ML_UNCERTAIN_DIRECTIONS_URL=https://calc.dev.tqo.spottorg.ru/v1/classification/direction/uncertain +ML_REGULAR_DIRECTION_URL=https://calc.dev.eks.spottorg.ru/v2/schedule/transport +ML_REGULAR_DIRECTION_CHAIN_URL=https://calc.dev.eks.spottorg.ru/v1/schedule/chains +ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://calc.dev.eks.spottorg.ru/v1/schedule/carrier/scoring +ML_REGULAR_DIRECTION_CHAIN_RELEVANCE_CARRIERS_URL=https://calc.dev.eks.spottorg.ru/v1/schedule/chains/carrier/scoring +ML_UNCERTAIN_DIRECTIONS_URL=https://calc.dev.eks.spottorg.ru/v1/classification/direction/uncertain YANDEX_MAPS_ACCESS_KEY=secret YANDEX_MAPS_BASE_URL=https://api.routing.yandex.net @@ -139,12 +139,12 @@ PROSTOR_SMS_END_POINT_URL=http://api.prostor-sms.ru PROSTOR_SMS_LOGIN=secret PROSTOR_SMS_PASSWORD=secret -ACCOUNTING_AUDIT_URL=https://crm.tqo.spottorg.ru +ACCOUNTING_AUDIT_URL=https://crm.eks.spottorg.ru ACCOUNTING_AUDIT_LOGIN=secret ACCOUNTING_AUDIT_PASSWORD=secret -APP_LMS_HOST=lmstqo.spottorg.ru -APP_CARGO_CARRIER_HOST=tqo.spottorg.ru +APP_LMS_HOST=lmseks.spottorg.ru +APP_CARGO_CARRIER_HOST=eks.spottorg.ru QUEUE_DSN_AUCTION_CARRIER_VERIFICATION=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/AUCTION_CARRIER_VERIFICATION @@ -159,8 +159,8 @@ API_KONTUR_DIADOC_SELF_BOX_ID='322d597d-964d-48a8-baa5-2380161826f8' ###< KONTUR_DIADOC### ###> KONTUR_DIADOC### -SIGNER_DOCS_API_URL=https://testcsigner.tqo.spottorg.ru +SIGNER_DOCS_API_URL=https://testcsigner.eks.spottorg.ru SIGNER_DOCS_API_TOKEN=secret -SIGNER_URL=https://testcsigner.tqo.spottorg.ru +SIGNER_URL=https://testcsigner.eks.spottorg.ru SIGNER_API_TOKEN='siofdhgt2349875t3iqhf1h2g*^&^%&^GHJGJCxgf' ###< KONTUR_DIADOC### diff --git a/configs/php/.env.local b/configs/php/.env.local index 0c1a7e8..d5aed80 100755 --- a/configs/php/.env.local +++ b/configs/php/.env.local @@ -17,7 +17,7 @@ FNS_ACCESS_TOKEN=a5639b93fe4e7c9a3f1dd85537e066d36439c352 GOOGLE_MAPS_ACCESS_KEY=AIzaSyBCPl2LcpRvplzLUNVMVLhA3b7k46lTCTg -NUXT_BASE_URL=tqolms.spottorg.ru +NUXT_BASE_URL=ekslms.spottorg.ru ATISU_API_TOKEN=46b599c3ab7f4574b560f48ea005d9f3 @@ -181,8 +181,8 @@ QUEUE_DSN_RELEVANT_CARRIER_EXPORT=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5 PLATFORM_NAME=СПОТТОРГ -APP_LMS_HOST=tqolms.spottorg.ru -APP_CARGO_CARRIER_HOST=tqo.spottorg.ru +APP_LMS_HOST=ekslms.spottorg.ru +APP_CARGO_CARRIER_HOST=eks.spottorg.ru ###> KONTUR_DIADOC### diff --git a/docker-compose.yml b/docker-compose.yml index c30ba6c..d72d5a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,9 +26,9 @@ x-defaults-php: &defaults-php - db - rabbitmq extra_hosts: - - "lmstqo.spottorg.ru:192.168.90.100" - - "tqo.spottorg.ru:192.168.90.100" - - "admintqo.spottorg.ru:192.168.90.100" + - "lmseks.spottorg.ru:192.168.90.100" + - "eks.spottorg.ru:192.168.90.100" + - "admineks.spottorg.ru:192.168.90.100" networks: - dd