From 49ee9374a56c0feebb686bd5da118003cbc2e1f3 Mon Sep 17 00:00:00 2001 From: ddadmin Date: Wed, 12 Feb 2025 10:43:26 +0300 Subject: [PATCH] add cabinet --- .env | 27 +++++++++++++++++++++------ configs/cabinet/entrypoint.sh | 11 ++++++++++- configs/nginx/conf.d/cabinet.conf | 2 +- configs/php/.env.local | 5 +++-- 4 files changed, 35 insertions(+), 10 deletions(-) diff --git a/.env b/.env index 8f92629..7d2cb08 100644 --- a/.env +++ b/.env @@ -1,18 +1,26 @@ COMPOSE_PROJECT_NAME=testc NETWORK=testc +FRONT_TAG=DD-3906-STORY +DOTDOT_TAG=DD-3906-STORY +LMS_TAG=develop +DASHBORD_TAG=master +ADMIN_TAG=DD-3928 +CABINET_TAG=master + #FRONT_TAG=master #DOTDOT_TAG=master #LMS_TAG=master #DASHBORD_TAG=master #ADMIN_TAG=master +#CABINET_TAG=master -FRONT_TAG=DDB-1572 -DOTDOT_TAG=DDB-1572 -LMS_TAG=master -DASHBORD_TAG=master -ADMIN_TAG=master -CABINET_TAG=master +#FRONT_TAG=DDB-1572 +#DOTDOT_TAG=DDB-1572 +#LMS_TAG=master +#DASHBORD_TAG=master +#ADMIN_TAG=master +#CABINET_TAG=master #FRONT_TAG=DD-3786-STORY #DOTDOT_TAG=DD-3786-STORY @@ -21,6 +29,13 @@ CABINET_TAG=master #ADMIN_TAG=master #CABINET_TAG=master +#FRONT_TAG=develop +#DOTDOT_TAG=develop +#LMS_TAG=develop +#DASHBORD_TAG=master +#ADMIN_TAG=master +#CABINET_TAG=master + #FRONT_TAG=DD-3786-STORY #DOTDOT_TAG=DD-3786-STORY #LMS_TAG=DD-3786 diff --git a/configs/cabinet/entrypoint.sh b/configs/cabinet/entrypoint.sh index bc2988a..dce9e53 100755 --- a/configs/cabinet/entrypoint.sh +++ b/configs/cabinet/entrypoint.sh @@ -1,10 +1,19 @@ #!/bin/sh DOMAIN="${DOMAIN:-lmscabinet.dot-dot.ru}" +# API_URL='"API_URL": "https://dot-dot.ru/"' +# d='https://dot-dot.ru/' for x in $(grep -lrw "lmscabinet.dot-dot.ru" .nuxt/);do echo "replace lmscabinet.dot-dot.ru to https://${DOMAIN} in $x" - sed -i -e "s/lmscabinet.dot-dot.ru/${DOMAIN}/g" $x; + sed -i "s|lmscabinet.dot-dot.ru|${DOMAIN}|g" $x; +done + +for x in $(grep -lrw "https://dot-dot.ru" .nuxt/);do + echo "replace https://dot-dot.ru to ${API_URL} in $x" + sed -i "s|https://dot-dot.ru|${API_URL}|g" $x; + # echo "fix double //"; + # sed -i "s|\/\/\|/|g" $x; done "$@" diff --git a/configs/nginx/conf.d/cabinet.conf b/configs/nginx/conf.d/cabinet.conf index b4b1bc0..40ad346 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 testccabinet.dot-dot.ru; + server_name testacabinet.dot-dot.ru; ssl_certificate /etc/nginx/ssl/dot2024.crt; ssl_certificate_key /etc/nginx/ssl/dot2024.key; diff --git a/configs/php/.env.local b/configs/php/.env.local index e1c6225..99b9574 100755 --- a/configs/php/.env.local +++ b/configs/php/.env.local @@ -1,5 +1,6 @@ CONTAINER_NAME=php -APP_ENV=dev +#APP_ENV=dev +APP_ENV=prod NotificationBuildServicejSP_KEY=16e93b225c730920ac5741a8d8df788f DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833 @@ -45,7 +46,7 @@ COMAGIC_KEY=j769gveux0brdq7wb6insegwtczvz7nsqmuntkqv ###< comagic ### ###> carrier_scoring ### -#ML_CARRIER_SCORING=https://ml.dot-dot.ru/v2/classification/carrier/scoring +ML_CARRIER_SCORING=https://ml.dot-dot.ru/v2/classification/carrier/scoring ###< carrier_scoring ### ###> direction_scoring ###