dot-dot
/
config_staging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
ddadmin 2025-11-23 19:27:35 +03:00
parent 5417a104d6
commit be08dd648f
6 changed files with 31 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.env
View File

@ -1,14 +1,14 @@
COMPOSE_PROJECT_NAME=staging
NETWORK=staging
FRONT_TAG=develop
DOTDOT_TAG=DD-4131-STORY
LMS_TAG=DDB-2095
FRONT_TAG=DD-4240-STORY
DOTDOT_TAG=DDB-2137
LMS_TAG=release145
DASHBORD_TAG=master
SIGNER_TAG=master
ADMIN_TAG=master
CABINET_TAG=DDB-2095
LANDINGTTL_TAG=master
CABINET_TAG=release145
LANDINGTTL_TAG=DD-4236-STORY
CVIEW_TAG=master
MYSQL_PORT=0.0.0.0:33067

1
.env.local.save Normal file
View File

@ -0,0 +1 @@

0
configs/nginx/conf.d/signer.conf → configs/nginx/conf.d/signer.old
View File

153
configs/php/.env
View File

@ -1,153 +0,0 @@
APP_ENV=prod
APP_SECRET=c35a0abba25a5396d74ec17fca238d9a
LOCK_DSN=flock
PHP_SOCKET_PORT=8080
DATABASE_URL_DOT=mysql://root:root@db:3306/dot?serverVersion=mariadb-10.3.25
DATABASE_URL_DOT_STATISTIC=mysql://root:root@db:3306/dot_statistic?serverVersion=mariadb-10.3.25
DOCUMENT_ROOT=/application
APP_HOST=staging.dot-dot.ru
APP_SCHEME=https
MAILER_DSN=null://null
WKHTMLTOPDF_PATH="xvfb-run /usr/bin/wkhtmltopdf --enable-local-file-access"
SP_WSDL=http://91.208.205.54:84/orawsv/XMLWEB/
SP_LOGIN=xmlweb
SP_PASSWORD=xmlweb
SP_KEY=secret
SP_TEST=true
SP_V3_URL=https://spasskievorota.ru/services/test/cargo_3.php
SP_V3_KEY=16e93b225c730920ac5741a8d8df788f
DEFAULT_EMAIL=no_reply@dot-dot.ru
ADMIN_EMAIL=change.this@dot-dot.ru
ACCOUNTANT_EMAIL=noreplay@dot-dot.ru
SALES_EMAIL=sale.ftl@dot-dot.ru
LOGIST_EMAIL=nd@dot-dot.ru
LEAD_EMAIL=change.this@dot-dot.ru
VOSTOK_EMAIL=vostok@dot-dot.ru
SMSC_LOGIN=secret
SMSC_PASS=secret
DADATA_API_TOKEN=secret
DADATA_API_SECRET=secret
UNISENDER_API_KEY=secret
VOICIA_API_KEY=7589ed2721e50e299eb3baf2e3100a6b
VOICIA_API_URL=https://app.voicia.ru
UAT_1C_API_URL=http://1c.nwtlk.ru/UATtest/hs
UAT_1C_USER=secret
UAT_1C_PASSWORD=secret
FNS_ACCESS_TOKEN=secret
GOOGLE_MAPS_ACCESS_KEY=secret
GOOGLE_MAPS_BASE_URL=https://maps.google.com
###> ml_calculator ### DD-4160
#ML_CALCULATOR_URL=https://ml.dot-dot.ru/v2/classification/order/relevance
ML_CALCULATOR_URL=https://ml.dot-dot.ru/v1/price_calculator/spot
###< ml_calculator ###
ML_REGULAR_DIRECTION_URL=https://ml.dot-dot.ru/v2/schedule/transport
ML_REGULAR_DIRECTION_CHAIN_URL=https://ml.dot-dot.ru/v1/schedule/chains
ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://ml.dot-dot.ru/v1/schedule/carrier/scoring
ML_REGULAR_DIRECTION_CHAIN_RELEVANCE_CARRIERS_URL=https://ml.dot-dot.ru/v1/schedule/chains/carrier/scoring
ML_UNCERTAIN_DIRECTIONS_URL=https://ml.dot-dot.ru/v1/classification/direction/uncertain
YANDEX_MAPS_ACCESS_KEY=secret
YANDEX_MAPS_BASE_URL=https://api.routing.yandex.net
GRAFANA_ADMIN_PASSWORD=admin
GRAFANA_API_URL=http://grafana:3000
GRAFANA_PUBLIC_URL=http://grafana.dot-dot.local
THREESELLER_USERNAME=savrickijj@rambler.ru
THREESELLER_PASSWORD=123123
ATISU_CLIENT_ID=f26841019e0243418395d44ed7430f2a
ATISU_APIKEY=46b599c3ab7f4574b560f48ea005d9f3
###> google/apiclient ###
ANALITIC_GOOGLE_CLIENT_ID=secret
ANALITIC_GOOGLE_CLIENT_SECRET=secret
ANALITIC_GOOGLE_CLIENT_REDIRECT_URI=http://localhost/admin/analitic/google-callback
###< google/apiclient ###
###> telegramm ###
TELEGRAM_URL=https://api.telegram.org/
TELEGRAM_BOT_TOKEN=secret
TELEGRAM_CHAT_ID=secret
###< telegramm ###
DEFAULT_SLUG=dotdot
###> voicia ###
VOICIA_CALL_ID=secret
###< voicia ###
###> openssl_encrypt parameters ###
OPENSSL_CIPHER=aes-128-gcm
OPENSSL_PASS_PHRASE=secret
OPENSSL_IV=secret
###> openssl_encrypt parameters ###
TKKIT_API_TOKEN=secret
TKKIT_API_URL=https://capi.tk-kit.com
###> BAIKAL###
BAIKAL_API_KEY=secret
###< BAIKAL###
TELEGRAM_CHAT_BOT_ACCESS_TOKEN=secret
###> NORDWHEEL###
NORDWHEEL_API_URL=https://nordw.ru
###< NORDWHEEL###
JDE_API_URL=https://api.jde.ru
###> SKIF###
SKIF_API_URL=sekret
SKIF_API_LOGIN=sekret
SKIF_API_PASSWORD=sekret
###< SKIF###
###> DPD ###
DPD_PATH=https://ws.dpd.ru/services/
DPD_CLIENT_NUMBER=secret
DPD_CLIENT_KEY=secret
###< DPD###
###> SOVKOM###
SOVKOM_API_KEY=secret
SOVKOM_API_URL=secret
###< SOVKOM###
MAGIC_API_URL=https://magic-trans.ru/
MAGIC_API_URL=https://magic-trans.ru/
ML_REGULAR_DIRECTION_HISTORY_ORDER_URL=https://ml.dot-dot.ru/v1/schedule/transport/orders
SMS_PROVIDER=prostor-sms
PROSTOR_SMS_END_POINT_URL=http://api.prostor-sms.ru
PROSTOR_SMS_LOGIN=secret
PROSTOR_SMS_PASSWORD=secret
ACCOUNTING_AUDIT_URL=https://crm.dot-dot.ru
ACCOUNTING_AUDIT_LOGIN=secret
ACCOUNTING_AUDIT_PASSWORD=secret
APP_LMS_HOST=staginglms.dot-dot.ru
APP_CARGO_CARRIER_HOST=stagingcabinet.dot-dot.ru
PLATFORM_NAME=СПОТТОРГ

34
configs/php/.env.local
View File

@ -1,5 +1,11 @@
CONTAINER_NAME=php
APP_ENV=dev
APP_ENV=prod
APP_DEBUG=false
APP_HOST=staging.dot-dot.ru
APP_LMS_HOST=staginglms.dot-dot.ru
APP_CARGO_CARRIER_HOST=stagingcabinet.dot-dot.ru
NotificationBuildServicejSP_KEY=16e93b225c730920ac5741a8d8df788f
DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833
@ -38,7 +44,7 @@ VOICIA_CALL_ID=8788
###> ml_calculator ### DD-4160
#ML_CALCULATOR_URL=https://ml.dot-dot.ru/v2/classification/order/relevance
ML_CALCULATOR_URL=https://ml.dot-dot.ru/v1/price_calculator/spot
#ML_CALCULATOR_URL=https://ml.dot-dot.ru/v1/price_calculator/spot
###< ml_calculator ###
@ -141,8 +147,11 @@ QUEUE_DSN_ORDER_IMPORT=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/ORD
QUEUE_DSN_WS_ORDER_STATE_UPDATE=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/WS_ORDER_STATE_UPDATE
QUEUE_DSN_NOTICE=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/NOTICE
QUEUE_DSN_SELECT_DIRECTION_PUSH=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/SELECT_DIRECTION_PUSH
QUEUE_DSN_SYNC_AUCTIONS=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/SYNC_AUCTIONS
QUEUE_DSN_SYNC_CARRIERS=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/SYNC_CARRIERS
CRYPTOPRO_PATH='/opt/cprocsp/bin/amd64/cryptcp -sign -dn '"ООО ""ТОЧКА-ТОЧКА ЛОГИСТИКА"""' -der'
SIGNED_DOC_PATH="/application/var/documents/signeddocs"
ABSOLUTE_SIGNED_DOC_PATH="/home/ddadmin/demolms/signeddocs"
@ -199,21 +208,24 @@ CENTRIFUGAL_API_ENDPOINT_URL=http://centrifugo:8000/api
CENTRIFUGAL_API_KEY='aa7443fb-e623-4363-91ac-ef25908b1403'
CENTRIFUGAL_TOKEN_HMAC_SECRET_KEY='6085d43b-f55b-4387-9dff-3c9abf385dc8'
BUH_DOT_DOT_EMAIL=no_reply@dot-dot.ru
BUH_DOT_DOT_EMAIL=1no_reply@dot-dot.ru
RECONCILIATION_ACTS=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/RECONCILIATION_ACTS
TENANT=dot
LOGIST_EMAIL=logist@dot-dot.ru
DEFAULT_SPOTTORG_EMAIL=no_reply@spottorg.ru
TENANT=TTL
ACCOUNTING_ADAPTER_SERVICE_URL="https://staging1c-view.dot-dot.ru"
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
#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_LIST='{"514ac16a-3ff8-4c88-b4e9-725ee345fb0d":"stagspot"}'
SYNC_HOST_TYPE=master
SYNC_HOST_MASTER_URL=''
SYNC_HOST_MASTER_URL=https://staginglms.dot-dot.ru
SYNC_HOST_MASTER_SECRET=''
SYNC_HOST_SYNC_ITEM_PART_LIMIT=100
@ -229,7 +241,9 @@ 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_API_URL=https://movizor.ru/api_2
MOVIZOR_PROJECT=dotdotcorp
MOVIZOR_API_KEY=secret
###< MOVIZOR###
QUEUE_DSN_ATTORNEY_EMAIL=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/SA_ATTORNEY_EMAIL_SEND

6
docker-compose.yml
View File

@ -14,7 +14,6 @@ x-defaults-php: &defaults-php
image: registry.dot-dot.ru/dot-dot:${DOTDOT_TAG}
restart: unless-stopped
volumes:
- ./configs/php/.env:/application/.env
- ./configs/php/.env.local:/application/.env.local
- ./configs/php/zz-docker.conf:/usr/local/etc/php-fpm.d/zz-docker.conf
- php_var_volume:/application/var
@ -26,6 +25,7 @@ x-defaults-php: &defaults-php
- rabbitmq
extra_hosts:
- "sentry.dot-dot.ru:192.168.100.111"
- "staging.spottorg.ru:192.168.100.110"
- "stagingsigner.dot-dot.ru:192.168.100.110"
- "staging.dot-dot.ru:192.168.100.110"
- "staginglms.dot-dot.ru:192.168.100.110"
@ -77,10 +77,6 @@ services:
<<: *defaults-php
command: ./bin/console messenger:consume StatisticExport
carrier-offers:
<<: *defaults-php
command: ./bin/console messenger:consume CarrierOffers
order-import:
<<: *defaults-php
command: ./bin/console messenger:consume OrderImport