From fb8b0f5cb2397f967c75f3b569881c47a8ec5ad7 Mon Sep 17 00:00:00 2001 From: ddadmin Date: Fri, 26 Sep 2025 21:35:12 +0300 Subject: [PATCH] update --- .env | 10 +++++----- app.sh | 8 ++++---- configs/php/.env.local | 13 +++++++++++++ 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/.env b/.env index 2d0c441..2750ec7 100644 --- a/.env +++ b/.env @@ -1,12 +1,12 @@ -1COMPOSE_PROJECT_NAME=spottorg +COMPOSE_PROJECT_NAME=spottorg NETWORK=spottorg -FRONT_TAG=139.1 -DOTDOT_TAG=139.1 -LMS_TAG=DD-4042-STORY +FRONT_TAG=140 +DOTDOT_TAG=140 +LMS_TAG=140 ADMIN_TAG=master LANDING_TAG=master -CABINET_TAG=DD-4159 +CABINET_TAG=140 MYSQL_PORT=0.0.0.0:33063 MYSQL_ROOT_PASSWORD=root diff --git a/app.sh b/app.sh index 86c2dea..5d74268 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/spottorg/tqo/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 } diff --git a/configs/php/.env.local b/configs/php/.env.local index 6649b0f..15f30fd 100755 --- a/configs/php/.env.local +++ b/configs/php/.env.local @@ -201,3 +201,16 @@ CENTRIFUGAL_API_KEY='aa7443fb-e623-4363-91ac-ef25908b1403' CENTRIFUGAL_TOKEN_HMAC_SECRET_KEY='6085d43b-f55b-4387-9dff-3c9abf385dc8' TENANT=dot + +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#