diff --git a/.env b/.env index 9f15aad..c65b763 100644 --- a/.env +++ b/.env @@ -1,13 +1,14 @@ -COMPOSE_PROJECT_NAME=testb -NETWORK=testb +COMPOSE_PROJECT_NAME=spottorg +NETWORK=spottorg FRONT_TAG=develop -DOTDOT_TAG=DD-3615-STORY -LMS_TAG=DD-3615-STORY +DOTDOT_TAG=DDB-1768-BACK +LMS_TAG=master ADMIN_TAG=master -CABINET_TAG=master +LANDING_TAG=master +CABINET_TAG=DD-4000_TD-436 -MYSQL_PORT=0.0.0.0:33062 +MYSQL_PORT=0.0.0.0:33063 MYSQL_ROOT_PASSWORD=root MYSQL_DATABASE=dot MYSQL_USER=dot diff --git a/configs/admin/.env b/configs/admin/.env index fc8dd66..78b1ba3 100644 --- a/configs/admin/.env +++ b/configs/admin/.env @@ -1,12 +1,12 @@ APP_NAME="DOT-DOT admin" APP_ENV=production -APP_KEY=base64:54d0glUSEueuhTWS0B45/WMCLlnbgFKpUP2hfgE7Xs4= +APP_KEY=base64:d5GXAhiyEWygEx+TdyNalRaR6UnkBhPznY0ycsDuOoY= APP_DEBUG=true APP_TIMEZONE=UTC -APP_URL=https://testbadmin.dot-dot.ru -FRONTEND_URL=https://testbadmin.dot-dot.ru -ASSET_URL=https://testbadmin.dot-dot.ru -APP_EMAIL_DOMAIN="dot-dot.ru" +APP_URL=https://demoadmin.spottorg.ru +FRONTEND_URL=https://demoadmin.spottorg.ru +ASSET_URL=https://demoadmin.spottorg.ru +APP_EMAIL_DOMAIN="spottorg.ru" APP_LOCALE=ru APP_FALLBACK_LOCALE=ru @@ -77,4 +77,4 @@ AWS_USE_PATH_STYLE_ENDPOINT=false VITE_APP_NAME="${APP_NAME}" -DOT_DOT_HOST=https://testb.dot-dot.ru +DOT_DOT_HOST=https://demo.spottorg.ru diff --git a/configs/admin/default b/configs/admin/default index becb0bc..7f6842c 100644 --- a/configs/admin/default +++ b/configs/admin/default @@ -1,9 +1,10 @@ server { - server_name testbadmin.dot-dot.ru; + server_name demoadmin.spottorg.ru; listen 443 ssl; - ssl_certificate /etc/nginx/ssl/dot2024.crt; - ssl_certificate_key /etc/nginx/ssl/dot2024.key; + ssl_certificate /etc/letsencrypt/live/spottorg.ru/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/spottorg.ru/privkey.pem; + ssl_trusted_certificate /etc/letsencrypt/live/spottorg.ru/chain.pem; index index.php index.html index.htm; diff --git a/configs/cabinet/.env b/configs/cabinet/.env index 309209f..493b13a 100755 --- a/configs/cabinet/.env +++ b/configs/cabinet/.env @@ -2,11 +2,11 @@ NUXT_HOST=0.0.0.0 NUXT_PORT=3000 NUXT_ENV_DEVALUE_LOG_LEVEL=silent WS_PROTOCOL=wss -BASE_URL=testbcabinet.dot-dot.ru -API_URL=https://testb.dot-dot.ru/ -DOMAIN=testbcabinet.dot-dot.ru +BASE_URL=democabinet.spottorg.ru +API_URL=https://demo.spottorg.ru/ +DOMAIN=democabinet.spottorg.ru -APP_HOST=testb.dot-dot.ru +APP_HOST=demo.spottorg.ru APP_SCHEME=https APP_ENVIRONMENT=production DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833 diff --git a/configs/lms/.env b/configs/lms/.env index b584f6a..04de5ce 100755 --- a/configs/lms/.env +++ b/configs/lms/.env @@ -2,11 +2,11 @@ NUXT_HOST=0.0.0.0 NUXT_PORT=3000 NUXT_ENV_DEVALUE_LOG_LEVEL=silent WS_PROTOCOL=wss -BASE_URL=https://testblms.dot-dot.ru/ -API_URL=https://testblms.dot-dot.ru/ -DOMAIN=testblms.dot-dot.ru +BASE_URL=https://demo.spottorg.ru/ +API_URL=https://demo.spottorg.ru/ +DOMAIN=demo.spottorg.ru -APP_HOST=testblms.dot-dot.ru +APP_HOST=demo.spottorg.ru APP_SCHEME=https APP_ENVIRONMENT=production DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833 diff --git a/configs/lms/entrypoint.sh b/configs/lms/entrypoint.sh index 228fdbc..1cfecb8 100755 --- a/configs/lms/entrypoint.sh +++ b/configs/lms/entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/sh -x -DOMAIN="${DOMAIN:-lms.dot-dot.ru}" +DOMAIN="${DOMAIN:-demo.spottorg.ru}" for x in $(grep -lrw "lms.dot-dot.ru" .nuxt/);do echo "replace lms.dot-dot.ru to https://${DOMAIN} in $x" diff --git a/configs/nginx/conf.d/admin.conf b/configs/nginx/conf.d/admin.conf index ac9426e..e1eed13 100644 --- a/configs/nginx/conf.d/admin.conf +++ b/configs/nginx/conf.d/admin.conf @@ -1,20 +1,21 @@ server { listen 80; - server_name testbadmin.dot-dot.ru; + server_name demoadmin.spottorg.ru; return 301 https://$server_name$request_uri; } server { - listen 443 ssl ; - server_name testbadmin.dot-dot.ru; + listen 443 ssl; + server_name demoadmin.spottorg.ru; - ssl_certificate /etc/nginx/ssl/dot2024.crt; - ssl_certificate_key /etc/nginx/ssl/dot2024.key; + ssl_certificate /etc/letsencrypt/live/spottorg.ru/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/spottorg.ru/privkey.pem; + ssl_trusted_certificate /etc/letsencrypt/live/spottorg.ru/chain.pem; client_max_body_size 10m; - access_log /var/log/nginx/testbadmin.dot-dot.ru_access.log json; - error_log /var/log/nginx/testbadmin.dot-dot.ru_error.log; + access_log /var/log/nginx/demoadmin.spottorg.ru_access.log json; + error_log /var/log/nginx/demoadmin.spottorg.ru_error.log; location / { proxy_pass https://admin:443; diff --git a/configs/nginx/conf.d/cabinet.conf b/configs/nginx/conf.d/cabinet.conf index 40ad346..5929f04 100644 --- a/configs/nginx/conf.d/cabinet.conf +++ b/configs/nginx/conf.d/cabinet.conf @@ -1,12 +1,15 @@ server { listen 443 ssl ; - server_name testacabinet.dot-dot.ru; + server_name democabinet.spottorg.ru; - ssl_certificate /etc/nginx/ssl/dot2024.crt; - ssl_certificate_key /etc/nginx/ssl/dot2024.key; + ssl_certificate /etc/letsencrypt/live/spottorg.ru/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/spottorg.ru/privkey.pem; + ssl_trusted_certificate /etc/letsencrypt/live/spottorg.ru/chain.pem; client_max_body_size 10m; + root /application/public; + location / { proxy_pass http://cabinet:3000; proxy_http_version 1.1; @@ -18,4 +21,99 @@ server { proxy_buffering off; proxy_cache off; } + + location /socket.io/auctionreload { + access_log /var/log/nginx/ws_access.log json; + error_log /var/log/nginx/ws_error.log; + + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + proxy_set_header Host $host; + proxy_pass http://php:8080/; + } + + + location @rewriteapp { + rewrite ^(.*)$ /index.php/$1 last; + } + + # location /storybook { + # alias /application/nuxt/storybook-static; + # } + + location /logout { + try_files $uri @rewriteapp; + } + + location /api { + rewrite ^(.*)$ /index.php/$1 last; + } + + location /clockwork { + rewrite ^(.*)$ /index.php/$1 last; + } + + location /__clockwork { + rewrite ^(.*)$ /index.php/$1 last; + } + + location /pdf { + rewrite ^(.*)$ /index.php/$1 last; + } + + location /1c { + rewrite ^(.*)$ /index.php/$1 last; + } + + location /socket { + try_files $uri @rewriteapp; + } + + location /admin { + try_files $uri @rewriteapp; + } + + location ~* \/admin\/.*(js|jpg|png|css|woff|woff2)$ { + proxy_pass http://static; + } + + location /media { + try_files $uri @rewriteapp; + } + + location /img { + proxy_pass http://static; + # alias /application/public/img; + # try_files $uri /index.php$request_uri; + # expires 6M; + } + + location /robots.txt { + proxy_pass http://static; + } + + location ~ ^/index\.php(/|$) { + if ($request_method = 'OPTIONS') { + add_header 'Access-Control-Allow-Origin' $http_origin; + add_header 'Access-Control-Allow-Credentials' 'true'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE'; + add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Expeditor-Domain,Authorization'; + add_header 'Access-Control-Max-Age' 1728000; + add_header 'Content-Type' 'text/plain charset=UTF-8'; + add_header 'Content-Length' 0; + return 204; + } + + #add_header 'Access-Control-Allow-Origin' $http_origin; + add_header 'Access-Control-Allow-Origin' *; + add_header 'Access-Control-Allow-Credentials' 'true'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE'; + add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Expeditor-Domain,Authorization'; + + fastcgi_pass backend:9001; + fastcgi_split_path_info ^(.+\.php)(/.*)$; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + } } diff --git a/configs/nginx/conf.d/default.conf b/configs/nginx/conf.d/default.conf deleted file mode 100755 index 863d234..0000000 --- a/configs/nginx/conf.d/default.conf +++ /dev/null @@ -1,146 +0,0 @@ -server { - listen 80; - server_name testb.dot-dot.ru; - return 301 https://$server_name$request_uri; -} - -server { - listen 443 ssl ; - server_name testb.dot-dot.ru; - - ssl_certificate /etc/nginx/ssl/dot2024.crt; - ssl_certificate_key /etc/nginx/ssl/dot2024.key; - - - root /application/public; - - client_max_body_size 30m; - client_body_buffer_size 30M; - - location / { - proxy_pass http://nuxt:3000; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - chunked_transfer_encoding off; - proxy_buffering off; - proxy_cache off; - } - - location /socket.io/auctionreload { - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - proxy_set_header Host $host; - proxy_pass http://php:8080/; - } - - location @rewriteapp { - rewrite ^(.*)$ /index.php/$1 last; - } - - # location /storybook { - # alias /application/nuxt/storybook-static; - # } - - location /logout { - try_files $uri @rewriteapp; - } - - location /api { - rewrite ^(.*)$ /index.php/$1 last; - } - - location /clockwork { - rewrite ^(.*)$ /index.php/$1 last; - } - - location /__clockwork { - rewrite ^(.*)$ /index.php/$1 last; - } - - location /pdf { - rewrite ^(.*)$ /index.php/$1 last; - } - - location /1c { - rewrite ^(.*)$ /index.php/$1 last; - } - - location /socket { - try_files $uri @rewriteapp; - } - - location /admin { - try_files $uri @rewriteapp; - } - - location ~* \/admin\/.*(js|jpg|png|css|woff|woff2)$ { - proxy_pass http://static; - } - - location /media { - try_files $uri @rewriteapp; - } - - location /img { - proxy_pass http://static; - # alias /application/public/img; - # try_files $uri /index.php$request_uri; - # expires 6M; - } - - location ~ ^/index\.php(/|$) { - if ($request_method = 'OPTIONS') { - add_header 'Access-Control-Allow-Origin' $http_origin; - add_header 'Access-Control-Allow-Credentials' 'true'; - add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE'; - add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Expeditor-Domain,Authorization'; - add_header 'Access-Control-Max-Age' 1728000; - add_header 'Content-Type' 'text/plain charset=UTF-8'; - add_header 'Content-Length' 0; - return 204; - } - - #add_header 'Access-Control-Allow-Origin' $http_origin; - add_header 'Access-Control-Allow-Origin' *; - add_header 'Access-Control-Allow-Credentials' 'true'; - add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE'; - add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Expeditor-Domain,Authorization'; - - fastcgi_pass backend:9001; - fastcgi_split_path_info ^(.+\.php)(/.*)$; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - } - - # location /mysql_exporter { - # access_log /var/log/nginx/mysql_exporter_access.log json; - # error_log /var/log/nginx/mysql_exporter_error.log; - - # #if ($allow = 0) { - # # return 403; - # #} - # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # proxy_set_header X-Scheme $scheme; - # proxy_set_header Host $http_host; - # proxy_redirect off; - # proxy_http_version 1.1; - # proxy_pass http://mysqld-exporter:9104/metrics; - # } - # location /redis_exporter { - # access_log /var/log/nginx/mysql_exporter_access.log json; - # error_log /var/log/nginx/mysql_exporter_error.log; - # #if ($allow = 0) { - # # return 403; - # #} - # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # proxy_set_header X-Scheme $scheme; - # proxy_set_header Host $http_host; - # proxy_redirect off; - # proxy_http_version 1.1; - # proxy_pass http://redis-exporter:9121/metrics; - # } -} diff --git a/configs/nginx/conf.d/lms.conf b/configs/nginx/conf.d/demo.conf similarity index 92% rename from configs/nginx/conf.d/lms.conf rename to configs/nginx/conf.d/demo.conf index 20dcaa1..ea1c28b 100755 --- a/configs/nginx/conf.d/lms.conf +++ b/configs/nginx/conf.d/demo.conf @@ -1,15 +1,16 @@ server { listen 80; - server_name testblms.dot-dot.ru; + server_name demo.spottorg.ru; return 301 https://$server_name$request_uri; } server { listen 443 ssl; - server_name testblms.dot-dot.ru; + server_name demo.spottorg.ru; - ssl_certificate /etc/nginx/ssl/dot2024.crt; - ssl_certificate_key /etc/nginx/ssl/dot2024.key; + ssl_certificate /etc/letsencrypt/live/spottorg.ru/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/spottorg.ru/privkey.pem; + ssl_trusted_certificate /etc/letsencrypt/live/spottorg.ru/chain.pem; root /application/public; diff --git a/configs/nginx/conf.d/landing.conf b/configs/nginx/conf.d/landing.conf new file mode 100644 index 0000000..35ff255 --- /dev/null +++ b/configs/nginx/conf.d/landing.conf @@ -0,0 +1,31 @@ +server { + listen 80; + server_name spottorg.ru; + return 301 https://$server_name$request_uri; +} + +server { + listen 443 ssl; + server_name spottorg.ru; + + ssl_certificate /etc/letsencrypt/live/spottorg.ru/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/spottorg.ru/privkey.pem; + ssl_trusted_certificate /etc/letsencrypt/live/spottorg.ru/chain.pem; + + client_max_body_size 10m; + + access_log /var/log/nginx/spottorg.ru_access.log json; + error_log /var/log/nginx/spottorg.ru_error.log; + + location / { + proxy_pass http://landing:80; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + proxy_set_header Host $host; + proxy_cache_bypass $http_upgrade; + chunked_transfer_encoding off; + proxy_buffering off; + proxy_cache off; + } +} diff --git a/configs/nginx/conf.d/rabbitmq.conf b/configs/nginx/conf.d/rabbitmq.conf index 5658153..50ff6d5 100755 --- a/configs/nginx/conf.d/rabbitmq.conf +++ b/configs/nginx/conf.d/rabbitmq.conf @@ -1,18 +1,19 @@ server { listen 80; - server_name testbrabbitmq.dot-dot.ru; + server_name demorabbitmq.spottorg.ru; return 301 https://$server_name$request_uri; } server { listen 443 ssl; - server_name testbrabbitmq.dot-dot.ru; + server_name demorabbitmq.spottorg.ru; - access_log /var/log/nginx/rabbitmqtestb.dot-dot.ru_access.log json; - error_log /var/log/nginx/rabbitmqtestb.dot-dot.ru_error.log; + access_log /var/log/nginx/rabbitmqdemo.spottorg.ru_access.log json; + error_log /var/log/nginx/rabbitmqdemo.spottorg.ru_error.log; - ssl_certificate /etc/nginx/ssl/dot2024.crt; - ssl_certificate_key /etc/nginx/ssl/dot2024.key; + ssl_certificate /etc/letsencrypt/live/spottorg.ru/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/spottorg.ru/privkey.pem; + ssl_trusted_certificate /etc/letsencrypt/live/spottorg.ru/chain.pem; proxy_buffer_size 128k; proxy_buffers 4 128k; diff --git a/configs/nuxt/.env b/configs/nuxt/.env index d803978..26a54d8 100755 --- a/configs/nuxt/.env +++ b/configs/nuxt/.env @@ -2,11 +2,11 @@ NUXT_HOST=0.0.0.0 NUXT_PORT=3000 NUXT_ENV_DEVALUE_LOG_LEVEL=silent WS_PROTOCOL=wss -BASE_URL=testb.dot-dot.ru -API_URL=https://testb.dot-dot.ru/ -DOMAIN=testb.dot-dot.ru +BASE_URL=demo.spottorg.ru +API_URL=https://demo.spottorg.ru/ +DOMAIN=demo.spottorg.ru -APP_HOST=testb.dot-dot.ru +APP_HOST=demo.spottorg.ru APP_SCHEME=https APP_ENVIRONMENT=production DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833 diff --git a/configs/nuxt/entrypoint.sh b/configs/nuxt/entrypoint.sh index a1dc972..b7fde9b 100755 --- a/configs/nuxt/entrypoint.sh +++ b/configs/nuxt/entrypoint.sh @@ -1,10 +1,10 @@ #!/bin/sh -DOMAIN="${DOMAIN:-dot-dot.ru}" +DOMAIN="${DOMAIN:-spottorg.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; +for x in $(grep -lrw "spottorg.ru" .nuxt/);do + echo "replace spottorg.ru to https://${DOMAIN} in $x" + sed -i -e "s/spottorg.ru/${DOMAIN}/g" $x; done "$@" diff --git a/configs/php/.env b/configs/php/.env index 5abd326..c435f28 100755 --- a/configs/php/.env +++ b/configs/php/.env @@ -9,7 +9,7 @@ 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=testb.dot-dot.ru +APP_HOST=demo.spottorg.ru APP_SCHEME=https MAILER_DSN=null://null @@ -25,13 +25,13 @@ SP_TEST=true SP_V3_URL=https://spasskievorota.ru/services/test/cargo_3.php SP_V3_KEY=secret -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 +DEFAULT_EMAIL=no_reply@spottorg.ru +ADMIN_EMAIL=change.this@spottorg.ru +ACCOUNTANT_EMAIL=noreplay@spottorg.ru +SALES_EMAIL=sale.ftl@spottorg.ru +LOGIST_EMAIL=nd@spottorg.ru +LEAD_EMAIL=change.this@spottorg.ru +VOSTOK_EMAIL=vostok@spottorg.ru SMSC_LOGIN=secret SMSC_PASS=secret @@ -53,13 +53,13 @@ FNS_ACCESS_TOKEN=secret GOOGLE_MAPS_ACCESS_KEY=secret GOOGLE_MAPS_BASE_URL=https://maps.google.com -ML_CALCULATOR_URL=https://calc.dev.dot-dot.ru/v1/calculate +ML_CALCULATOR_URL=https://calc.dev.spottorg.ru/v1/calculate -ML_REGULAR_DIRECTION_URL=https://calc.dev.dot-dot.ru/v2/schedule/transport -ML_REGULAR_DIRECTION_CHAIN_URL=https://calc.dev.dot-dot.ru/v1/schedule/chains -ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://calc.dev.dot-dot.ru/v1/schedule/carrier/scoring -ML_REGULAR_DIRECTION_CHAIN_RELEVANCE_CARRIERS_URL=https://calc.dev.dot-dot.ru/v1/schedule/chains/carrier/scoring -ML_UNCERTAIN_DIRECTIONS_URL=https://calc.dev.dot-dot.ru/v1/classification/direction/uncertain +ML_REGULAR_DIRECTION_URL=https://calc.dev.spottorg.ru/v2/schedule/transport +ML_REGULAR_DIRECTION_CHAIN_URL=https://calc.dev.spottorg.ru/v1/schedule/chains +ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://calc.dev.spottorg.ru/v1/schedule/carrier/scoring +ML_REGULAR_DIRECTION_CHAIN_RELEVANCE_CARRIERS_URL=https://calc.dev.spottorg.ru/v1/schedule/chains/carrier/scoring +ML_UNCERTAIN_DIRECTIONS_URL=https://calc.dev.spottorg.ru/v1/classification/direction/uncertain YANDEX_MAPS_ACCESS_KEY=secret YANDEX_MAPS_BASE_URL=https://api.routing.yandex.net @@ -139,6 +139,28 @@ 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_URL=https://crm.spottorg.ru ACCOUNTING_AUDIT_LOGIN=secret ACCOUNTING_AUDIT_PASSWORD=secret + +APP_LMS_HOST=demolms.spottorg.ru +APP_CARGO_CARRIER_HOST=democabinet.spottorg.ru + + +QUEUE_DSN_AUCTION_CARRIER_VERIFICATION=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/AUCTION_CARRIER_VERIFICATION + +###DD-3816### +###> KONTUR_DIADOC### +API_KONTUR_DIADOC_END_POINT_URL=https://diadoc-api.kontur.ru +API_KONTUR_DIADOC_API_TOKEN=API-3701ccdb-7bdf-4f29-bbe0-3a0278eee913 +API_KONTUR_DIADOC_LOGIN=LOGIN +API_KONTUR_DIADOC_PASSWORD=PASSWORD +API_KONTUR_DIADOC_SELF_BOX_ID='322d597d-964d-48a8-baa5-2380161826f8' +###< KONTUR_DIADOC### + +###> KONTUR_DIADOC### +SIGNER_DOCS_API_URL=https://testcsigner.spottorg.ru +SIGNER_DOCS_API_TOKEN=secret +SIGNER_URL=https://testcsigner.spottorg.ru +SIGNER_API_TOKEN='siofdhgt2349875t3iqhf1h2g*^&^%&^GHJGJCxgf' +###< KONTUR_DIADOC### diff --git a/configs/php/.env.local b/configs/php/.env.local index 5e51dd6..6d67af5 100755 --- a/configs/php/.env.local +++ b/configs/php/.env.local @@ -1,5 +1,5 @@ CONTAINER_NAME=php -APP_ENV=prod +APP_ENV=dev NotificationBuildServicejSP_KEY=16e93b225c730920ac5741a8d8df788f DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833 @@ -16,7 +16,7 @@ FNS_ACCESS_TOKEN=a5639b93fe4e7c9a3f1dd85537e066d36439c352 GOOGLE_MAPS_ACCESS_KEY=AIzaSyBCPl2LcpRvplzLUNVMVLhA3b7k46lTCTg -NUXT_BASE_URL=testb.dot-dot.ru +NUXT_BASE_URL=demo.spottorg.ru ATISU_API_TOKEN=46b599c3ab7f4574b560f48ea005d9f3 @@ -36,7 +36,7 @@ VOICIA_CALL_ID=1949 ###< voicia ### ###> ml_calculator ### -ML_CALCULATOR_URL=https://ml.dot-dot.ru/v2/classification/order/relevance +ML_CALCULATOR_URL=https://ml.spottorg.ru/v2/classification/order/relevance ###< ml_calculator ### ###> comagic ### @@ -45,15 +45,15 @@ COMAGIC_KEY=j769gveux0brdq7wb6insegwtczvz7nsqmuntkqv ###< comagic ### ###> carrier_scoring ### -ML_CARRIER_SCORING=https://ml.dot-dot.ru/v2/classification/carrier/scoring +ML_CARRIER_SCORING=https://ml.spottorg.ru/v2/classification/carrier/scoring ###< carrier_scoring ### ###> direction_scoring ### -ML_DIRECTION_SCORING_URL=https://ml.dot-dot.ru/v3/classification/direction/confidence +ML_DIRECTION_SCORING_URL=https://ml.spottorg.ru/v3/classification/direction/confidence ###< direction_scoring ### ###> direction_recalculate ### -ML_DIRECTION_RECALCULATE_URL=https://ml.dot-dot.ru/v2/schedule/calculate +ML_DIRECTION_RECALCULATE_URL=https://ml.spottorg.ru/v2/schedule/calculate ###< direction_recalculate ### ###< Vozovoz ### @@ -82,7 +82,7 @@ BAIKAL_API_PARTNER_GUID=PROVERKA DELLIN_API_KEY=BE38996C-F722-4691-BCF3-640B76DAB18B DELLIN_API_URL=https://api.dellin.ru/ DELLIN_PASSWORD=Logistika01 -DELLIN_LOGIN=km@dot-dot.ru +DELLIN_LOGIN=km@spottorg.ru ###< DelovieLinii ### ###> JelDorEksp ### @@ -113,11 +113,11 @@ SOVKOM_API_KEY=AAk6UcV88xCCC26654rM SOVKOM_API_URL=https://testout.sovcomins.ru ###< SOVKOMTEST### -ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://ml.dot-dot.ru/v2/schedule/carrier/scoring +ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://ml.spottorg.ru/v2/schedule/carrier/scoring -ML_REGULAR_DIRECTION_URL=https://ml.dot-dot.ru/v2/schedule/transport +ML_REGULAR_DIRECTION_URL=https://ml.spottorg.ru/v2/schedule/transport -ACCOUNTING_AUDIT_URL="https://crm.dot-dot.ru/TTLBuhreport/hs/TT/reconciliationreport" +ACCOUNTING_AUDIT_URL="https://crm.spottorg.ru/TTLBuhreport/hs/TT/reconciliationreport" ###> YandexTracker ### YTRACKER_API_TOKEN="y0_AgAEA7qkKFmeAAjF8AAAAADXovQd6htdkt7LTDW_sNHCz7qV9zdVHaQ" @@ -127,14 +127,14 @@ YTRACKER_ORGANISATION_ID=355207 SMARTCAPTCHA_SERVER_KEY=ysc2_GLQZ8QPaFh0eXqZ5KaRMuRRZOX7qNNMy7P9Mq82V6c4e7b81 ###> sentry/sentry-symfony ### -SENTRY_DSN="https://69bb249adbab80b23cf043b276a27fde@sentry.dot-dot.ru/4" +SENTRY_DSN="https://69bb249adbab80b23cf043b276a27fde@sentry.spottorg.ru/4" SENTRY_SERVER_NAME=pre-prod SENTRY_SERVER_USER_NAME=admin ###< sentry/sentry-symfony ### -ML_CALCULATOR_TRADE_ONLY_URL=https://ml.dot-dot.ru/v1/tender/price +ML_CALCULATOR_TRADE_ONLY_URL=https://ml.spottorg.ru/v1/tender/price -ML_REGULAR_DIRECTION_HISTORY_ORDER_URL=https://ml.dot-dot.ru/v1/schedule/transport/orders +ML_REGULAR_DIRECTION_HISTORY_ORDER_URL=https://ml.spottorg.ru/v1/schedule/transport/orders #QUEUE_DSN_OC_CARRIER_OFFERS=amqp://guest:guest@rabbitmq:5672/%2f/OC_CARRIER_OFFERS #QUEUE_DSN_STATISTIC_EXPORT=amqp://guest:guest@rabbitmq:5672/%2f/STATISTIC_EXPORT @@ -167,11 +167,26 @@ OTK_API_TOKEN="Q5vBE9jusg38Rk7wHt2bzycT4K6pePFZ" 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.spottorg.ru/v1/price_calculator/spot ###DD-3705### -ML_CARRIER_SCORING=https://ml.dot-dot.ru/v3/classification/carrier/scoring +ML_CARRIER_SCORING=https://ml.spottorg.ru/v3/classification/carrier/scoring QUEUE_DSN_RELEVANT_CARRIER_EXPORT=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/RELEVANT_CARRIER_EXPORT ###DD-3705### PLATFORM_NAME=СПОТТОРГ + +APP_LMS_HOST=demolms.spottorg.ru +APP_CARGO_CARRIER_HOST=democabinet.spottorg.ru + + +###> KONTUR_DIADOC### +SIGNER_DOCS_API_URL=https://stagingsigner.spottorg.ru +SIGNER_DOCS_API_TOKEN='siofdhgt2349875t3iqhf1h2g*^&^%&^GHJGJCxgf' +###< KONTUR_DIADOC### + + +QUEUE_DSN_AUCTION_CARRIER_VERIFICATION=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/AUCTION_CARRIER_VERIFICATION + +AILER_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 diff --git a/docker-compose.yml b/docker-compose.yml index 7384276..ecc343e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,6 +18,7 @@ x-defaults-php: &defaults-php - ./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 + - /etc/letsencrypt:/etc/letsencrypt - php_support_volume:/application/var/support-issue - ./configs/php/www.conf:/usr/local/etc/php-fpm.d/www.conf - ./configs/php/firebase-fcm-dotdot-key.json:/application/config/firebase-fcm-dotdot-key.json @@ -25,10 +26,9 @@ x-defaults-php: &defaults-php - db - rabbitmq extra_hosts: - - "sentry.dot-dot.ru:192.168.100.111" - - "testbsigner.dot-dot.ru:192.168.100.110" - - "testb.dot-dot.ru:192.168.100.110" - - "testblms.dot-dot.ru:192.168.100.110" + - "demo.spottorg.ru:192.168.90.100" + - "democabinet.spottorg.ru:192.168.90.100" + - "demoadmin.spottorg.ru:192.168.90.100" networks: - dd @@ -119,6 +119,7 @@ services: - ./configs/admin/default:/etc/nginx/sites-enabled/default - ./configs/admin/.env:/application/.env - ./configs/nginx/ssl:/etc/nginx/ssl + - /etc/letsencrypt:/etc/letsencrypt depends_on: - db networks: @@ -134,8 +135,8 @@ services: - ./configs/nginx/www:/var/www - ./configs/nginx/ssl:/etc/nginx/ssl - ./configs/nginx/other:/etc/nginx/other - - certbot_volume:/etc/letsencrypt - nginx_log_volume:/var/log/nginx + - /etc/letsencrypt:/etc/letsencrypt depends_on: - nuxt - php @@ -190,3 +191,11 @@ services: entrypoint: /entrypoint.sh networks: - dd + + landing: + image: registry.dot-dot.ru/landing:${LANDING_TAG} + command: sh -c 'nginx; php-fpm -R' + user: root + restart: unless-stopped + networks: + - dd diff --git a/kpi-logist-report-9531e25a70b2a89c8e2ea8932261d767.xlsx b/kpi-logist-report-9531e25a70b2a89c8e2ea8932261d767.xlsx deleted file mode 100644 index 506ed88..0000000 Binary files a/kpi-logist-report-9531e25a70b2a89c8e2ea8932261d767.xlsx and /dev/null differ diff --git a/kpi-manager-report-9531e25a70b2a89c8e2ea8932261d767.xlsx b/kpi-manager-report-9531e25a70b2a89c8e2ea8932261d767.xlsx deleted file mode 100644 index 71d9e6f..0000000 Binary files a/kpi-manager-report-9531e25a70b2a89c8e2ea8932261d767.xlsx and /dev/null differ