diff --git a/.env b/.env index fdedc68..3d48fee 100644 --- a/.env +++ b/.env @@ -2,12 +2,12 @@ COMPOSE_PROJECT_NAME=staging NETWORK=staging FRONT_TAG=develop -DOTDOT_TAG=master -LMS_TAG=master +DOTDOT_TAG=DD-4131-STORY +LMS_TAG=DDB-2095 DASHBORD_TAG=master SIGNER_TAG=master ADMIN_TAG=master -CABINET_TAG=DDB-1925 +CABINET_TAG=DDB-2095 LANDINGTTL_TAG=master CVIEW_TAG=master diff --git a/app.sh b/app.sh index 6ba601e..d82ddf0 100755 --- a/app.sh +++ b/app.sh @@ -86,7 +86,9 @@ init() { up() { checkDockerCompose - docker compose up -d + docker compose up -d && docker compose exec nginx nginx -t && docker compose exec nginx nginx -s reload + echo "check global nginx and reload" + docker exec -ti dd-nginx-1 nginx -t && docker exec -ti dd-nginx-1 nginx -s reload } down() { diff --git a/configs/landing-ttl/config.php b/configs/landing-ttl/config.php new file mode 100644 index 0000000..d5dc989 --- /dev/null +++ b/configs/landing-ttl/config.php @@ -0,0 +1,27 @@ + 'smtp.mail.ru', + 'smtp_port' => 465, + 'smtp_user' => 'no_reply@dot-dot.ru', + 'smtp_pass' => 'NRTk7rXhesHQpi3YWB92', + + 'subject' => 'Заявка ТТЛ', + + 'sender' => [ + 'email' => 'no-reply@dot-dot.ru', + 'name' => 'Точка-Точка логистика' + ], + + 'recipients' => [ // Получателей может быть несколько + 0 => [ + 'email' => 'at@dot-dot.ru', + 'name' => 'Менеджер' + ] + ], + + 'dadata_suggest_url' => 'https://suggestions.dadata.ru/suggestions/api/4_1/rs/suggest/address', + 'dadata_suggest_count' => 3, + 'dadata_auth_token' => 'c9aa5fdc338a746e23ce91ceb6fdb9e635749833', + 'dadata_auth_secret' => '1ea37a4d310e7a6ac64211ffe5686363f04d4e68' +]; diff --git a/docker-compose.yml b/docker-compose.yml index 91185d0..e386fb8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -243,6 +243,8 @@ services: landing-ttl: image: registry.dot-dot.ru/landing-ttl:${LANDINGTTL_TAG} command: sh -c 'nginx; php-fpm' + volumes: + - ./configs/landing-ttl/config.php:/application/backend/config.php restart: unless-stopped networks: - dd