update

2025-10-20 22:05:16 +03:00 · 2025-10-20 22:05:16 +03:00 · dbfa676e34
parent b75e4d3784
commit dbfa676e34
10 changed files with 61 additions and 84 deletions
--- 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
--- 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
--- 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"
--- 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;
    }
--- 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;
    }
--- 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;
    }
--- a/configs/nuxt/.env
+++ b/configs/nuxt/.env
@ -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
--- a/configs/nuxt/entrypoint.sh
+++ b/configs/nuxt/entrypoint.sh
@ -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
-
-"$@"
--- 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"
+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###
--- 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