fix
This commit is contained in:
parent
e79a458fe4
commit
38411bccc4
8
.env
8
.env
|
|
@ -1,18 +1,18 @@
|
|||
1COMPOSE_PROJECT_NAME=tqo
|
||||
NETWORK=tqo
|
||||
|
||||
FRONT_TAG=138
|
||||
DOTDOT_TAG=138
|
||||
FRONT_TAG=139.1
|
||||
DOTDOT_TAG=139.1
|
||||
LMS_TAG=DD-4042-STORY
|
||||
ADMIN_TAG=master
|
||||
LANDING_TAG=master
|
||||
CABINET_TAG=DD-4159
|
||||
|
||||
MYSQL_PORT=0.0.0.0:33064
|
||||
MYSQL_ROOT_PASSWORD=root
|
||||
MYSQL_ROOT_PASSWORD=seeFiethae8enga6ohNi
|
||||
MYSQL_DATABASE=dot
|
||||
MYSQL_USER=dot
|
||||
MYSQL_PASSWORD=dot
|
||||
MYSQL_PASSWORD=seeFiethae8enga6ohNi
|
||||
|
||||
RABBITMQ_USERNAME=ddadmin
|
||||
RABBITMQ_PASSWORD=Utahth9aeshahgh3saik
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
APP_NAME="DOT-DOT admin"
|
||||
APP_ENV=production
|
||||
APP_KEY=base64:d5GXAhiyEWygEx+TdyNalRaR6UnkBhPznY0ycsDuOoY=
|
||||
APP_KEY=base64:IsI2/a6+WLRl5owxc1i5F+bbOZi7DjaS0IMEoxg14c0=
|
||||
APP_DEBUG=true
|
||||
APP_TIMEZONE=UTC
|
||||
APP_URL=https://admintqo.spottorg.ru
|
||||
FRONTEND_URL=https://admintqo.spottorg.ru
|
||||
ASSET_URL=https://admintqo.spottorg.ru
|
||||
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_LOCALE=ru
|
||||
|
|
@ -30,7 +30,7 @@ DASHBOARD_DB_HOST=db
|
|||
DASHBOARD_DB_PORT=3306
|
||||
DASHBOARD_DB_DATABASE=dashboard
|
||||
DASHBOARD_DB_USERNAME=root
|
||||
DASHBOARD_DB_PASSWORD=root
|
||||
DASHBOARD_DB_PASSWORD=seeFiethae8enga6ohNi
|
||||
|
||||
#Параметры подключения к базе dot-dot
|
||||
|
||||
|
|
@ -38,7 +38,7 @@ DOT_DOT_DB_HOST=db
|
|||
DOT_DOT_DB_PORT=3306
|
||||
DOT_DOT_DB_DATABASE=dot
|
||||
DOT_DOT_DB_USERNAME=dot
|
||||
DOT_DOT_DB_PASSWORD=dot
|
||||
DOT_DOT_DB_PASSWORD=seeFiethae8enga6ohNi
|
||||
|
||||
SESSION_DRIVER=database
|
||||
SESSION_LIFETIME=120
|
||||
|
|
@ -77,4 +77,4 @@ AWS_USE_PATH_STYLE_ENDPOINT=false
|
|||
|
||||
VITE_APP_NAME="${APP_NAME}"
|
||||
|
||||
DOT_DOT_HOST=https://lmstqo.spottorg.ru
|
||||
DOT_DOT_HOST=https://tqolms.spottorg.ru
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
server {
|
||||
server_name admintqo.spottorg.ru;
|
||||
server_name tqoadmin.spottorg.ru;
|
||||
listen 443 ssl;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/spottorg.ru/fullchain.pem;
|
||||
|
|
@ -22,4 +22,4 @@ server {
|
|||
try_files $uri =404;
|
||||
fastcgi_index index.php;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@ NUXT_PORT=3000
|
|||
NUXT_ENV_DEVALUE_LOG_LEVEL=silent
|
||||
WS_PROTOCOL=wss
|
||||
BASE_URL=tqo.spottorg.ru
|
||||
API_URL=https://lmstqo.spottorg.ru/
|
||||
API_URL=https://tqolms.spottorg.ru/
|
||||
DOMAIN=tqo.spottorg.ru
|
||||
|
||||
APP_HOST=lmstqo.spottorg.ru
|
||||
APP_HOST=tqolms.spottorg.ru
|
||||
APP_SCHEME=https
|
||||
APP_ENVIRONMENT=production
|
||||
DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833
|
||||
|
|
|
|||
|
|
@ -4,7 +4,10 @@
|
|||
"admin_secret": "ca0a7656-f589-42e6-9e49-98dd3c5beb46",
|
||||
"api_key": "aa7443fb-e623-4363-91ac-ef25908b1403",
|
||||
"admin": true,
|
||||
"allowed_origins": ["http://dot-dot.local", "https://dot-dot.ru", "https://lmstqo.spottorg.ru", "https://demo.dot-dot.ru", "https://lmstqo.spottorg.ru", "https://tqo.spottorg.ru"],
|
||||
"allowed_origins": [
|
||||
"https://tqolms.spottorg.ru",
|
||||
"https://tqo.spottorg.ru"
|
||||
],
|
||||
"allow_subscribe_for_client": true,
|
||||
"allow_user_limited_channels": true
|
||||
}
|
||||
}
|
||||
|
|
@ -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://lmstqo.spottorg.ru/
|
||||
API_URL=https://lmstqo.spottorg.ru/
|
||||
DOMAIN=lmstqo.spottorg.ru
|
||||
BASE_URL=https://tqolms.spottorg.ru/
|
||||
API_URL=https://tqolms.spottorg.ru/
|
||||
DOMAIN=tqolms.spottorg.ru
|
||||
|
||||
APP_HOST=lmstqo.spottorg.ru
|
||||
APP_HOST=tqolms.spottorg.ru
|
||||
APP_SCHEME=https
|
||||
APP_ENVIRONMENT=production
|
||||
DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
#!/bin/sh -x
|
||||
#!/bin/sh -x
|
||||
|
||||
DOMAIN="${DOMAIN:-demo.tqo.spottorg.ru}"
|
||||
DOMAIN="${DOMAIN:-lms.dot-dot.ru}"
|
||||
|
||||
for x in $(grep -lrw "lmstqo.spottorg.ru" .nuxt/);do
|
||||
echo "replace lmstqo.spottorg.ru to https://${DOMAIN} in $x"
|
||||
sed -i -e "s/lmstqo.spottorg.ru/${DOMAIN}/g" $x;
|
||||
for x in $(grep -lrw "lms.dot-dot.ru" .nuxt/);do
|
||||
echo "replace lms.dot-dot.ru to https://${DOMAIN} in $x"
|
||||
sed -i -e "s/lms.dot-dot.ru/${DOMAIN}/g" $x;
|
||||
done
|
||||
|
||||
"$@"
|
||||
|
|
|
|||
|
|
@ -1,21 +1,20 @@
|
|||
server {
|
||||
listen 80;
|
||||
server_name admintqo.spottorg.ru;
|
||||
server_name tqoadmin.spottorg.ru;
|
||||
return 301 https://$server_name$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
server_name admintqo.spottorg.ru;
|
||||
server_name tqoadmin.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;
|
||||
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/admintqo.spottorg.ru_access.log json;
|
||||
error_log /var/log/nginx/admintqo.spottorg.ru_error.log;
|
||||
access_log /var/log/nginx/tqoadmin.spottorg.ru_access.log json;
|
||||
error_log /var/log/nginx/tqoadmin.spottorg.ru_error.log;
|
||||
|
||||
location / {
|
||||
proxy_pass https://admin:443;
|
||||
|
|
|
|||
|
|
@ -2,9 +2,8 @@ server {
|
|||
listen 443 ssl ;
|
||||
server_name tqo.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;
|
||||
ssl_certificate /etc/nginx/ssl/spottorg.crt;
|
||||
ssl_certificate_key /etc/nginx/ssl/spottorg.key;
|
||||
|
||||
client_max_body_size 10m;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,9 +8,8 @@ server {
|
|||
listen 443 ssl;
|
||||
server_name lmstqo.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;
|
||||
ssl_certificate /etc/nginx/ssl/spottorg.crt;
|
||||
ssl_certificate_key /etc/nginx/ssl/spottorg.key;
|
||||
|
||||
root /application/public;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,9 +15,8 @@ server {
|
|||
access_log /var/log/nginx/wstqo.spottorg.ru_access.log json;
|
||||
error_log /var/log/nginx/wstqo.spottorg.ru_error.log;
|
||||
|
||||
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;
|
||||
ssl_certificate /etc/nginx/ssl/spottorg.crt;
|
||||
ssl_certificate_key /etc/nginx/ssl/spottorg.key;
|
||||
|
||||
location / {
|
||||
proxy_pass_header Server;
|
||||
|
|
|
|||
|
|
@ -8,9 +8,8 @@ server {
|
|||
listen 443 ssl;
|
||||
server_name landingtqo.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;
|
||||
ssl_certificate /etc/nginx/ssl/spottorg.crt;
|
||||
ssl_certificate_key /etc/nginx/ssl/spottorg.key;
|
||||
|
||||
client_max_body_size 10m;
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,138 @@
|
|||
server {
|
||||
listen 80;
|
||||
server_name tqolms.spottorg.ru;
|
||||
return 301 https://$server_name$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
server_name tqolms.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;
|
||||
|
||||
root /application/public;
|
||||
|
||||
|
||||
client_max_body_size 30m;
|
||||
|
||||
location / {
|
||||
proxy_pass http://lms: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 {
|
||||
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 /connection/websocket {
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "Upgrade";
|
||||
proxy_pass http://centrifugo;
|
||||
}
|
||||
|
||||
location /robots.txt {
|
||||
root /etc/nginx/other/demo.dot-dot.ru;
|
||||
}
|
||||
|
||||
location /css {
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
|
@ -11,9 +11,8 @@ server {
|
|||
access_log /var/log/nginx/rabbitmqlmstqo.spottorg.ru_access.log json;
|
||||
error_log /var/log/nginx/rabbitmqlmstqo.spottorg.ru_error.log;
|
||||
|
||||
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;
|
||||
ssl_certificate /etc/nginx/ssl/spottorg.crt;
|
||||
ssl_certificate_key /etc/nginx/ssl/spottorg.key;
|
||||
|
||||
proxy_buffer_size 128k;
|
||||
proxy_buffers 4 128k;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,107 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
MIIHWDCCBkCgAwIBAgIMR1M2ZLtwd9qMW0I+MA0GCSqGSIb3DQEBCwUAMFUxCzAJ
|
||||
BgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSswKQYDVQQDEyJH
|
||||
bG9iYWxTaWduIEdDQyBSNiBBbHBoYVNTTCBDQSAyMDI1MB4XDTI1MDgyNjA2NTgz
|
||||
NVoXDTI2MDkyNzA2NTgzNFowGDEWMBQGA1UEAwwNKi5zcG90dG9yZy5ydTCCAiIw
|
||||
DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK1M9gAXJ1OVgvx8Ar6T9udnVTz
|
||||
vfEDlU/YjP6a9vNW8keHbVNr5Nk9pp9W9lUCpKi6q73AbCgKZrvfIpbZHhbpJdw8
|
||||
yl3fdMmyth7Q4y6Y2yqJZLDru2BLM/g4rdf3pbudnjXLIhwSuaYTCCp79go4QAl8
|
||||
e2jxUehXRDIOf388kykDoCHCKnRxz7fwo92oGhLwRpbk3VR5bEl80OR12KGcmsGs
|
||||
VAcsUeluKe/Zo3Po4IQvMcT3tMDezYsM7HKjuE9YEyGD+kUtyE/OqoPQvFEZVU37
|
||||
uLGeHS2PVrubrHlBcTyCOige26klsI6BRi2BK4aza1ekF+z00ulxYoBP9HizISYP
|
||||
sdO8NoY4bipnANDfPgNqGgnDTTWFaSEdOnj43WFaKpkHvvAWsQTaCzMm0x0ibvJV
|
||||
qMUPqd/N9OCBZ9NGJYKrWGvNUMdC/gC0e3gn56wlYmKH3AICpTbJqSOPYXMXXIYE
|
||||
bnCvd6Y9I2jVOSh/eDNcQOWVhhF++ox3Jpskw5/vY2DegGAqHWM/SkdgPKU8H8Av
|
||||
SZt+f+3OJ7DHRgz1BYZBRUUulVUf+XjKSX4higmWzwltvP5mzDT2hN7GjeXJSoGF
|
||||
DAJCWHCjRBfh0CSBQQMaWMdi4Hql29ECRaJ72vq9cLSDOu3/wcjvJdXLGy21wGq8
|
||||
ko0PizDTXVcpuWWHAgMBAAGjggNjMIIDXzAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0T
|
||||
AQH/BAIwADCBmQYIKwYBBQUHAQEEgYwwgYkwSQYIKwYBBQUHMAKGPWh0dHA6Ly9z
|
||||
ZWN1cmUuZ2xvYmFsc2lnbi5jb20vY2FjZXJ0L2dzZ2NjcjZhbHBoYXNzbGNhMjAy
|
||||
NS5jcnQwPAYIKwYBBQUHMAGGMGh0dHA6Ly9vY3NwLmdsb2JhbHNpZ24uY29tL2dz
|
||||
Z2NjcjZhbHBoYXNzbGNhMjAyNTBXBgNVHSAEUDBOMAgGBmeBDAECATBCBgorBgEE
|
||||
AaAyCgEDMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29t
|
||||
L3JlcG9zaXRvcnkvMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwuZ2xvYmFs
|
||||
c2lnbi5jb20vZ3NnY2NyNmFscGhhc3NsY2EyMDI1LmNybDAlBgNVHREEHjAcgg0q
|
||||
LnNwb3R0b3JnLnJ1ggtzcG90dG9yZy5ydTAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
|
||||
KwYBBQUHAwIwHwYDVR0jBBgwFoAUxbSTj28r3B5Iv7cQMIXO0bK7SC0wHQYDVR0O
|
||||
BBYEFGlk4BROneHJoVeE4xE68H/mDAyNMIIBfAYKKwYBBAHWeQIEAgSCAWwEggFo
|
||||
AWYAdQDLOPcViXyEoURfW8Hd+8lu8ppZzUcKaQWFsMsUwxRY5wAAAZjlK+2GAAAE
|
||||
AwBGMEQCIFwLrtC0boMJ90PMJWhfF1cXMabJLDOg57nNoDF24XSaAiByzqW3ROEI
|
||||
gOmpDc+1KQ6mY77My2hK9KAWDnIPo+yGFQB1AMIxfldFGaNF7n843rKQQevHwiFa
|
||||
Ir9/1bWtdprZDlLNAAABmOUr7v0AAAQDAEYwRAIgaWO2C4oqrbnAPgoIOu8DktTz
|
||||
yIIhJ5SyJGtNneDwCEMCIAqpDRyLujpDoh2ac0tSjVM0bj198mOOSEoawW9WINON
|
||||
AHYAlLHBirDQV8R74KwEDh8svI3DdXJ7yVHyClJhJoY7pzwAAAGY5SvvdwAABAMA
|
||||
RzBFAiAG8aDXU8rCCPDlK5Qge9bcmL+LUMAIj4VT1XXGymiTPAIhAI+4KobdPzF+
|
||||
9RypS2t5xvM7+lv2LIjpySplfWclXGW+MA0GCSqGSIb3DQEBCwUAA4IBAQCBQgLv
|
||||
mXtwPMI4b8eqBtVCHYEJf4WNJYA16mfwQ3Vgi7p8q+UmQ+62EMxatuBLevTO1HlQ
|
||||
bLBF+vveWMrvLctsl87V6gQXrQL36Fk7u/q70lySI9MGdj9BkD+zEtPGiyyioGiK
|
||||
0k1iUzMlHvHG8fo870Jqd1XcINSPpfxHALheZyoxnqE8wU1PraPg2nMuxfY8JWAH
|
||||
/0VI+66IwiVW/KqtLQdliX7E/QOzcrQMdHXIDSTqJA0bR1NLJ2+j7mP9bJrVRgZU
|
||||
r/LxtfPCQTWUAS1vK5EtyqegvGZy3agpYnUigqEMhdkX2nGGPozG6rDcMEz7tMYy
|
||||
i2Vig1FrGRjrhH8n
|
||||
-----END CERTIFICATE-----
|
||||
-----BEGIN CERTIFICATE-----
|
||||
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
|
||||
-----END CERTIFICATE-----
|
||||
|
||||
-----BEGIN CERTIFICATE-----
|
||||
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
|
||||
5hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
|
||||
-----END CERTIFICATE-----
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
-----BEGIN RSA PRIVATE KEY-----
|
||||
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
|
||||
-----END RSA PRIVATE KEY-----
|
||||
|
|
@ -2,11 +2,11 @@ NUXT_HOST=0.0.0.0
|
|||
NUXT_PORT=3000
|
||||
NUXT_ENV_DEVALUE_LOG_LEVEL=silent
|
||||
WS_PROTOCOL=wss
|
||||
BASE_URL=lmstqo.spottorg.ru
|
||||
API_URL=https://lmstqo.spottorg.ru/
|
||||
DOMAIN=lmstqo.spottorg.ru
|
||||
BASE_URL=tqolms.spottorg.ru
|
||||
API_URL=https://tqolms.spottorg.ru/
|
||||
DOMAIN=tqolms.spottorg.ru
|
||||
|
||||
APP_HOST=lmstqo.spottorg.ru
|
||||
APP_HOST=tqolms.spottorg.ru
|
||||
APP_SCHEME=https
|
||||
APP_ENVIRONMENT=production
|
||||
DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ CONTAINER_NAME=php
|
|||
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
|
||||
DATABASE_URL_DOT=mysql://root:seeFiethae8enga6ohNi@db:3306/dot?serverVersion=mariadb-10.3.25
|
||||
DATABASE_URL_DOT_STATISTIC=mysql://root:seeFiethae8enga6ohNi@db:3306/dot_statistic?serverVersion=mariadb-10.3.25
|
||||
|
||||
DOCUMENT_ROOT=/application
|
||||
APP_HOST=lmstqo.spottorg.ru
|
||||
|
|
@ -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@tqo.spottorg.ru
|
||||
ADMIN_EMAIL=change.this@tqo.spottorg.ru
|
||||
ACCOUNTANT_EMAIL=noreplay@tqo.spottorg.ru
|
||||
SALES_EMAIL=sale.ftl@tqo.spottorg.ru
|
||||
LOGIST_EMAIL=nd@tqo.spottorg.ru
|
||||
LEAD_EMAIL=change.this@tqo.spottorg.ru
|
||||
VOSTOK_EMAIL=vostok@tqo.spottorg.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
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ FNS_ACCESS_TOKEN=a5639b93fe4e7c9a3f1dd85537e066d36439c352
|
|||
|
||||
GOOGLE_MAPS_ACCESS_KEY=AIzaSyBCPl2LcpRvplzLUNVMVLhA3b7k46lTCTg
|
||||
|
||||
NUXT_BASE_URL=demo.spottorg.ru
|
||||
NUXT_BASE_URL=tqolms.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=demo.spottorg.ru
|
||||
APP_CARGO_CARRIER_HOST=democabinet.spottorg.ru
|
||||
APP_LMS_HOST=tqolms.spottorg.ru
|
||||
APP_CARGO_CARRIER_HOST=tqo.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=dot
|
||||
TENANT=tqo
|
||||
|
|
|
|||
Loading…
Reference in New Issue