From dbfa676e341fc7de417a9a7bbae8e8bce92d5935 Mon Sep 17 00:00:00 2001 From: ddadmin Date: Mon, 20 Oct 2025 22:05:16 +0300 Subject: [PATCH] update --- .env | 6 ++-- app.sh | 10 +++--- configs/1cview/.env.local | 2 +- configs/nginx/conf.d/cabinet.conf | 4 --- configs/nginx/conf.d/default.conf | 4 --- configs/nginx/conf.d/lms.conf | 4 --- configs/nuxt/.env | 15 -------- configs/nuxt/entrypoint.sh | 10 ------ configs/php/.env.local | 33 ++++++++++++++++-- docker-compose.yml | 57 ++++++++++++------------------- 10 files changed, 61 insertions(+), 84 deletions(-) delete mode 100644 configs/nuxt/.env delete mode 100755 configs/nuxt/entrypoint.sh diff --git a/.env b/.env index 5fe3183..fdedc68 100644 --- a/.env +++ b/.env @@ -2,13 +2,13 @@ COMPOSE_PROJECT_NAME=staging NETWORK=staging FRONT_TAG=develop -DOTDOT_TAG=DDB-2032 +DOTDOT_TAG=master LMS_TAG=master DASHBORD_TAG=master SIGNER_TAG=master ADMIN_TAG=master -CABINET_TAG=master -LANDINGTTL_TAG=DDB-2012 +CABINET_TAG=DDB-1925 +LANDINGTTL_TAG=master CVIEW_TAG=master MYSQL_PORT=0.0.0.0:33067 diff --git a/app.sh b/app.sh index 86c2dea..6ba601e 100755 --- a/app.sh +++ b/app.sh @@ -1,8 +1,8 @@ DIRECTORY=`dirname $0` -MYSQL_ROOT_PASSWORD=$(grep MYSQL_ROOT_PASSWORD $DIRECTORY"/.env" | xargs) -MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD#*=} - +#MYSQL_ROOT_PASSWORD=$(grep MYSQL_ROOT_PASSWORD $DIRECTORY"/.env" | xargs) +#MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD#*=} +source $DIRECTORY"/.env" help() { echo "run $0 [COMMAND] " echo ' @@ -48,7 +48,7 @@ log() { ## restore last backup from s3 storage restoredb() { log "run restore database" - sudo rclone copy --verbose selectel:backup_db/dot/dot.$(date +%a).sql.gz backups/ + sudo rclone copy --verbose selectel:backup_db/dot/prod/dot.$(date +%a).sql.gz backups/ zcat backups/dot.$(date +%a).sql.gz | docker compose exec -T db mysql -uroot -p${MYSQL_ROOT_PASSWORD} dot } @@ -169,7 +169,7 @@ case "$1" in "front"*) case $2 in *) - docker compose exec nuxt ${@:2};; + docker compose exec landing-ttl ${@:2};; esac;; *) help diff --git a/configs/1cview/.env.local b/configs/1cview/.env.local index e4db46f..790f975 100644 --- a/configs/1cview/.env.local +++ b/configs/1cview/.env.local @@ -1,2 +1,2 @@ AUTH_API_TOKEN="noin3seep7paiFe2ahbu" -DATABASE_URL="postgresql://ddadmin:1NcSyXq9Ha1@@1c.dot-dot.ru:5433/TTL_BUH?serverVersion=16&charset=utf8" +DATABASE_URL="postgresql://ddadmin:1NcSyXq9Ha1@@1c.dot-dot.ru:5433/TTL_Buh?serverVersion=16&charset=utf8" diff --git a/configs/nginx/conf.d/cabinet.conf b/configs/nginx/conf.d/cabinet.conf index 4c81437..9aa8f1f 100644 --- a/configs/nginx/conf.d/cabinet.conf +++ b/configs/nginx/conf.d/cabinet.conf @@ -48,10 +48,6 @@ server { rewrite ^(.*)$ /index.php/$1 last; } - # location /storybook { - # alias /application/nuxt/storybook-static; - # } - location /logout { try_files $uri @rewriteapp; } diff --git a/configs/nginx/conf.d/default.conf b/configs/nginx/conf.d/default.conf index 0646cbb..f51c892 100644 --- a/configs/nginx/conf.d/default.conf +++ b/configs/nginx/conf.d/default.conf @@ -41,10 +41,6 @@ server { rewrite ^(.*)$ /index.php/$1 last; } - # location /storybook { - # alias /application/nuxt/storybook-static; - # } - location /logout { try_files $uri @rewriteapp; } diff --git a/configs/nginx/conf.d/lms.conf b/configs/nginx/conf.d/lms.conf index 3aeb15d..aa13a74 100644 --- a/configs/nginx/conf.d/lms.conf +++ b/configs/nginx/conf.d/lms.conf @@ -43,10 +43,6 @@ server { rewrite ^(.*)$ /index.php/$1 last; } - # location /storybook { - # alias /application/nuxt/storybook-static; - # } - location /logout { try_files $uri @rewriteapp; } diff --git a/configs/nuxt/.env b/configs/nuxt/.env deleted file mode 100644 index b04281a..0000000 --- a/configs/nuxt/.env +++ /dev/null @@ -1,15 +0,0 @@ -NUXT_HOST=0.0.0.0 -NUXT_PORT=3000 -NUXT_ENV_DEVALUE_LOG_LEVEL=silent -WS_PROTOCOL=wss -BASE_URL=staging.dot-dot.ru -API_URL=https://staging.dot-dot.ru/ -DOMAIN=staging.dot-dot.ru - -APP_HOST=staging.dot-dot.ru -APP_SCHEME=https -APP_ENVIRONMENT=development -DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833 -YANDEX_METRIKA_ID=50156956 -PHONE_KEY=qwefghzcx -SMARTCAPTCHA_CLIENT_KEY=ysc1_GLQZ8QPaFh0eXqZ5KaRM0WJYqoP9vL0uqhujfcw75c1487df diff --git a/configs/nuxt/entrypoint.sh b/configs/nuxt/entrypoint.sh deleted file mode 100755 index a1dc972..0000000 --- a/configs/nuxt/entrypoint.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -DOMAIN="${DOMAIN:-dot-dot.ru}" - -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.local b/configs/php/.env.local index 3d3a33f..63d3385 100644 --- a/configs/php/.env.local +++ b/configs/php/.env.local @@ -171,10 +171,10 @@ ACCOUNTING_AUDIT_LOGIN=ReportServis ACCOUNTING_AUDIT_PASSWORD=fE7mubiv -ML_CALCULATOR_SPOT_URL=https://ml.dot-dot.ru/v1/price_calculator/spot +ML_CALCULATOR_SPOT_URL=https://ml.dot-dot.ru/v2/price_calculator/spot ###DD-3705### -ML_CARRIER_SCORING=https://ml.dot-dot.ru/v3/classification/carrier/scoring +ML_CARRIER_SCORING=https://ml.dot-dot.ru/v4/classification/carrier/scoring QUEUE_DSN_RELEVANT_CARRIER_EXPORT=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/RELEVANT_CARRIER_EXPORT ###DD-3705### @@ -205,4 +205,31 @@ RECONCILIATION_ACTS=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/RECONC TENANT=dot ACCOUNTING_ADAPTER_SERVICE_URL="https://staging1c-view.dot-dot.ru" -ACCOUNTING_ADAPTER_SERVICE_SECRET="noin3seep7paiFe2ahbu" \ No newline at end of file +ACCOUNTING_ADAPTER_SERVICE_SECRET="noin3seep7paiFe2ahbu" + +###TD-480 +#MAILER_DSN_YANDEX=smtp://no_reply@dot-dot.ru:gqwaofmeyvxefrqk@smtp.yandex.ru:587 +MAILER_DSN=smtp://no_reply@dot-dot.ru:NRTk7rXhesHQpi3YWB92@smtp.mail.ru:465 + +SYNC_HOST_LIST='{"1bcf26e8-e53a-4960-9cc7-d212685f033f":"magnit", "d61013fb-fb8c-4a45-b14d-369ffad35b93":"5ka"}' +SYNC_HOST_TYPE=master +SYNC_HOST_MASTER_URL='' +SYNC_HOST_MASTER_SECRET='' +SYNC_HOST_SYNC_ITEM_PART_LIMIT=100 + + +#> UNISENDER# TD-550 +UNISENDER_API_URL=https://api.unisender.com/ru +UNISENDER_API_KEY=6x8r8aauy8noqwubbfiqgt13wucrjaomz913jtwy +UNISENDER_SENDER_NAME=Точка-точка +#< UNISENDER# + +### +ACTIVE_MAILER=mailer +### + +###> MOVIZOR### DD-4184 off_on_test_workspaces +#MOVIZOR_API_URL=https://movizor.ru/api_2 +#MOVIZOR_PROJECT=dotdotcorp +#MOVIZOR_API_KEY=51b72575938f16da14275483 +###< MOVIZOR### diff --git a/docker-compose.yml b/docker-compose.yml index dcb4616..91185d0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -107,18 +107,6 @@ services: networks: - dd - nuxt: - image: registry.dot-dot.ru/front:${FRONT_TAG} - restart: unless-stopped - command: npm run start - volumes: - - ./configs/nuxt/.env:/app/.env - - ./configs/nuxt/entrypoint.sh:/entrypoint.sh - env_file: - - ./configs/nuxt/.env - entrypoint: /entrypoint.sh - networks: - - dd lms: image: registry.dot-dot.ru/lms:${LMS_TAG} @@ -164,7 +152,6 @@ services: - certbot_volume:/etc/letsencrypt - nginx_log_volume:/var/log/nginx depends_on: - - nuxt - php - static networks: @@ -205,28 +192,28 @@ services: networks: dd: {} - signer: - image: registry.dot-dot.ru/signer:${SIGNER_TAG} - command: bash -c 'php-fpm8.3 -R; nginx' - 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: - - "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 - +# signer: +# image: registry.dot-dot.ru/signer:${SIGNER_TAG} +# command: bash -c 'php-fpm8.3 -R; nginx' +# 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: +# - "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 +# cabinet: image: registry.dot-dot.ru/dot_dot_cargo_carrier:${CABINET_TAG} restart: unless-stopped