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

Compare commits

base: dot-dot:38411bccc429c95929de4c3c207602e4f591fede
Branches Tags
dot-dot:main
...
compare: dot-dot:37a17e8368dc20ee60663899bdb72865c25fb5e7
Branches Tags
dot-dot:main

No commits in common. "38411bccc429c95929de4c3c207602e4f591fede" and "37a17e8368dc20ee60663899bdb72865c25fb5e7" have entirely different histories.
38411bccc4 ... 37a17e8368

19 changed files with 70 additions and 77 deletions
Show Stats Expand all files Collapse all files

6
.env
View File

@ -1,5 +1,5 @@
1COMPOSE_PROJECT_NAME=tqo
NETWORK=tqo
1COMPOSE_PROJECT_NAME=eks
NETWORK=eks
FRONT_TAG=139.1
DOTDOT_TAG=139.1
@ -8,7 +8,7 @@ ADMIN_TAG=master
LANDING_TAG=master
CABINET_TAG=DD-4159
MYSQL_PORT=0.0.0.0:33064
MYSQL_PORT=0.0.0.0:33065
MYSQL_ROOT_PASSWORD=seeFiethae8enga6ohNi
MYSQL_DATABASE=dot
MYSQL_USER=dot

10
configs/admin/.env
View File

@ -3,10 +3,10 @@ APP_ENV=production
APP_KEY=base64:IsI2/a6+WLRl5owxc1i5F+bbOZi7DjaS0IMEoxg14c0=
APP_DEBUG=true
APP_TIMEZONE=UTC
APP_URL=https://tqoadmin.spottorg.ru
FRONTEND_URL=https://tqoadmin.spottorg.ru
ASSET_URL=https://tqoadmin.spottorg.ru
APP_EMAIL_DOMAIN="tqo.spottorg.ru"
APP_URL=https://eksadmin.spottorg.ru
FRONTEND_URL=https://eksadmin.spottorg.ru
ASSET_URL=https://eksadmin.spottorg.ru
APP_EMAIL_DOMAIN="eks.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://tqolms.spottorg.ru
DOT_DOT_HOST=https://ekslms.spottorg.ru

2
configs/admin/default
View File

@ -1,5 +1,5 @@
server {
server_name tqoadmin.spottorg.ru;
server_name eksadmin.spottorg.ru;
listen 443 ssl;
ssl_certificate /etc/letsencrypt/live/spottorg.ru/fullchain.pem;

8
configs/cabinet/.env
View File

@ -2,11 +2,11 @@ NUXT_HOST=0.0.0.0
NUXT_PORT=3000
NUXT_ENV_DEVALUE_LOG_LEVEL=silent
WS_PROTOCOL=wss
BASE_URL=tqo.spottorg.ru
API_URL=https://tqolms.spottorg.ru/
DOMAIN=tqo.spottorg.ru
BASE_URL=eks.spottorg.ru
API_URL=https://ekslms.spottorg.ru/
DOMAIN=eks.spottorg.ru
APP_HOST=tqolms.spottorg.ru
APP_HOST=ekslms.spottorg.ru
APP_SCHEME=https
APP_ENVIRONMENT=production
DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833

5
configs/centrifugo/config.json
View File

@ -4,10 +4,7 @@
"admin_secret": "ca0a7656-f589-42e6-9e49-98dd3c5beb46",
"api_key": "aa7443fb-e623-4363-91ac-ef25908b1403",
"admin": true,
"allowed_origins": [
"https://tqolms.spottorg.ru",
"https://tqo.spottorg.ru"
],
"allowed_origins": ["https://ekslms.spottorg.ru", "https://eks.spottorg.ru"],
"allow_subscribe_for_client": true,
"allow_user_limited_channels": true
}

2
configs/landing/config.php
View File

@ -15,7 +15,7 @@ return [
'recipients' => [ // Получателей может быть несколько
0 => [
'email' => 'rzaharov@tqo.spottorg.ru',
'email' => 'rzaharov@eks.spottorg.ru',
'name' => 'Менеджер'
]
],

8
configs/lms/.env
View File

@ -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://tqolms.spottorg.ru/
API_URL=https://tqolms.spottorg.ru/
DOMAIN=tqolms.spottorg.ru
BASE_URL=https://ekslms.spottorg.ru/
API_URL=https://ekslms.spottorg.ru/
DOMAIN=ekslms.spottorg.ru
APP_HOST=tqolms.spottorg.ru
APP_HOST=ekslms.spottorg.ru
APP_SCHEME=https
APP_ENVIRONMENT=production
DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833

8
configs/nginx/conf.d/admin.conf
View File

@ -1,20 +1,20 @@
server {
listen 80;
server_name tqoadmin.spottorg.ru;
server_name eksadmin.spottorg.ru;
return 301 https://$server_name$request_uri;
}
server {
listen 443 ssl;
server_name tqoadmin.spottorg.ru;
server_name eksadmin.spottorg.ru;
ssl_certificate /etc/nginx/ssl/spottorg.crt;
ssl_certificate_key /etc/nginx/ssl/spottorg.key;
client_max_body_size 10m;
access_log /var/log/nginx/tqoadmin.spottorg.ru_access.log json;
error_log /var/log/nginx/tqoadmin.spottorg.ru_error.log;
access_log /var/log/nginx/eksadmin.spottorg.ru_access.log json;
error_log /var/log/nginx/eksadmin.spottorg.ru_error.log;
location / {
proxy_pass https://admin:443;

2
configs/nginx/conf.d/cabinet.conf
View File

@ -1,6 +1,6 @@
server {
listen 443 ssl ;
server_name tqo.spottorg.ru;
server_name eks.spottorg.ru;
ssl_certificate /etc/nginx/ssl/spottorg.crt;
ssl_certificate_key /etc/nginx/ssl/spottorg.key;

4
configs/nginx/conf.d/demo.conf
View File

@ -1,12 +1,12 @@
server {
listen 80;
server_name lmstqo.spottorg.ru;
server_name lmseks.spottorg.ru;
return 301 https://$server_name$request_uri;
}
server {
listen 443 ssl;
server_name lmstqo.spottorg.ru;
server_name lmseks.spottorg.ru;
ssl_certificate /etc/nginx/ssl/spottorg.crt;
ssl_certificate_key /etc/nginx/ssl/spottorg.key;

8
configs/nginx/conf.d/demows.conf
View File

@ -1,6 +1,6 @@
server {
listen 80;
server_name wstqo.spottorg.ru;
server_name wseks.spottorg.ru;
return 301 https://$server_name$request_uri;
}
@ -10,10 +10,10 @@ upstream centrifugo {
server {
listen 443 ssl;
server_name wstqo.spottorg.ru;
server_name wseks.spottorg.ru;
access_log /var/log/nginx/wstqo.spottorg.ru_access.log json;
error_log /var/log/nginx/wstqo.spottorg.ru_error.log;
access_log /var/log/nginx/wseks.spottorg.ru_access.log json;
error_log /var/log/nginx/wseks.spottorg.ru_error.log;
ssl_certificate /etc/nginx/ssl/spottorg.crt;
ssl_certificate_key /etc/nginx/ssl/spottorg.key;

8
configs/nginx/conf.d/landing.conf
View File

@ -1,20 +1,20 @@
server {
listen 80;
server_name landingtqo.spottorg.ru;
server_name landingeks.spottorg.ru;
return 301 https://$server_name$request_uri;
}
server {
listen 443 ssl;
server_name landingtqo.spottorg.ru;
server_name landingeks.spottorg.ru;
ssl_certificate /etc/nginx/ssl/spottorg.crt;
ssl_certificate_key /etc/nginx/ssl/spottorg.key;
client_max_body_size 10m;
access_log /var/log/nginx/landingtqo.spottorg.ru_access.log json;
error_log /var/log/nginx/landingtqo.spottorg.ru_error.log;
access_log /var/log/nginx/landingeks.spottorg.ru_access.log json;
error_log /var/log/nginx/landingeks.spottorg.ru_error.log;
location / {
proxy_pass http://landing:80;

8
configs/nginx/conf.d/lms.conf
View File

@ -1,18 +1,18 @@
server {
listen 80;
server_name tqolms.spottorg.ru;
server_name ekslms.spottorg.ru;
return 301 https://$server_name$request_uri;
}
server {
listen 443 ssl;
server_name tqolms.spottorg.ru;
server_name ekslms.spottorg.ru;
ssl_certificate /etc/nginx/ssl/spottorg.crt;
ssl_certificate_key /etc/nginx/ssl/spottorg.key;
access_log /var/log/nginx/tqolms.spottorg.ru_access.log json;
error_log /var/log/nginx/tqolms.spottorg.ru_error.log;
access_log /var/log/nginx/ekslms.spottorg.ru_access.log json;
error_log /var/log/nginx/ekslms.spottorg.ru_error.log;
root /application/public;

8
configs/nginx/conf.d/rabbitmq.conf
View File

@ -1,15 +1,15 @@
server {
listen 80;
server_name rabbitmqtqo.spottorg.ru;
server_name rabbitmqeks.spottorg.ru;
return 301 https://$server_name$request_uri;
}
server {
listen 443 ssl;
server_name rabbitmqtqo.spottorg.ru;
server_name rabbitmqeks.spottorg.ru;
access_log /var/log/nginx/rabbitmqlmstqo.spottorg.ru_access.log json;
error_log /var/log/nginx/rabbitmqlmstqo.spottorg.ru_error.log;
access_log /var/log/nginx/rabbitmqlmseks.spottorg.ru_access.log json;
error_log /var/log/nginx/rabbitmqlmseks.spottorg.ru_error.log;
ssl_certificate /etc/nginx/ssl/spottorg.crt;
ssl_certificate_key /etc/nginx/ssl/spottorg.key;

8
configs/nuxt/.env
View File

@ -2,11 +2,11 @@ NUXT_HOST=0.0.0.0
NUXT_PORT=3000
NUXT_ENV_DEVALUE_LOG_LEVEL=silent
WS_PROTOCOL=wss
BASE_URL=tqolms.spottorg.ru
API_URL=https://tqolms.spottorg.ru/
DOMAIN=tqolms.spottorg.ru
BASE_URL=ekslms.spottorg.ru
API_URL=https://ekslms.spottorg.ru/
DOMAIN=ekslms.spottorg.ru
APP_HOST=tqolms.spottorg.ru
APP_HOST=ekslms.spottorg.ru
APP_SCHEME=https
APP_ENVIRONMENT=production
DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833

8
configs/nuxt/entrypoint.sh
View File

@ -1,10 +1,10 @@
#!/bin/sh
DOMAIN="${DOMAIN:-tqo.spottorg.ru}"
DOMAIN="${DOMAIN:-eks.spottorg.ru}"
for x in $(grep -lrw "tqo.spottorg.ru" .nuxt/);do
echo "replace tqo.spottorg.ru to https://${DOMAIN} in $x"
sed -i -e "s/tqo.spottorg.ru/${DOMAIN}/g" $x;
for x in $(grep -lrw "eks.spottorg.ru" .nuxt/);do
echo "replace eks.spottorg.ru to https://${DOMAIN} in $x"
sed -i -e "s/eks.spottorg.ru/${DOMAIN}/g" $x;
done
"$@"

24
configs/php/.env
View File

@ -9,7 +9,7 @@ DATABASE_URL_DOT=mysql://root:seeFiethae8enga6ohNi@db:3306/dot?serverVersion=mar
DATABASE_URL_DOT_STATISTIC=mysql://root:seeFiethae8enga6ohNi@db:3306/dot_statistic?serverVersion=mariadb-10.3.25
DOCUMENT_ROOT=/application
APP_HOST=lmstqo.spottorg.ru
APP_HOST=lmseks.spottorg.ru
APP_SCHEME=https
MAILER_DSN=null://null
@ -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.tqo.spottorg.ru/v1/calculate
ML_CALCULATOR_URL=https://calc.dev.eks.spottorg.ru/v1/calculate
ML_REGULAR_DIRECTION_URL=https://calc.dev.tqo.spottorg.ru/v2/schedule/transport
ML_REGULAR_DIRECTION_CHAIN_URL=https://calc.dev.tqo.spottorg.ru/v1/schedule/chains
ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://calc.dev.tqo.spottorg.ru/v1/schedule/carrier/scoring
ML_REGULAR_DIRECTION_CHAIN_RELEVANCE_CARRIERS_URL=https://calc.dev.tqo.spottorg.ru/v1/schedule/chains/carrier/scoring
ML_UNCERTAIN_DIRECTIONS_URL=https://calc.dev.tqo.spottorg.ru/v1/classification/direction/uncertain
ML_REGULAR_DIRECTION_URL=https://calc.dev.eks.spottorg.ru/v2/schedule/transport
ML_REGULAR_DIRECTION_CHAIN_URL=https://calc.dev.eks.spottorg.ru/v1/schedule/chains
ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://calc.dev.eks.spottorg.ru/v1/schedule/carrier/scoring
ML_REGULAR_DIRECTION_CHAIN_RELEVANCE_CARRIERS_URL=https://calc.dev.eks.spottorg.ru/v1/schedule/chains/carrier/scoring
ML_UNCERTAIN_DIRECTIONS_URL=https://calc.dev.eks.spottorg.ru/v1/classification/direction/uncertain
YANDEX_MAPS_ACCESS_KEY=secret
YANDEX_MAPS_BASE_URL=https://api.routing.yandex.net
@ -139,12 +139,12 @@ PROSTOR_SMS_END_POINT_URL=http://api.prostor-sms.ru
PROSTOR_SMS_LOGIN=secret
PROSTOR_SMS_PASSWORD=secret
ACCOUNTING_AUDIT_URL=https://crm.tqo.spottorg.ru
ACCOUNTING_AUDIT_URL=https://crm.eks.spottorg.ru
ACCOUNTING_AUDIT_LOGIN=secret
ACCOUNTING_AUDIT_PASSWORD=secret
APP_LMS_HOST=lmstqo.spottorg.ru
APP_CARGO_CARRIER_HOST=tqo.spottorg.ru
APP_LMS_HOST=lmseks.spottorg.ru
APP_CARGO_CARRIER_HOST=eks.spottorg.ru
QUEUE_DSN_AUCTION_CARRIER_VERIFICATION=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/AUCTION_CARRIER_VERIFICATION
@ -159,8 +159,8 @@ API_KONTUR_DIADOC_SELF_BOX_ID='322d597d-964d-48a8-baa5-2380161826f8'
###< KONTUR_DIADOC###
###> KONTUR_DIADOC###
SIGNER_DOCS_API_URL=https://testcsigner.tqo.spottorg.ru
SIGNER_DOCS_API_URL=https://testcsigner.eks.spottorg.ru
SIGNER_DOCS_API_TOKEN=secret
SIGNER_URL=https://testcsigner.tqo.spottorg.ru
SIGNER_URL=https://testcsigner.eks.spottorg.ru
SIGNER_API_TOKEN='siofdhgt2349875t3iqhf1h2g*^&^%&^GHJGJCxgf'
###< KONTUR_DIADOC###

8
configs/php/.env.local
View File

@ -17,7 +17,7 @@ FNS_ACCESS_TOKEN=a5639b93fe4e7c9a3f1dd85537e066d36439c352
GOOGLE_MAPS_ACCESS_KEY=AIzaSyBCPl2LcpRvplzLUNVMVLhA3b7k46lTCTg
NUXT_BASE_URL=tqolms.spottorg.ru
NUXT_BASE_URL=ekslms.spottorg.ru
ATISU_API_TOKEN=46b599c3ab7f4574b560f48ea005d9f3
@ -181,8 +181,8 @@ QUEUE_DSN_RELEVANT_CARRIER_EXPORT=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5
PLATFORM_NAME=СПОТТОРГ
APP_LMS_HOST=tqolms.spottorg.ru
APP_CARGO_CARRIER_HOST=tqo.spottorg.ru
APP_LMS_HOST=ekslms.spottorg.ru
APP_CARGO_CARRIER_HOST=eks.spottorg.ru
###> KONTUR_DIADOC###
@ -200,4 +200,4 @@ 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'
TENANT=tqo
TENANT=TQO

10
docker-compose.yml
View File

@ -26,9 +26,9 @@ x-defaults-php: &defaults-php
- db
- rabbitmq
extra_hosts:
- "lmstqo.spottorg.ru:192.168.90.100"
- "tqo.spottorg.ru:192.168.90.100"
- "admintqo.spottorg.ru:192.168.90.100"
- "lmseks.spottorg.ru:192.168.90.100"
- "eks.spottorg.ru:192.168.90.100"
- "admineks.spottorg.ru:192.168.90.100"
networks:
- dd
@ -153,10 +153,6 @@ services:
- ./configs/nginx/other:/etc/nginx/other
- nginx_log_volume:/var/log/nginx
- /etc/letsencrypt:/etc/letsencrypt
depends_on:
- nuxt
- php
- static
networks:
dd:
ingress: