Compare commits
No commits in common. "e1ac23b298e5f3c1077fcba76c60a80a3372b777" and "68268831106347e6f7ad6883c2d97ff4e4bc1aae" have entirely different histories.
e1ac23b298
...
6826883110
19
.env
19
.env
|
|
@ -1,20 +1,11 @@
|
||||||
COMPOSE_PROJECT_NAME=testb
|
COMPOSE_PROJECT_NAME=testa
|
||||||
NETWORK=testb
|
NETWORK=testa
|
||||||
|
|
||||||
FRONT_TAG=master
|
FRONT_TAG=test-nuxt
|
||||||
# FRONT_TAG=master
|
DOTDOT_TAG=test-nuxt
|
||||||
DOTDOT_TAG=master
|
|
||||||
# DOTDOT_TAG=master
|
|
||||||
LMS_TAG=master
|
|
||||||
|
|
||||||
MYSQL_PORT=0.0.0.0:33062
|
MYSQL_PORT=0.0.0.0:3306
|
||||||
MYSQL_ROOT_PASSWORD=root
|
MYSQL_ROOT_PASSWORD=root
|
||||||
MYSQL_DATABASE=dot
|
MYSQL_DATABASE=dot
|
||||||
MYSQL_USER=dot
|
MYSQL_USER=dot
|
||||||
MYSQL_PASSWORD=dot
|
MYSQL_PASSWORD=dot
|
||||||
|
|
||||||
RABBITMQ_USERNAME=ddadmin
|
|
||||||
RABBITMQ_PASSWORD=Utahth9aeshahgh3saik
|
|
||||||
|
|
||||||
REDIS_USERNAME=ddadmin
|
|
||||||
REDIS_PASSWORD=Utahth9aeshahgh3saik
|
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
backups/*
|
|
||||||
177
app.sh
177
app.sh
|
|
@ -1,177 +0,0 @@
|
||||||
DIRECTORY=`dirname $0`
|
|
||||||
|
|
||||||
MYSQL_ROOT_PASSWORD=$(grep MYSQL_ROOT_PASSWORD $DIRECTORY"/.env" | xargs)
|
|
||||||
MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD#*=}
|
|
||||||
|
|
||||||
help() {
|
|
||||||
echo "run $0 [COMMAND] "
|
|
||||||
echo '
|
|
||||||
"init" - run init flow
|
|
||||||
"up" - up -d all services
|
|
||||||
"down" - down all services without volumes
|
|
||||||
"composer" - run composer ${@:2}
|
|
||||||
"psalm" - run composer analyse
|
|
||||||
"php-fixer" - run composer cs
|
|
||||||
"deptrac" - run composer deptrac
|
|
||||||
"tests" - run composer tests
|
|
||||||
"console" - run docker compose exec php ./bin/console ${@:2}
|
|
||||||
"db" - run mysql shell
|
|
||||||
"db-create" - crate database
|
|
||||||
"backup-dev" -
|
|
||||||
"backup-create" -
|
|
||||||
"backup-exec" -
|
|
||||||
"restore-dev" -
|
|
||||||
"purge-db" - purge database
|
|
||||||
"restore-db" - restore database from s3 backup
|
|
||||||
"front" - exec front container
|
|
||||||
|
|
||||||
'
|
|
||||||
}
|
|
||||||
|
|
||||||
log() {
|
|
||||||
RED='\e[31m'
|
|
||||||
GREEN='\e[32m'
|
|
||||||
|
|
||||||
case $2 in
|
|
||||||
info)
|
|
||||||
printf "${GREEN}${1}\e[0m\n"
|
|
||||||
;;
|
|
||||||
error)
|
|
||||||
printf "${RED}${1}\e[0m\n"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
printf "${1}"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
## restore last backup from s3 storage
|
|
||||||
restoredb() {
|
|
||||||
log "run restore database"
|
|
||||||
sudo rclone copy --verbose selectel:backup_db/dot/dot.$(date +%a).sql.gz backups/
|
|
||||||
zcat backups/dot.$(date +%a).sql.gz | docker compose exec -T db mysql -uroot -p${MYSQL_ROOT_PASSWORD} dot
|
|
||||||
}
|
|
||||||
|
|
||||||
checkDockerCompose() {
|
|
||||||
if ! [ -f "docker-compose.yml" ]; then
|
|
||||||
log "docker-compose.yml not exist. Run init command" "error"
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
init() {
|
|
||||||
dumpfile=$(ls backups/ | sort | tail -1)
|
|
||||||
if ! [ -f backups/${dumpfile} ]; then
|
|
||||||
log "put dot.sql to backups directory" "error"
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! [ -f ".env" ]; then
|
|
||||||
log ".env not exist. Run init command" "error"
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
|
|
||||||
up
|
|
||||||
|
|
||||||
docker compose exec php composer install
|
|
||||||
# docker compose exec front npm i
|
|
||||||
|
|
||||||
# docker compose exec front npm run build
|
|
||||||
|
|
||||||
if ! docker compose exec db mysql -uroot -proot -e "show databases" | grep "dot "; then
|
|
||||||
createDatabase "dot"
|
|
||||||
execBackup "dot" ${dumpfile}
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
up() {
|
|
||||||
checkDockerCompose
|
|
||||||
docker compose up -d
|
|
||||||
}
|
|
||||||
|
|
||||||
down() {
|
|
||||||
checkDockerCompose
|
|
||||||
docker compose down
|
|
||||||
}
|
|
||||||
|
|
||||||
createDatabase() {
|
|
||||||
docker compose exec db mysql -uroot -p${MYSQL_ROOT_PASSWORD} -e "create database $1"
|
|
||||||
log "create database $1" "info"
|
|
||||||
}
|
|
||||||
|
|
||||||
createBackup() {
|
|
||||||
docker compose exec db mysqldump -uroot -p${MYSQL_ROOT_PASSWORD} $1 > backups/$2.sql
|
|
||||||
}
|
|
||||||
|
|
||||||
createBackupWithExceptions() {
|
|
||||||
docker compose exec db mysqldump -uroot -p${MYSQL_ROOT_PASSWORD} --ignore-table=dot.ml_calculator_log dot > backups/dot_develop.sql
|
|
||||||
docker compose exec db mysqldump -uroot -p${MYSQL_ROOT_PASSWORD} --no-data dot ml_calculator_log >> backups/dot_develop.sql
|
|
||||||
}
|
|
||||||
|
|
||||||
execBackup() {
|
|
||||||
zcat backups/$2 | docker compose exec -T db mysql -uroot -p${MYSQL_ROOT_PASSWORD} $1
|
|
||||||
log "exec $2.sql backup" "info"
|
|
||||||
}
|
|
||||||
|
|
||||||
execDevBackup() {
|
|
||||||
docker compose exec -T db mysql -uroot -p${MYSQL_ROOT_PASSWORD} dot < backups/dot_develop.sql
|
|
||||||
log "exec dot_develop.sql backup" "info"
|
|
||||||
}
|
|
||||||
|
|
||||||
purgeDb() {
|
|
||||||
docker compose exec db mysql -uroot -p${MYSQL_ROOT_PASSWORD} -e "drop database dot"
|
|
||||||
log "dropped database dot" "info"
|
|
||||||
docker compose exec db mysql -uroot -p${MYSQL_ROOT_PASSWORD} -e "create database dot"
|
|
||||||
log "created database dot" "info"
|
|
||||||
}
|
|
||||||
|
|
||||||
composer() {
|
|
||||||
docker compose exec php php -d memory_limit=-1 /usr/local/bin/composer ${@:1}
|
|
||||||
}
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
"help")
|
|
||||||
help;;
|
|
||||||
"init")
|
|
||||||
init;;
|
|
||||||
"up")
|
|
||||||
up;;
|
|
||||||
"down")
|
|
||||||
down;;
|
|
||||||
"composer"*)
|
|
||||||
composer ${@:2};;
|
|
||||||
"psalm"*)
|
|
||||||
composer analyse;;
|
|
||||||
"php-fixer")
|
|
||||||
composer cs;;
|
|
||||||
"deptrac")
|
|
||||||
composer deptrac;;
|
|
||||||
"tests")
|
|
||||||
composer tests;;
|
|
||||||
"console"*)
|
|
||||||
docker compose exec php ./bin/console ${@:2};;
|
|
||||||
"db")
|
|
||||||
docker compose exec db mysql -uroot -p${MYSQL_ROOT_PASSWORD};;
|
|
||||||
"db-create")
|
|
||||||
createDatabase $2;;
|
|
||||||
"backup-dev"*)
|
|
||||||
createBackupWithExceptions $2;;
|
|
||||||
"backup-create"*)
|
|
||||||
createBackup $2 $3;;
|
|
||||||
"backup-exec"*)
|
|
||||||
execBackup $2 $3;;
|
|
||||||
"restore-dev"*)
|
|
||||||
execDevBackup;;
|
|
||||||
"purge-db"*)
|
|
||||||
purgeDb;;
|
|
||||||
"restore-db")
|
|
||||||
restoredb;;
|
|
||||||
"front"*)
|
|
||||||
case $2 in
|
|
||||||
*)
|
|
||||||
docker compose exec nuxt ${@:2};;
|
|
||||||
esac;;
|
|
||||||
*)
|
|
||||||
help
|
|
||||||
#docker compose exec php ./bin/console ${@:1};;
|
|
||||||
esac
|
|
||||||
|
|
@ -1,78 +0,0 @@
|
||||||
APP_NAME="DOT-DOT DASHBOARD"
|
|
||||||
APP_ENV=local
|
|
||||||
APP_KEY=base64:UdElHcbd1MSsWoLOn8LietbdAhHiyT/C6+dpy+kYfkQ=
|
|
||||||
APP_DEBUG=true
|
|
||||||
APP_TIMEZONE=UTC
|
|
||||||
APP_URL=https://testbdashboard.dot-dot.ru
|
|
||||||
FRONTEND_URL=https://testbdashboard.dot-dot.ru
|
|
||||||
ASSET_URL=https://testbdashboard.dot-dot.ru
|
|
||||||
APP_EMAIL_DOMAIN="dot-dot.ru"
|
|
||||||
|
|
||||||
APP_LOCALE=ru
|
|
||||||
APP_FALLBACK_LOCALE=ru
|
|
||||||
APP_FAKER_LOCALE=ru_RU
|
|
||||||
|
|
||||||
APP_MAINTENANCE_DRIVER=file
|
|
||||||
# APP_MAINTENANCE_STORE=database
|
|
||||||
|
|
||||||
BCRYPT_ROUNDS=12
|
|
||||||
|
|
||||||
LOG_CHANNEL=stack
|
|
||||||
LOG_STACK=single
|
|
||||||
LOG_DEPRECATIONS_CHANNEL=null
|
|
||||||
LOG_LEVEL=debug
|
|
||||||
|
|
||||||
DEFAULT_DB_CONNECTION=dashboard
|
|
||||||
|
|
||||||
#Параметры подключения к базе панели управления
|
|
||||||
DASHBOARD_DB_HOST=db
|
|
||||||
DASHBOARD_DB_PORT=3306
|
|
||||||
DASHBOARD_DB_DATABASE=dashboard
|
|
||||||
DASHBOARD_DB_USERNAME=root
|
|
||||||
DASHBOARD_DB_PASSWORD=root
|
|
||||||
|
|
||||||
#Параметры подключения к базе dot-dot
|
|
||||||
DOT_DOT_DB_HOST=db
|
|
||||||
DOT_DOT_DB_PORT=3306
|
|
||||||
DOT_DOT_DB_DATABASE=dot
|
|
||||||
DOT_DOT_DB_USERNAME=root
|
|
||||||
DOT_DOT_DB_PASSWORD=root
|
|
||||||
|
|
||||||
SESSION_DRIVER=database
|
|
||||||
SESSION_LIFETIME=120
|
|
||||||
SESSION_ENCRYPT=false
|
|
||||||
SESSION_PATH=/
|
|
||||||
SESSION_DOMAIN=null
|
|
||||||
|
|
||||||
BROADCAST_CONNECTION=log
|
|
||||||
FILESYSTEM_DISK=local
|
|
||||||
QUEUE_CONNECTION=database
|
|
||||||
|
|
||||||
CACHE_STORE=database
|
|
||||||
CACHE_PREFIX=
|
|
||||||
|
|
||||||
MEMCACHED_HOST=127.0.0.1
|
|
||||||
|
|
||||||
REDIS_CLIENT=phpredis
|
|
||||||
REDIS_HOST=127.0.0.1
|
|
||||||
REDIS_PASSWORD=null
|
|
||||||
REDIS_PORT=6379
|
|
||||||
|
|
||||||
MAIL_MAILER=log
|
|
||||||
MAIL_HOST=127.0.0.1
|
|
||||||
MAIL_PORT=2525
|
|
||||||
MAIL_USERNAME=null
|
|
||||||
MAIL_PASSWORD=null
|
|
||||||
MAIL_ENCRYPTION=null
|
|
||||||
MAIL_FROM_ADDRESS="hello@example.com"
|
|
||||||
MAIL_FROM_NAME="${APP_NAME}"
|
|
||||||
|
|
||||||
AWS_ACCESS_KEY_ID=
|
|
||||||
AWS_SECRET_ACCESS_KEY=
|
|
||||||
AWS_DEFAULT_REGION=us-east-1
|
|
||||||
AWS_BUCKET=
|
|
||||||
AWS_USE_PATH_STYLE_ENDPOINT=false
|
|
||||||
|
|
||||||
VITE_APP_NAME="${APP_NAME}"
|
|
||||||
|
|
||||||
OCTANE_SERVER=frankenphp
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
{
|
|
||||||
admin {
|
|
||||||
disabled false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,129 +0,0 @@
|
||||||
{
|
|
||||||
"apps": {
|
|
||||||
"frankenphp": {},
|
|
||||||
"http": {
|
|
||||||
"servers": {
|
|
||||||
"srv0": {
|
|
||||||
"listen": [
|
|
||||||
":443"
|
|
||||||
],
|
|
||||||
"routes": [
|
|
||||||
{
|
|
||||||
"handle": [
|
|
||||||
{
|
|
||||||
"handler": "subroute",
|
|
||||||
"routes": [
|
|
||||||
{
|
|
||||||
"handle": [
|
|
||||||
{
|
|
||||||
"handler": "vars",
|
|
||||||
"root": "public/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"encodings": {
|
|
||||||
"br": {},
|
|
||||||
"gzip": {},
|
|
||||||
"zstd": {}
|
|
||||||
},
|
|
||||||
"handler": "encode",
|
|
||||||
"prefer": [
|
|
||||||
"zstd",
|
|
||||||
"br",
|
|
||||||
"gzip"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"handle": [
|
|
||||||
{
|
|
||||||
"handler": "static_response",
|
|
||||||
"headers": {
|
|
||||||
"Location": [
|
|
||||||
"{http.request.orig_uri.path}/"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"status_code": 308
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"match": [
|
|
||||||
{
|
|
||||||
"file": {
|
|
||||||
"try_files": [
|
|
||||||
"{http.request.uri.path}/index.php"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"not": [
|
|
||||||
{
|
|
||||||
"path": [
|
|
||||||
"*/"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"handle": [
|
|
||||||
{
|
|
||||||
"handler": "rewrite",
|
|
||||||
"uri": "{http.matchers.file.relative}"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"match": [
|
|
||||||
{
|
|
||||||
"file": {
|
|
||||||
"split_path": [
|
|
||||||
".php"
|
|
||||||
],
|
|
||||||
"try_files": [
|
|
||||||
"{http.request.uri.path}",
|
|
||||||
"{http.request.uri.path}/index.php",
|
|
||||||
"index.php"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"handle": [
|
|
||||||
{
|
|
||||||
"handler": "php",
|
|
||||||
"split_path": [
|
|
||||||
".php"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"match": [
|
|
||||||
{
|
|
||||||
"path": [
|
|
||||||
"*.php"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"handle": [
|
|
||||||
{
|
|
||||||
"handler": "file_server"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"match": [
|
|
||||||
{
|
|
||||||
"host": [
|
|
||||||
"testbdashboard.dot-dot.ru"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"terminal": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
Deny from all
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
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
|
|
||||||
|
|
||||||
APP_HOST=testblms.dot-dot.ru
|
|
||||||
APP_SCHEME=https
|
|
||||||
APP_ENVIRONMENT=production
|
|
||||||
DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833
|
|
||||||
YANDEX_METRIKA_ID=5015695
|
|
||||||
|
|
@ -1,22 +1,8 @@
|
||||||
server {
|
server {
|
||||||
listen 80;
|
server_name testa.dot-dot.ru;
|
||||||
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;
|
root /application/public;
|
||||||
|
|
||||||
client_max_body_size 30m;
|
|
||||||
client_body_buffer_size 30M;
|
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
proxy_pass http://nuxt:3000;
|
proxy_pass http://nuxt:3000;
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
|
|
@ -33,7 +19,7 @@ server {
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
proxy_set_header Connection "Upgrade";
|
proxy_set_header Connection "Upgrade";
|
||||||
proxy_pass http://php:8080;
|
proxy_pass http://php:9000;
|
||||||
}
|
}
|
||||||
|
|
||||||
location @rewriteapp {
|
location @rewriteapp {
|
||||||
|
|
@ -48,6 +34,10 @@ server {
|
||||||
try_files $uri @rewriteapp;
|
try_files $uri @rewriteapp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
location /help {
|
||||||
|
alias /application/help-platform/src/.vuepress/dist;
|
||||||
|
}
|
||||||
|
|
||||||
location /api {
|
location /api {
|
||||||
rewrite ^(.*)$ /index.php/$1 last;
|
rewrite ^(.*)$ /index.php/$1 last;
|
||||||
}
|
}
|
||||||
|
|
@ -76,10 +66,6 @@ server {
|
||||||
try_files $uri @rewriteapp;
|
try_files $uri @rewriteapp;
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~* \/admin\/.*(js|jpg|png|css|woff|woff2)$ {
|
|
||||||
proxy_pass http://static;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /media {
|
location /media {
|
||||||
try_files $uri @rewriteapp;
|
try_files $uri @rewriteapp;
|
||||||
}
|
}
|
||||||
|
|
@ -103,8 +89,7 @@ server {
|
||||||
return 204;
|
return 204;
|
||||||
}
|
}
|
||||||
|
|
||||||
#add_header 'Access-Control-Allow-Origin' $http_origin;
|
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-Credentials' 'true';
|
||||||
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE';
|
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-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Expeditor-Domain,Authorization';
|
||||||
|
|
|
||||||
|
|
@ -1,89 +0,0 @@
|
||||||
-----BEGIN CERTIFICATE-----
|
|
||||||
MIIHQTCCBimgAwIBAgIMYVwKHoDdXb8WTFQpMA0GCSqGSIb3DQEBCwUAMEwxCzAJ
|
|
||||||
BgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSIwIAYDVQQDExlB
|
|
||||||
bHBoYVNTTCBDQSAtIFNIQTI1NiAtIEc0MB4XDTIzMDgwMjE0MTYxN1oXDTI0MDkw
|
|
||||||
MjE0MTYxNlowFzEVMBMGA1UEAwwMKi5kb3QtZG90LnJ1MIICIjANBgkqhkiG9w0B
|
|
||||||
AQEFAAOCAg8AMIICCgKCAgEAz6xhGhA8PUZbJ1F9viMiaO4ZiAjSW9YwooX9ATCV
|
|
||||||
dDp4+ffuBFGel8IxxzxcBIQy4GToEfMgoViifL6OnX0OOQLDEfrWQYATXmkEz9Cq
|
|
||||||
VVT1F3s+YVxBrdTRpgvPwPb5mFyJ1XtKnyNf7Flb9SKER5Nk8PRY3XOKellv4Nex
|
|
||||||
VqHnL4ClHvOdsZYNzV3jHJ7CMwQb17h6Qfr9Q7dReLl02xVGbE2sFOLqDbBMq7KZ
|
|
||||||
yebOxix+4L1p9uT3cqE2Us2rRT5RFP5tmgdB3ALIlID4hfiwlNtSSvgPOaML+6ON
|
|
||||||
hUo3nNd8zvKa4n9ta9hWAhSe0iBXs2IS3DBTaDJqCm83HW34hp0K0WrBaH8v+RbR
|
|
||||||
2CCzy9maj4u2wJ95Rqkyj3usc/60wYMBe86cQh1WYMJJDVUPKlctwWFBqsuWr7Or
|
|
||||||
ikVdMcDb68w+FcEIQGYjVe9tASDAlu4pV0e2KdbtqjX/JgrMf1gRBp0JuPDryzEe
|
|
||||||
hdTSpoASD/lOp4dXrm6OIGDhQdl2KCvpG3TysFaUDdvoSkLm9CAPqNcICf+XQGpt
|
|
||||||
/GmjwJlFCWaxlKIec7v9wOdZNr4bbz2Gy8QzbbDfhj34hCUqrJbaNs8KidW8VK5A
|
|
||||||
bRb6YRW+wjkoeeouoyE2BpspVhuqjwI49Rrc4tWWbqsdV15eaGHuxH8MhzKqIivz
|
|
||||||
jxcCAwEAAaOCA1YwggNSMA4GA1UdDwEB/wQEAwIFoDCBkwYIKwYBBQUHAQEEgYYw
|
|
||||||
gYMwRgYIKwYBBQUHMAKGOmh0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5jb20vY2Fj
|
|
||||||
ZXJ0L2FscGhhc3NsY2FzaGEyNTZnNC5jcnQwOQYIKwYBBQUHMAGGLWh0dHA6Ly9v
|
|
||||||
Y3NwLmdsb2JhbHNpZ24uY29tL2FscGhhc3NsY2FzaGEyNTZnNDBXBgNVHSAEUDBO
|
|
||||||
MAgGBmeBDAECATBCBgorBgEEAaAyCgEDMDQwMgYIKwYBBQUHAgEWJmh0dHBzOi8v
|
|
||||||
d3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMAkGA1UdEwQCMAAwQQYDVR0f
|
|
||||||
BDowODA2oDSgMoYwaHR0cDovL2NybC5nbG9iYWxzaWduLmNvbS9hbHBoYXNzbGNh
|
|
||||||
c2hhMjU2ZzQuY3JsMCMGA1UdEQQcMBqCDCouZG90LWRvdC5ydYIKZG90LWRvdC5y
|
|
||||||
dTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHwYDVR0jBBgwFoAUT8us
|
|
||||||
qMLvq92Db2u/zpg9XFgldhUwHQYDVR0OBBYEFIt9yZp7jkyW2E7F5+NDJJmTMtN/
|
|
||||||
MIIBfQYKKwYBBAHWeQIEAgSCAW0EggFpAWcAdgDuzdBk1dsazsVct520zROiModG
|
|
||||||
fLzs3sNRSFlGcR+1mwAAAYm2m1GuAAAEAwBHMEUCIQDVSAsUx+m51oyOz+83SGL2
|
|
||||||
JpUGiUKiXgInZsWbG25VygIgLF23BEmAoRV+PFPclVuHrztd4lQecA+32tvUZ3xf
|
|
||||||
OWQAdQBIsONr2qZHNA/lagL6nTDrHFIBy1bdLIHZu7+rOdiEcwAAAYm2m07AAAAE
|
|
||||||
AwBGMEQCIE14pWcPqQC25z/q0FR5PaU+xIilbLwXvYm1UvJSajPDAiBEYH/fq9iP
|
|
||||||
pnK9z+7aLua2mh6uF2RMHRtcE/nbsr2tcQB2ANq2v2s/tbYin5vCu1xr6HCRcWy7
|
|
||||||
UYSFNL2kPTBI1/urAAABibabTscAAAQDAEcwRQIgQlo7NdtTa6cyiAKdsfozkLMQ
|
|
||||||
wt+D4WZCcdzk9GYul74CIQCa7MvbM4pP0jSLN6MYWPEAt0hXiDzHKihtVt0ChW0R
|
|
||||||
qDANBgkqhkiG9w0BAQsFAAOCAQEAB338wY8/u9tawPiCdr6dD10SO9+mQNCv83xI
|
|
||||||
Qa7IQ/33VQUMQ6qCMYTLZqu7c/e1x587UG7TLf0I3awEfBbLeMkTJKEooCK9VG3O
|
|
||||||
nfWD/lTwvr13lEpKuEEx643eqirxJEv3bQTHpQBn1Pkm9Svw/LJWi/bUKg0VNjYs
|
|
||||||
jQrZYH0q3jzx3dV3S5hUCjGL6d0tflD5w5YHWWMaEuVsn7yYovAROKnYOWuVisPJ
|
|
||||||
YRA6cADR39usU1CyLTSb50PHUOosnp+YqZCzVkU2Z/gPLyXjiRKU6wou8baSoDHu
|
|
||||||
KoxoGK4YfjizRTAdEexD+LHh0s1Ev6gr9OetJWPjbhghNGPIbw==
|
|
||||||
-----END CERTIFICATE-----
|
|
||||||
-----BEGIN CERTIFICATE-----
|
|
||||||
MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
|
|
||||||
A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
|
|
||||||
b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
|
|
||||||
MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
|
|
||||||
YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
|
|
||||||
aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
|
|
||||||
jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
|
|
||||||
xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
|
|
||||||
1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
|
|
||||||
snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
|
|
||||||
U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
|
|
||||||
9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
|
|
||||||
BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
|
|
||||||
AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
|
|
||||||
yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
|
|
||||||
38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
|
|
||||||
AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
|
|
||||||
DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
|
|
||||||
HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
|
|
||||||
-----END CERTIFICATE-----
|
|
||||||
-----BEGIN CERTIFICATE-----
|
|
||||||
MIIEijCCA3KgAwIBAgIQfU1CqStDHX5kU+fBmo1YdzANBgkqhkiG9w0BAQsFADBX
|
|
||||||
MQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTEQMA4GA1UE
|
|
||||||
CxMHUm9vdCBDQTEbMBkGA1UEAxMSR2xvYmFsU2lnbiBSb290IENBMB4XDTIyMTAx
|
|
||||||
MjAzNDk0M1oXDTI3MTAxMjAwMDAwMFowTDELMAkGA1UEBhMCQkUxGTAXBgNVBAoT
|
|
||||||
EEdsb2JhbFNpZ24gbnYtc2ExIjAgBgNVBAMTGUFscGhhU1NMIENBIC0gU0hBMjU2
|
|
||||||
IC0gRzQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtJCmVZhWIPzOH
|
|
||||||
A3jP1QwkuDFT8/+DImyZlSt85UpZwq7G0Sqd+n8gLlHIZypQkad5VkT7OLU+MI78
|
|
||||||
lC7LVwxpU19ExlaWL67ANyWG8XHx3AJFQoZhuDbvUeNzRQyQs6XS5wN6uDlF0Bf1
|
|
||||||
AtCUQWrGGLGYwyC1xTrzgrFKpESsIXMqklUGTsh8i7DKZhRUVfgrPLJUkbbLUrLY
|
|
||||||
42+KRCiwfSvBloC5PgDYnj3oMZ1aTe3Wfk3l1I4D3RKaJ4PU1qHXhHJOge2bjGIG
|
|
||||||
l6MsaBN+BB2sr6EnxX0xnMIbew2oIfOFoLqs47vh/GH4JN0qql2WBHfDPVDm3b+G
|
|
||||||
QxY6N/LXAgMBAAGjggFbMIIBVzAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYI
|
|
||||||
KwYBBQUHAwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYE
|
|
||||||
FE/LrKjC76vdg29rv86YPVxYJXYVMB8GA1UdIwQYMBaAFGB7ZhpFDZfKiVAvfQTN
|
|
||||||
NKj//P1LMHoGCCsGAQUFBwEBBG4wbDAtBggrBgEFBQcwAYYhaHR0cDovL29jc3Au
|
|
||||||
Z2xvYmFsc2lnbi5jb20vcm9vdHIxMDsGCCsGAQUFBzAChi9odHRwOi8vc2VjdXJl
|
|
||||||
Lmdsb2JhbHNpZ24uY29tL2NhY2VydC9yb290LXIxLmNydDAzBgNVHR8ELDAqMCig
|
|
||||||
JqAkhiJodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL3Jvb3QuY3JsMCEGA1UdIAQa
|
|
||||||
MBgwCAYGZ4EMAQIBMAwGCisGAQQBoDIKAQMwDQYJKoZIhvcNAQELBQADggEBABol
|
|
||||||
9nNkiECpWQenQ7oVP1FhvRX/LWTdzXpdMmp/SELnEJhoOe+366E0dt8tWGg+ezAc
|
|
||||||
DPeGYPmp83nAVLeDpji7Nqu8ldB8+G/B6U9GB8i2DDIAqSsFEvcMbWb5gZ2/DmRN
|
|
||||||
cifGi9FKAuFu2wyft4s4DHwzL2CJ2zjMlUOM3RaE1cxuOs+Om6MCD9G7vnkAtSiC
|
|
||||||
/OOfHO902f4yI2a48K+gKaAf3lISFXjd32pwQ21LpM3ueIGydaJ+1/z8nv+C7SUT
|
|
||||||
5bHoz7cYU27LUvh1n2WSNnC6/QwFSoP6gNKa4POO/oO13xjhrLRHJ/04cKMbRALt
|
|
||||||
JWQkPacJ8SJVhB2R7BI=
|
|
||||||
-----END CERTIFICATE-----
|
|
||||||
|
|
@ -1,51 +0,0 @@
|
||||||
-----BEGIN RSA PRIVATE KEY-----
|
|
||||||
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
|
|
||||||
-----END RSA PRIVATE KEY-----
|
|
||||||
|
|
@ -1,107 +0,0 @@
|
||||||
-----BEGIN CERTIFICATE-----
|
|
||||||
MIIHVjCCBj6gAwIBAgIMUR4H/7XMBL9Q9JAXMA0GCSqGSIb3DQEBCwUAMFUxCzAJ
|
|
||||||
BgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMSswKQYDVQQDEyJH
|
|
||||||
bG9iYWxTaWduIEdDQyBSNiBBbHBoYVNTTCBDQSAyMDIzMB4XDTI0MDgxNDA0MjQz
|
|
||||||
MVoXDTI1MDkxNTA0MjQzMFowFzEVMBMGA1UEAwwMKi5kb3QtZG90LnJ1MIICIjAN
|
|
||||||
BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA8eI42aZ18C3CHE8CEcUhMwCbfPle
|
|
||||||
RZg0Egj+gqyiGa/RXjpWm0Zq9MKhOPnal0h2VlFxFNAeyRcy/x7QZloUIDegZYUZ
|
|
||||||
UW4lMYiEwF9jSXINlfuzgKQhMPB9wnJhNt+O1gdO3u0FVy1ChBv6eat480gvi0wq
|
|
||||||
EEE6YC09OjFRbErlF1jAFL1QIPOw0xqZrafRp+qfK3DJc8IZsuzhVFIV+CyBA897
|
|
||||||
zrUwbF7aYTGwKotk6w11L1TZwK1iiUSkvAGOu1V6LMod3WlHE8YICp3lPuEsj9Zr
|
|
||||||
nJl0x+3/4XSS7ogcInUdFopf9odLD6umGk1xDIA7uCm9hlyA/YQBmyYinngXyfy1
|
|
||||||
6WTDLdIsCNzZpiRvbPxbxvAp7Exmqs5xWmb4qSYSThdZgp/ucJUiN3MWbYcc9fP2
|
|
||||||
/wifmes9OlfoAV/QlrpehpaP86VavkS0rBrUGf0OSdC0w79ZAllZeamU9zLHWwIi
|
|
||||||
LfpzmlqCC9EXrK0GWTl/K2CLgYifoIi8m3053kKKVIXLfuYSlotv9y3hRKxkW0b6
|
|
||||||
dtLhP3LjN+lvR7BNKTCNhafyIuHLcXHnj6yKkSYoH/wd/rkQCjlQx8dG419ouW9t
|
|
||||||
oiSch6x4O/aLyFY3aO4/GnoECLUyUtsrPowF87QE6iiaxI6EokW9HF9hN85OxQ+u
|
|
||||||
wd7w3gTvSLWR3DcCAwEAAaOCA2IwggNeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMB
|
|
||||||
Af8EAjAAMIGZBggrBgEFBQcBAQSBjDCBiTBJBggrBgEFBQcwAoY9aHR0cDovL3Nl
|
|
||||||
Y3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3NnY2NyNmFscGhhc3NsY2EyMDIz
|
|
||||||
LmNydDA8BggrBgEFBQcwAYYwaHR0cDovL29jc3AuZ2xvYmFsc2lnbi5jb20vZ3Nn
|
|
||||||
Y2NyNmFscGhhc3NsY2EyMDIzMFcGA1UdIARQME4wCAYGZ4EMAQIBMEIGCisGAQQB
|
|
||||||
oDIKAQMwNDAyBggrBgEFBQcCARYmaHR0cHM6Ly93d3cuZ2xvYmFsc2lnbi5jb20v
|
|
||||||
cmVwb3NpdG9yeS8wRAYDVR0fBD0wOzA5oDegNYYzaHR0cDovL2NybC5nbG9iYWxz
|
|
||||||
aWduLmNvbS9nc2djY3I2YWxwaGFzc2xjYTIwMjMuY3JsMCMGA1UdEQQcMBqCDCou
|
|
||||||
ZG90LWRvdC5ydYIKZG90LWRvdC5ydTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
|
|
||||||
BQUHAwIwHwYDVR0jBBgwFoAUvQW384qTPHPLefoPhRKhd5YYkXQwHQYDVR0OBBYE
|
|
||||||
FEFaB0lwsh68jY4d3zGJ8RSUenjoMIIBfQYKKwYBBAHWeQIEAgSCAW0EggFpAWcA
|
|
||||||
dQCvGBoo1oyj4KmKTJxnqwn4u7wiuq68sTijoZ3T+bYDDQAAAZFPIWD2AAAEAwBG
|
|
||||||
MEQCIBr9tqm+1D7C4ecXmA7ne6gHVeLgGOFf3jjnYdz80JWhAiASjtZlH8rYzLwF
|
|
||||||
3AX/Cfo+7KfRG+mbk2FY9OKJuu7bWgB1ABLxTjS9U3JMhAYZw48/ehP457Vih4ic
|
|
||||||
bTAFhOvlhiY6AAABkU8hYO0AAAQDAEYwRAIgSFiFncqd8KmZrv8brFZAaKzbCjR1
|
|
||||||
GU5ygJCv2K9xWnsCIFuwzf8leBa2eSKvSY7MCUgxXgRFl7rYjPjc6Foap0hyAHcA
|
|
||||||
DeHyMCvTDcFAYhIJ6lUu/Ed0fLHX6TDvDkIetH5OqjQAAAGRTyFhEgAABAMASDBG
|
|
||||||
AiEAxlxp+G3ArhozCos4yDTtLSB4sZ8496/R0WAlUqRLeRYCIQDKszlCeQNZB83Y
|
|
||||||
XGVCkPV+unVCmfKuuUJei1Md9GHjhjANBgkqhkiG9w0BAQsFAAOCAQEAg/1URGZb
|
|
||||||
xq8lMzrDb95Exkqm45FHLVbifPBSqiyCVtqa9VWDkyAQqCHhaCCB0N1YmCZGbXZy
|
|
||||||
HefWc8f/v4Kxam/8IpUXAH7U7sWZhX6p1yRn6Z5+FnWoyr1I6t/tDv1yBvB2EsKe
|
|
||||||
jJPLLPq41Aw6QP5EZ8Eks1VREW5aq2a+8WDJKnL3CCCtlIBh6cntADzZBBE2Zb2E
|
|
||||||
0/lM83sGLj9vAFw/PIkE/OCVobtpcj56O1UYZs/RDbLNhPUmhUhpSHSaiWU7VXeR
|
|
||||||
PoLgStsJrBZTSg1bdj8HK32lTzKcYspWwvjzbPclllxGzqKLTIdtCA9SbIl+363n
|
|
||||||
YMEkGJPyfIu4uQ==
|
|
||||||
-----END CERTIFICATE-----
|
|
||||||
-----BEGIN CERTIFICATE-----
|
|
||||||
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
|
|
||||||
-----END CERTIFICATE-----
|
|
||||||
|
|
||||||
-----BEGIN CERTIFICATE-----
|
|
||||||
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
|
|
||||||
5hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
|
|
||||||
-----END CERTIFICATE-----
|
|
||||||
|
|
@ -1,51 +0,0 @@
|
||||||
-----BEGIN RSA PRIVATE KEY-----
|
|
||||||
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
|
|
||||||
-----END RSA PRIVATE KEY-----
|
|
||||||
|
|
@ -1,23 +1,10 @@
|
||||||
server {
|
server {
|
||||||
listen 80;
|
server_name testa.dot-dot.ru;
|
||||||
server_name testblms.dot-dot.ru;
|
|
||||||
return 301 https://$server_name$request_uri;
|
|
||||||
}
|
|
||||||
|
|
||||||
server {
|
|
||||||
listen 443 ssl;
|
|
||||||
server_name testblms.dot-dot.ru;
|
|
||||||
|
|
||||||
ssl_certificate /etc/nginx/ssl/dot2023.crt;
|
|
||||||
ssl_certificate_key /etc/nginx/ssl/dot2023.key;
|
|
||||||
|
|
||||||
root /application/public;
|
root /application/public;
|
||||||
|
|
||||||
client_max_body_size 30m;
|
|
||||||
|
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
proxy_pass http://lms:3000;
|
proxy_pass http://nuxt:3000;
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
proxy_set_header Connection 'upgrade';
|
proxy_set_header Connection 'upgrade';
|
||||||
|
|
@ -29,26 +16,26 @@ server {
|
||||||
}
|
}
|
||||||
|
|
||||||
location /socket.io/auctionreload {
|
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_http_version 1.1;
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
proxy_set_header Connection $connection_upgrade;
|
proxy_set_header Connection "Upgrade";
|
||||||
proxy_set_header Host $host;
|
proxy_pass http://php:${PHP_SOCKET_PORT}/;
|
||||||
proxy_pass http://php:8080/;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
location @rewriteapp {
|
location @rewriteapp {
|
||||||
rewrite ^(.*)$ /index.php/$1 last;
|
rewrite ^(.*)$ /index.php/$1 last;
|
||||||
}
|
}
|
||||||
|
|
||||||
# location /storybook {
|
location /storybook {
|
||||||
# alias /application/nuxt/storybook-static;
|
alias /application/nuxt/storybook-static;
|
||||||
# }
|
}
|
||||||
|
|
||||||
location /logout {
|
location /logout {
|
||||||
try_files $uri @rewriteapp;
|
try_files $uri @rewriteapp;
|
||||||
|
}
|
||||||
|
|
||||||
|
location /help {
|
||||||
|
alias /application/help-platform/src/.vuepress/dist;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /api {
|
location /api {
|
||||||
|
|
@ -79,39 +66,27 @@ server {
|
||||||
try_files $uri @rewriteapp;
|
try_files $uri @rewriteapp;
|
||||||
}
|
}
|
||||||
|
|
||||||
location ~* \/admin\/.*(js|jpg|png|css|woff|woff2)$ {
|
|
||||||
proxy_pass http://static;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /media {
|
location /media {
|
||||||
try_files $uri @rewriteapp;
|
try_files $uri @rewriteapp;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /img {
|
location /img {
|
||||||
proxy_pass http://static;
|
alias /application/public/img;
|
||||||
# alias /application/public/img;
|
}
|
||||||
# try_files $uri /index.php$request_uri;
|
|
||||||
# expires 6M;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /robots.txt {
|
|
||||||
proxy_pass http://static;
|
|
||||||
}
|
|
||||||
|
|
||||||
location ~ ^/index\.php(/|$) {
|
location ~ ^/index\.php(/|$) {
|
||||||
if ($request_method = 'OPTIONS') {
|
if ($request_method = 'OPTIONS') {
|
||||||
add_header 'Access-Control-Allow-Origin' $http_origin;
|
add_header 'Access-Control-Allow-Origin' $http_origin;
|
||||||
add_header 'Access-Control-Allow-Credentials' 'true';
|
add_header 'Access-Control-Allow-Credentials' 'true';
|
||||||
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE';
|
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-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 'Access-Control-Max-Age' 1728000;
|
||||||
add_header 'Content-Type' 'text/plain charset=UTF-8';
|
add_header 'Content-Type' 'text/plain charset=UTF-8';
|
||||||
add_header 'Content-Length' 0;
|
add_header 'Content-Length' 0;
|
||||||
return 204;
|
return 204;
|
||||||
}
|
}
|
||||||
|
|
||||||
#add_header 'Access-Control-Allow-Origin' $http_origin;
|
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-Credentials' 'true';
|
||||||
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS, DELETE';
|
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-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,X-Expeditor-Domain,Authorization';
|
||||||
|
|
@ -121,4 +96,7 @@ server {
|
||||||
include fastcgi_params;
|
include fastcgi_params;
|
||||||
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
error_log /var/log/nginx/dot_dot_error.log;
|
||||||
|
access_log /var/log/nginx/dot_dot_access.log;
|
||||||
|
}
|
||||||
|
|
@ -1,13 +1,12 @@
|
||||||
NUXT_HOST=0.0.0.0
|
NUXT_HOST=0.0.0.0
|
||||||
NUXT_PORT=3000
|
NUXT_PORT=3000
|
||||||
NUXT_ENV_DEVALUE_LOG_LEVEL=silent
|
NUXT_ENV_DEVALUE_LOG_LEVEL=silent
|
||||||
WS_PROTOCOL=wss
|
WS_PROTOCOL=ws
|
||||||
BASE_URL=testb.dot-dot.ru
|
BASE_URL=http://testa.dot-dot.ru
|
||||||
API_URL=https://testb.dot-dot.ru/
|
API_URL=http://testa.dot-dot.ru
|
||||||
DOMAIN=testb.dot-dot.ru
|
|
||||||
|
|
||||||
APP_HOST=testb.dot-dot.ru
|
APP_HOST=dot-dot.local
|
||||||
APP_SCHEME=https
|
APP_SCHEME=http
|
||||||
APP_ENVIRONMENT=production
|
APP_ENVIRONMENT=development
|
||||||
DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833
|
DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833
|
||||||
YANDEX_METRIKA_ID=50156956
|
YANDEX_METRIKA_ID=50156956
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
|
APP_ENV=dev
|
||||||
APP_SECRET=c35a0abba25a5396d74ec17fca238d9a
|
APP_SECRET=c35a0abba25a5396d74ec17fca238d9a
|
||||||
|
|
||||||
CONTAINER_NAME=php
|
|
||||||
|
|
||||||
LOCK_DSN=flock
|
LOCK_DSN=flock
|
||||||
PHP_SOCKET_PORT=8080
|
PHP_SOCKET_PORT=8080
|
||||||
|
|
||||||
|
|
@ -9,8 +8,8 @@ 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_STATISTIC=mysql://root:root@db:3306/dot_statistic?serverVersion=mariadb-10.3.25
|
||||||
|
|
||||||
DOCUMENT_ROOT=/application
|
DOCUMENT_ROOT=/application
|
||||||
APP_HOST=testb.dot-dot.ru
|
APP_HOST=dot-dot.local
|
||||||
APP_SCHEME=https
|
APP_SCHEME=http
|
||||||
|
|
||||||
MAILER_DSN=null://null
|
MAILER_DSN=null://null
|
||||||
|
|
||||||
|
|
@ -41,7 +40,7 @@ DADATA_API_SECRET=secret
|
||||||
|
|
||||||
UNISENDER_API_KEY=secret
|
UNISENDER_API_KEY=secret
|
||||||
|
|
||||||
VOICIA_API_KEY=7589ed2721e50e299eb3baf2e3100a6b
|
VOICIA_API_KEY=secret
|
||||||
VOICIA_API_URL=https://app.voicia.ru
|
VOICIA_API_URL=https://app.voicia.ru
|
||||||
|
|
||||||
UAT_1C_API_URL=http://1c.nwtlk.ru/UATtest/hs
|
UAT_1C_API_URL=http://1c.nwtlk.ru/UATtest/hs
|
||||||
|
|
@ -55,10 +54,8 @@ 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.dot-dot.ru/v1/calculate
|
||||||
|
|
||||||
ML_REGULAR_DIRECTION_URL=https://calc.dev.dot-dot.ru/v2/schedule/transport
|
ML_REGULAR_DIRECTION_URL=https://calc.dev.dot-dot.ru/v1/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_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_UNCERTAIN_DIRECTIONS_URL=https://calc.dev.dot-dot.ru/v1/classification/direction/uncertain
|
||||||
|
|
||||||
YANDEX_MAPS_ACCESS_KEY=secret
|
YANDEX_MAPS_ACCESS_KEY=secret
|
||||||
|
|
@ -133,12 +130,3 @@ SOVKOM_API_URL=secret
|
||||||
MAGIC_API_URL=https://magic-trans.ru/
|
MAGIC_API_URL=https://magic-trans.ru/
|
||||||
|
|
||||||
MAGIC_API_URL=https://magic-trans.ru/
|
MAGIC_API_URL=https://magic-trans.ru/
|
||||||
|
|
||||||
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
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
CONTAINER_NAME=php
|
|
||||||
APP_ENV=prod
|
|
||||||
NotificationBuildServicejSP_KEY=16e93b225c730920ac5741a8d8df788f
|
NotificationBuildServicejSP_KEY=16e93b225c730920ac5741a8d8df788f
|
||||||
|
|
||||||
DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833
|
DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833
|
||||||
|
|
@ -16,9 +15,9 @@ FNS_ACCESS_TOKEN=a5639b93fe4e7c9a3f1dd85537e066d36439c352
|
||||||
|
|
||||||
GOOGLE_MAPS_ACCESS_KEY=AIzaSyBCPl2LcpRvplzLUNVMVLhA3b7k46lTCTg
|
GOOGLE_MAPS_ACCESS_KEY=AIzaSyBCPl2LcpRvplzLUNVMVLhA3b7k46lTCTg
|
||||||
|
|
||||||
NUXT_BASE_URL=testb.dot-dot.ru
|
NUXT_BASE_URL=testa.dot-dot.ru
|
||||||
|
|
||||||
ATISU_API_TOKEN=46b599c3ab7f4574b560f48ea005d9f3
|
ATISU_API_TOKEN=a9698671a68441c7b3959e43995d1506
|
||||||
|
|
||||||
###> google/apiclient ###
|
###> google/apiclient ###
|
||||||
ANALITIC_GOOGLE_CLIENT_ID=672035500859-n6cq8lb393rs5f7q46pnjrc6u9hjiomg.apps.googleusercontent.com
|
ANALITIC_GOOGLE_CLIENT_ID=672035500859-n6cq8lb393rs5f7q46pnjrc6u9hjiomg.apps.googleusercontent.com
|
||||||
|
|
@ -36,7 +35,7 @@ VOICIA_CALL_ID=1949
|
||||||
###< voicia ###
|
###< voicia ###
|
||||||
|
|
||||||
###> ml_calculator ###
|
###> ml_calculator ###
|
||||||
ML_CALCULATOR_URL=https://ml.dot-dot.ru/v2/classification/order/relevance
|
ML_CALCULATOR_URL=https://ml.dot-dot.ru/v1/classification/order/relevance
|
||||||
###< ml_calculator ###
|
###< ml_calculator ###
|
||||||
|
|
||||||
###> comagic ###
|
###> comagic ###
|
||||||
|
|
@ -45,15 +44,15 @@ COMAGIC_KEY=j769gveux0brdq7wb6insegwtczvz7nsqmuntkqv
|
||||||
###< comagic ###
|
###< comagic ###
|
||||||
|
|
||||||
###> carrier_scoring ###
|
###> carrier_scoring ###
|
||||||
ML_CARRIER_SCORING=https://ml.dot-dot.ru/v2/classification/carrier/scoring
|
ML_CARRIER_SCORING=https://ml.dot-dot.ru/v1/classification/carrier/scoring
|
||||||
###< carrier_scoring ###
|
###< carrier_scoring ###
|
||||||
|
|
||||||
###> direction_scoring ###
|
###> direction_scoring ###
|
||||||
ML_DIRECTION_SCORING_URL=https://ml.dot-dot.ru/v3/classification/direction/confidence
|
ML_DIRECTION_SCORING_URL=https://ml.dot-dot.ru/v1/classification/direction/confidence
|
||||||
###< direction_scoring ###
|
###< direction_scoring ###
|
||||||
|
|
||||||
###> direction_recalculate ###
|
###> direction_recalculate ###
|
||||||
ML_DIRECTION_RECALCULATE_URL=https://ml.dot-dot.ru/v2/schedule/calculate
|
ML_DIRECTION_RECALCULATE_URL=https://calc.dev.dot-dot.ru/v1/schedule/calculate
|
||||||
###< direction_recalculate ###
|
###< direction_recalculate ###
|
||||||
|
|
||||||
###< Vozovoz ###
|
###< Vozovoz ###
|
||||||
|
|
@ -112,56 +111,3 @@ PAPA_FINANCE_API_URL=DotDotAPI
|
||||||
SOVKOM_API_KEY=AAk6UcV88xCCC26654rM
|
SOVKOM_API_KEY=AAk6UcV88xCCC26654rM
|
||||||
SOVKOM_API_URL=https://testout.sovcomins.ru
|
SOVKOM_API_URL=https://testout.sovcomins.ru
|
||||||
###< SOVKOMTEST###
|
###< SOVKOMTEST###
|
||||||
|
|
||||||
ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://ml.dot-dot.ru/v2/schedule/carrier/scoring
|
|
||||||
|
|
||||||
ML_REGULAR_DIRECTION_URL=https://ml.dot-dot.ru/v2/schedule/transport
|
|
||||||
|
|
||||||
ACCOUNTING_AUDIT_URL="https://crm.dot-dot.ru/TTLBuhreport/hs/TT/reconciliationreport"
|
|
||||||
|
|
||||||
###> YandexTracker ###
|
|
||||||
YTRACKER_API_TOKEN="y0_AgAEA7qkKFmeAAjF8AAAAADXovQd6htdkt7LTDW_sNHCz7qV9zdVHaQ"
|
|
||||||
YTRACKER_ORGANISATION_ID=355207
|
|
||||||
###< YandexTracker ###
|
|
||||||
|
|
||||||
SMARTCAPTCHA_SERVER_KEY=ysc2_GLQZ8QPaFh0eXqZ5KaRMuRRZOX7qNNMy7P9Mq82V6c4e7b81
|
|
||||||
|
|
||||||
###> sentry/sentry-symfony ###
|
|
||||||
SENTRY_DSN="https://69bb249adbab80b23cf043b276a27fde@sentry.dot-dot.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_REGULAR_DIRECTION_HISTORY_ORDER_URL=https://ml.dot-dot.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
|
|
||||||
QUEUE_DSN_OC_CARRIER_OFFERS=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/OC_CARRIER_OFFERS
|
|
||||||
QUEUE_DSN_STATISTIC_EXPORT=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/STATISTIC_EXPORT
|
|
||||||
|
|
||||||
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"
|
|
||||||
CHROMIUM_BROWSER_SYS_PATH="/usr/bin/chromium-browser"
|
|
||||||
|
|
||||||
|
|
||||||
###> API_KONTUR_FOCUS###
|
|
||||||
USER_TRUST_API_KONTUR_FOCUS_END_POINT_URL=https://focus-api.kontur.ru
|
|
||||||
USER_TRUST_API_KONTUR_FOCUS_API_TOKEN=3208d29d15c507395db770d0e65f3711e40374df
|
|
||||||
USER_TRUST_CHECK_BACKEND=true
|
|
||||||
###< API_KONTUR_FOCUS###
|
|
||||||
|
|
||||||
QUEUE_DSN_USER_TRUST=amqp://guest:guest@rabbitmq:5672/%2f/USER_TRUST
|
|
||||||
|
|
||||||
|
|
||||||
CHROMIUM_BROWSER_SYS_PATH="/usr/bin/chromium-browser"
|
|
||||||
|
|
||||||
### DD-3326 check_carrier&drivers in OTK 2_Step ###
|
|
||||||
OTK_API_END_POINT_URL="https://test-api.otk.su"
|
|
||||||
OTK_API_TOKEN="Q5vBE9jusg38Rk7wHt2bzycT4K6pePFZ"
|
|
||||||
### DD-3326 check_carrier&drivers in OTK 2_Step ###
|
|
||||||
|
|
||||||
ACCOUNTING_AUDIT_LOGIN=ReportServis
|
|
||||||
ACCOUNTING_AUDIT_PASSWORD=fE7mubiv
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,127 @@
|
||||||
|
APP_ENV=dev
|
||||||
|
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
|
||||||
|
|
||||||
|
NUXT_BASE_URL=testa.dot-dot.ru
|
||||||
|
DOCUMENT_ROOT=/application
|
||||||
|
APP_HOST=dot-dot.local
|
||||||
|
APP_SCHEME=http
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
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=secret
|
||||||
|
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_URL=https://calc.dev.dot-dot.ru/v1/calculate
|
||||||
|
|
||||||
|
ML_REGULAR_DIRECTION_URL=https://calc.dev.dot-dot.ru/v1/schedule/transport
|
||||||
|
ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://calc.dev.dot-dot.ru/v1/schedule/carrier/scoring
|
||||||
|
|
||||||
|
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=cf6e8c5975f04047a4e39004e2ce07f3
|
||||||
|
|
||||||
|
###> 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/
|
||||||
|
|
@ -1,13 +1,10 @@
|
||||||
|
version: "3.3"
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
certbot_volume:
|
certbot_volume:
|
||||||
nginx_log_volume:
|
nginx_log_volume:
|
||||||
mysql_data_volume:
|
mysql_data_volume:
|
||||||
mysql_backup_volume:
|
mysql_backup_volume:
|
||||||
php_var_volume:
|
|
||||||
rabbitmq_volume:
|
|
||||||
redis_volume:
|
|
||||||
caddy_data:
|
|
||||||
caddy_config:
|
|
||||||
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
|
|
@ -23,10 +20,8 @@ services:
|
||||||
environment:
|
environment:
|
||||||
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
|
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
|
||||||
MYSQL_USER: ${MYSQL_USER}
|
MYSQL_USER: ${MYSQL_USER}
|
||||||
MYSQL_DATABASE: ${MYSQL_DATABASE}
|
MYSQL_DAABASE: ${MYSQL_DATABASE}
|
||||||
MYSQL_PASSWORD: ${MYSQL_PASSWORD}
|
MYSQL_PASSWORD: ${MYSQL_PASSWORD}
|
||||||
ports:
|
|
||||||
- ${MYSQL_PORT}:3306
|
|
||||||
volumes:
|
volumes:
|
||||||
- mysql_data_volume:/var/lib/mysql
|
- mysql_data_volume:/var/lib/mysql
|
||||||
- mysql_backup_volume:/backups
|
- mysql_backup_volume:/backups
|
||||||
|
|
@ -40,7 +35,6 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- ./configs/php/.env:/application/.env
|
- ./configs/php/.env:/application/.env
|
||||||
- ./configs/php/.env.local:/application/.env.local
|
- ./configs/php/.env.local:/application/.env.local
|
||||||
- php_var_volume:/application/var
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
networks:
|
networks:
|
||||||
|
|
@ -58,40 +52,9 @@ services:
|
||||||
command: npm run start
|
command: npm run start
|
||||||
volumes:
|
volumes:
|
||||||
- ./configs/nuxt/.env:/app/.env
|
- ./configs/nuxt/.env:/app/.env
|
||||||
env_file:
|
|
||||||
- ./configs/nuxt/.env
|
|
||||||
networks:
|
networks:
|
||||||
- dd
|
- dd
|
||||||
|
|
||||||
lms:
|
|
||||||
image: registry.dot-dot.ru/lms:${LMS_TAG}
|
|
||||||
restart: unless-stopped
|
|
||||||
command: npm run start
|
|
||||||
volumes:
|
|
||||||
- ./configs/lms/.env:/app/.env
|
|
||||||
env_file:
|
|
||||||
- ./configs/lms/.env
|
|
||||||
networks:
|
|
||||||
- dd
|
|
||||||
|
|
||||||
dashboard:
|
|
||||||
image: registry.dot-dot.ru/dashboard:${DASHBORD_TAG}
|
|
||||||
# command: sh -c "php-fpm -D && nginx -g 'daemon off;'"
|
|
||||||
command: frankenphp php-server -r /application/public
|
|
||||||
restart: unless-stopped
|
|
||||||
environment:
|
|
||||||
- SERVER_NAME=testbdashboard.dot-dot.ru
|
|
||||||
volumes:
|
|
||||||
- ./configs/dashboard/.env:/application/.env
|
|
||||||
- ./configs/dashboard/config:/config
|
|
||||||
depends_on:
|
|
||||||
- db
|
|
||||||
networks:
|
|
||||||
dd:
|
|
||||||
ingress:
|
|
||||||
aliases:
|
|
||||||
- ${NETWORK}-dashboard
|
|
||||||
|
|
||||||
nginx:
|
nginx:
|
||||||
image: nginx:1.25.3-alpine3.18
|
image: nginx:1.25.3-alpine3.18
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
@ -103,46 +66,14 @@ services:
|
||||||
- ./configs/nginx/other:/etc/nginx/other
|
- ./configs/nginx/other:/etc/nginx/other
|
||||||
- certbot_volume:/etc/letsencrypt
|
- certbot_volume:/etc/letsencrypt
|
||||||
- nginx_log_volume:/var/log/nginx
|
- nginx_log_volume:/var/log/nginx
|
||||||
|
labels:
|
||||||
|
- "traefik.enable=true"
|
||||||
|
- "traefik.http.routers.nginx.rule=Host(`testa.dot-dot.ru`)"
|
||||||
|
- "traefik.http.services.nginx.loadbalancer.server.port=80"
|
||||||
depends_on:
|
depends_on:
|
||||||
- nuxt
|
- nuxt
|
||||||
- php
|
- php
|
||||||
- static
|
- static
|
||||||
networks:
|
networks:
|
||||||
dd:
|
- dd
|
||||||
ingress:
|
- ingress
|
||||||
aliases:
|
|
||||||
- ${NETWORK}-nginx
|
|
||||||
|
|
||||||
rabbitmq:
|
|
||||||
image: rabbitmq:3.12.1-management-alpine
|
|
||||||
restart: unless-stopped
|
|
||||||
hostname: ${COMPOSE_PROJECT_NAME}
|
|
||||||
volumes:
|
|
||||||
- rabbitmq_volume:/var/lib/rabbitmq
|
|
||||||
- ./configs/rabbitmq/enabled_plugins:/etc/rabbitmq/enabled_plugins
|
|
||||||
environment:
|
|
||||||
- RABBITMQ_DEFAULT_USER=${RABBITMQ_USERNAME}
|
|
||||||
- RABBITMQ_DEFAULT_PASS=${RABBITMQ_PASSWORD}
|
|
||||||
- RABBITMQ_CONFIG_FILE=/etc/rabbitmq/rabbitmq.conf
|
|
||||||
networks:
|
|
||||||
dd: {}
|
|
||||||
|
|
||||||
redis:
|
|
||||||
image: redis:7.2.4-alpine3.19
|
|
||||||
restart: unless-stopped
|
|
||||||
volumes:
|
|
||||||
- redis_volume:/data
|
|
||||||
- ./configs/redis:/usr/local/etc/redis
|
|
||||||
environment:
|
|
||||||
- REDIS_PASSWORD=${REDIS_PASSWORD}
|
|
||||||
- REDIS_PORT=6379
|
|
||||||
networks:
|
|
||||||
dd: {}
|
|
||||||
|
|
||||||
redis-exporter:
|
|
||||||
image: oliver006/redis_exporter:v1.59.0
|
|
||||||
command:
|
|
||||||
- "--redis.addr=redis://redis:6379"
|
|
||||||
- "--redis.password=${REDIS_PASSWORD}"
|
|
||||||
networks:
|
|
||||||
dd: {}
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue