update

.env

@@ -1,14 +1,16 @@
-COMPOSE_PROJECT_NAME=prod
+COMPOSE_PROJECT_NAME=c2d
-NETWORK=prod
+NETWORK=c2d
 
-FRONT_TAG=master
+FRONT_TAG=134
-DOTDOT_TAG=master
+DOTDOT_TAG=134
-LMS_TAG=master
+LMS_TAG=134
 HELP_TAG=master
+ADMIN_TAG=master
 
+PHP_SOCKER_HOST=ws
 PHP_SOCKET_PORT=8080
 
-MYSQL_PORT=0.0.0.0:3306
+MYSQL_PORT=0.0.0.0:33062
 MYSQL_ROOT_PASSWORD=ahwaireiNeebeeW9keiZ
 MYSQL_DATABASE=dot
 MYSQL_USER=dot

app.sh

@@ -87,6 +87,7 @@ init() {
 up() {
   checkDockerCompose
   docker compose up -d
+  docker compose exec nginx nginx -t && docker compose exec nginx nginx -s reload 
 }
 
 down() {
@@ -125,6 +126,11 @@ purgeDb() {
     log "created database dot" "info"
 }
 
+chown() {
+  docker compose exec php bash -c 'mkdir -p /application/var/cache/prod/profiler'
+  docker compose exec php bash -c 'chown -R www-data:www-data /application/var/cache/prod/*'
+}
+
 composer() {
   docker compose exec php php -d memory_limit=-1 /usr/local/bin/composer ${@:1}
 }
@@ -149,7 +155,7 @@ case "$1" in
 	"tests")
 		composer tests;;
   "console"*)
-    docker compose exec php ./bin/console ${@:2};;
+    docker compose exec --user www-data php ./bin/console ${@:2};;
   "db")
     docker compose exec db mysql -uroot -p${MYSQL_ROOT_PASSWORD};;
   "db-create")
@@ -166,6 +172,8 @@ case "$1" in
       purgeDb;;
   "restore-db")
 	  restoredb;;
+  "chown")
+    chown;;
   "front"*)
     case $2 in
       *)

configs/admin/.env

@@ -0,0 +1,80 @@
+APP_NAME="DOT-DOT admin"
+APP_ENV=production
+APP_KEY=base64:tt8hr1y+cfNtEPQfWtFi9OXEDgko6Qw6uxeNK7ka3YU=
+APP_DEBUG=true
+APP_TIMEZONE=UTC
+APP_URL=https://c2dadmin.dot-dot.ru
+FRONTEND_URL=https://c2dadmin.dot-dot.ru
+ASSET_URL=https://c2dadmin.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=ahwaireiNeebeeW9keiZ
+
+#Параметры подключения к базе 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=ahwaireiNeebeeW9keiZ
+
+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}"
+
+DOT_DOT_HOST=https://.dot-dot.ru

configs/admin/default

@@ -0,0 +1,24 @@
+server {
+    server_name admin.dot-dot.ru;
+    listen 443 ssl;
+
+    ssl_certificate /etc/nginx/ssl/dot2024.crt;
+    ssl_certificate_key /etc/nginx/ssl/dot2024.key;
+
+
+    index index.php index.html index.htm;
+    root /application/public;
+
+
+    location / {
+        try_files $uri $uri/ /index.php?$args;
+    }
+
+    location ~ \.php$ {
+        include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
+        fastcgi_pass localhost:9000;
+        try_files $uri =404;
+        fastcgi_index index.php;
+    }
+}

configs/lms/.env

@@ -2,12 +2,12 @@ NUXT_HOST=0.0.0.0
 NUXT_PORT=3000
 NUXT_ENV_DEVALUE_LOG_LEVEL=silent
 WS_PROTOCOL=wss
-BASE_URL=https://lms.dot-dot.ru/
+BASE_URL=https://c2d.dot-dot.ru/
-API_URL=https://lms.dot-dot.ru/
+API_URL=https://c2d.dot-dot.ru/
-DOMAIN=lms.dot-dot.ru
+DOMAIN=c2d.dot-dot.ru
 
-APP_HOST=lms.dot-dot.ru
+APP_HOST=c2d.dot-dot.ru
 APP_SCHEME=https
-APP_ENVIRONMENT=development
+APP_ENVIRONMENT=production
 DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833
 YANDEX_METRIKA_ID=50156956

configs/lms/entrypoint.sh

@@ -0,0 +1,10 @@
+#!/bin/sh -x
+
+DOMAIN="${DOMAIN:-lms.dot-dot.ru}"
+
+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
+
+"$@"

configs/nginx/conf.d/admin.conf

@@ -1,18 +1,23 @@
 server {
     listen 80;
-    server_name wiki.dot-dot.ru;
+    server_name c2dadmin.dot-dot.ru;
     return 301 https://$server_name$request_uri;
 }
 
 server {
-    listen 443 ssl;
+    listen 443 ssl ;
-    server_name wiki.dot-dot.ru;
+    server_name c2dadmin.dot-dot.ru;
 
-    ssl_certificate /etc/nginx/ssl/dot2023.crt;
+    ssl_certificate /etc/nginx/ssl/dot2025.crt;
-    ssl_certificate_key /etc/nginx/ssl/dot2023.key;
+    ssl_certificate_key /etc/nginx/ssl/dot2025.key;
+
+    client_max_body_size 10m;
+
+    access_log /var/log/nginx/c2dadmin.dot-dot.ru_access.log json;
+    error_log /var/log/nginx/c2dadmin.dot-dot.ru_error.log;
 
     location / {
-        proxy_pass http://bookstack:80;
+        proxy_pass https://admin:443;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection 'upgrade';

configs/nginx/conf.d/c2d.dot-dot.ru.conf

@@ -1,18 +1,24 @@
 server {
     listen 80;
-    server_name lms.dot-dot.ru;
+    server_name c2d.dot-dot.ru;
     return 301 https://$server_name$request_uri;
 }
 
 server {
     listen 443 ssl;
-    server_name lms.dot-dot.ru;
+    server_name c2d.dot-dot.ru;
 
-    ssl_certificate /etc/nginx/ssl/dot2023.crt;
+    ssl_certificate /etc/nginx/ssl/dot2025.crt;
-    ssl_certificate_key /etc/nginx/ssl/dot2023.key;
+    ssl_certificate_key /etc/nginx/ssl/dot2025.key;
+
+    access_log /var/log/nginx/lms.wwater.ru_access.log json;
+    error_log /var/log/nginx/lms.wwater.ru_error.log;
 
     root /application/public;
 
+
+    client_max_body_size 30m;
+
     location / {
         proxy_pass http://lms:3000;
         proxy_http_version 1.1;
@@ -48,10 +54,6 @@ server {
         try_files $uri @rewriteapp;
     }
 
-    location /help {
-        proxy_pass http://help-platform;
-    }
-
     location /api {
         rewrite ^(.*)$ /index.php/$1 last;
     }
@@ -96,7 +98,7 @@ server {
     }
 
     location /robots.txt {
-        proxy_pass http://static;
+        root /etc/nginx/other/lms.dot-dot.ru;
     }
 
     location ~ ^/index\.php(/|$) {
@@ -112,12 +114,12 @@ server {
         }
 
         #add_header 'Access-Control-Allow-Origin' $http_origin;
-        add_header 'Access-Control-Allow-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';
 
-        fastcgi_pass php:9001;
+        fastcgi_pass backend:9001;
         fastcgi_split_path_info ^(.+\.php)(/.*)$;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

configs/nginx/conf.d/default.conf

@@ -1,190 +0,0 @@
-server {
-    listen 80;
-    server_name dot-dot.ru;
-    return 301 https://$server_name$request_uri;
-}
-
-server {
-    listen 443 ssl;
-    server_name dot-dot.ru;
-
-    ssl_certificate /etc/nginx/ssl/dot2023.crt;
-    ssl_certificate_key /etc/nginx/ssl/dot2023.key;
-
-    root /application/public;
-
-    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 {
-        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 /help {
-        proxy_pass http://help-platform;
-    }
-
-    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 php:9001;
-        fastcgi_split_path_info ^(.+\.php)(/.*)$;
-        include fastcgi_params;
-        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-    }
-
-    location /metrics {
-        access_log /var/log/nginx/node_exporter_access.log json;
-        error_log /var/log/nginx/node_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://node-exporter:9100/metrics;
-    }
-
-    location /cadvisor {
-        access_log /var/log/nginx/cadvisor_access.log json;
-        error_log /var/log/nginx/cadvisor_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://cadvisor:8080/metrics;
-    }
-
-    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;
-    }
-
-}

configs/nginx/conf.d/demolms.dot-dot.ru.conf

@@ -1,25 +0,0 @@
-server {
-    listen 80;
-    server_name demolms.dot-dot.ru;
-    return 301 https://$server_name$request_uri;
-}
-
-server {
-    listen 443 ssl;
-    server_name demolms.dot-dot.ru;
-
-    ssl_certificate /etc/nginx/ssl/dot2023.crt;
-    ssl_certificate_key /etc/nginx/ssl/dot2023.key;
-
-    location ~ /.* {
-        proxy_pass http://demolms-nginx;
-        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;
-    }
-}

configs/nginx/conf.d/rabbitmq.conf

@@ -1,48 +0,0 @@
-server {
-    listen 80;
-    server_name rabbitmq.dot-dot.ru;
-    return 301 https://$server_name$request_uri;
-}
-
-server {
-    listen 443 ssl;
-    server_name rabbitmq.dot-dot.ru;
-
-    access_log /var/log/nginx/rabbitmq.wwater.ru_access.log json;
-    error_log /var/log/nginx/rabbitmq.wwater.ru_error.log;
-
-    ssl_certificate /etc/nginx/ssl/dot2023.crt;
-    ssl_certificate_key /etc/nginx/ssl/dot2023.key;
-
-    proxy_buffer_size 128k;
-    proxy_buffers 4 128k;
-    client_body_buffer_size 32k;
-    client_header_buffer_size 256k;
-    large_client_header_buffers 4 256k;
-
-    location / {
-        client_max_body_size 600m;
-        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_pass http://rabbitmq:15672;
-        proxy_connect_timeout 600;
-        proxy_send_timeout 600;
-        proxy_read_timeout 600;
-        send_timeout 600;
-    }
-
-    location /metrics {
-        client_max_body_size 600m;
-        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_pass http://rabbitmq:15692/metrics;
-        proxy_connect_timeout 600;
-        proxy_send_timeout 600;
-        proxy_read_timeout 600;
-        send_timeout 600;
-    }
-}

configs/nginx/other/dot-dot.ru/robots.txt

@@ -0,0 +1,32 @@
+User-agent: *
+Disallow: /
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

configs/nginx/other/lms.dot-dot.ru/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

configs/nginx/ssl/dot2024.crt

@@ -0,0 +1,107 @@
+-----BEGIN CERTIFICATE-----
+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
+YMEkGJPyfIu4uQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFjDCCA3SgAwIBAgIQfx8skC6D0OO2+zvuR4tegDANBgkqhkiG9w0BAQsFADBM
+MSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSNjETMBEGA1UEChMKR2xv
+YmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjAeFw0yMzA3MTkwMzQzMjVaFw0y
+NjA3MTkwMDAwMDBaMFUxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWdu
+IG52LXNhMSswKQYDVQQDEyJHbG9iYWxTaWduIEdDQyBSNiBBbHBoYVNTTCBDQSAy
+MDIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA00Jvk5ADppO0rgDn
+j1M14XIb032Aas409JJFAb8cUjipFOth7ySLdaWLe3s63oSs5x3eWwzTpX4BFkzZ
+bxT1eoJSHfT2M0wZ5QOPcCIjsr+YB8TAvV2yJSyq+emRrN/FtgCSTaWXSJ5jipW8
+SJ/VAuXPMzuAP2yYpuPcjjQ5GyrssDXgu+FhtYxqyFP7BSvx9jQhh5QV5zhLycua
+n8n+J0Uw09WRQK6JGQ5HzDZQinkNel+fZZNRG1gE9Qeh+tHBplrkalB1g85qJkPO
+J7SoEvKsmDkajggk/sSq7NPyzFaa/VBGZiRRG+FkxCBniGD5618PQ4trcwHyMojS
+FObOHQIDAQABo4IBXzCCAVswDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsG
+AQUFBwMBBggrBgEFBQcDAjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBS9
+BbfzipM8c8t5+g+FEqF3lhiRdDAfBgNVHSMEGDAWgBSubAWjkxPioufi1xzWx/B/
+yGdToDB7BggrBgEFBQcBAQRvMG0wLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3NwMi5n
+bG9iYWxzaWduLmNvbS9yb290cjYwOwYIKwYBBQUHMAKGL2h0dHA6Ly9zZWN1cmUu
+Z2xvYmFsc2lnbi5jb20vY2FjZXJ0L3Jvb3QtcjYuY3J0MDYGA1UdHwQvMC0wK6Ap
+oCeGJWh0dHA6Ly9jcmwuZ2xvYmFsc2lnbi5jb20vcm9vdC1yNi5jcmwwIQYDVR0g
+BBowGDAIBgZngQwBAgEwDAYKKwYBBAGgMgoBAzANBgkqhkiG9w0BAQsFAAOCAgEA
+fMkkMo5g4mn1ft4d4xR2kHzYpDukhC1XYPwfSZN3A9nEBadjdKZMH7iuS1vF8uSc
+g26/30DRPen2fFRsr662ECyUCR4OfeiiGNdoQvcesM9Xpew3HLQP4qHg+s774hNL
+vGRD4aKSKwFqLMrcqCw6tEAfX99tFWsD4jzbC6k8tjSLzEl0fTUlfkJaWpvLVkpg
+9et8tD8d51bymCg5J6J6wcXpmsSGnksBobac1+nXmgB7jQC9edU8Z41FFo87BV3k
+CtrWWsdkQavObMsXUPl/AO8y/jOuAWz0wyvPnKom+o6W4vKDY6/6XPypNdebOJ6m
+jyaILp0quoQvhjx87BzENh5s57AIOyIGpS0sDEChVDPzLEfRsH2FJ8/W5woF0nvs
+BTqfYSCqblQbHeDDtCj7Mlf8JfqaMuqcbE4rMSyfeHyCdZQwnc/r9ujnth691AJh
+xyYeCM04metJIe7cB6d4dFm+Pd5ervY4x32r0uQ1Q0spy1VjNqUJjussYuXNyMmF
+HSuLQQ6PrePmH5lcSMQpYKzPoD/RiNVD/PK0O3vuO5vh3o7oKb1FfzoanDsFFTrw
+0aLOdRW/tmLPWVNVlAb8ad+B80YJsL4HXYnQG8wYAFb8LhwSDyT9v+C1C1lcIHE7
+nE0AAp9JSHxDYsma9pi4g0Phg3BgOm2euTRzw7R0SzU=
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIORea7A4Mzw4VlSOb/RVEwDQYJKoZIhvcNAQEMBQAwTDEg
+MB4GA1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2Jh
+bFNpZ24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMTQxMjEwMDAwMDAwWhcNMzQx
+MjEwMDAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSNjET
+MBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAJUH6HPKZvnsFMp7PPcNCPG0RQssgrRI
+xutbPK6DuEGSMxSkb3/pKszGsIhrxbaJ0cay/xTOURQh7ErdG1rG1ofuTToVBu1k
+ZguSgMpE3nOUTvOniX9PeGMIyBJQbUJmL025eShNUhqKGoC3GYEOfsSKvGRMIRxD
+aNc9PIrFsmbVkJq3MQbFvuJtMgamHvm566qjuL++gmNQ0PAYid/kD3n16qIfKtJw
+LnvnvJO7bVPiSHyMEAc4/2ayd2F+4OqMPKq0pPbzlUoSB239jLKJz9CgYXfIWHSw
+1CM69106yqLbnQneXUQtkPGBzVeS+n68UARjNN9rkxi+azayOeSsJDa38O+2HBNX
+k7besvjihbdzorg1qkXy4J02oW9UivFyVm4uiMVRQkQVlO6jxTiWm05OWgtH8wY2
+SXcwvHE35absIQh1/OZhFj931dmRl4QKbNQCTXTAFO39OfuD8l4UoQSwC+n+7o/h
+bguyCLNhZglqsQY6ZZZZwPA1/cnaKI0aEYdwgQqomnUdnjqGBQCe24DWJfncBZ4n
+WUx2OVvq+aWh2IMP0f/fMBH5hc8zSPXKbWQULHpYT9NLCEnFlWQaYw55PfWzjMpY
+rZxCRXluDocZXFSxZba/jJvcE+kNb7gu3GduyYsRtYQUigAZcIN5kZeR1Bonvzce
+MgfYFGM8KEyvAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBSubAWjkxPioufi1xzWx/B/yGdToDAfBgNVHSMEGDAWgBSu
+bAWjkxPioufi1xzWx/B/yGdToDANBgkqhkiG9w0BAQwFAAOCAgEAgyXt6NH9lVLN
+nsAEoJFp5lzQhN7craJP6Ed41mWYqVuoPId8AorRbrcWc+ZfwFSY1XS+wc3iEZGt
+Ixg93eFyRJa0lV7Ae46ZeBZDE1ZXs6KzO7V33EByrKPrmzU+sQghoefEQzd5Mr61
+55wsTLxDKZmOMNOsIeDjHfrYBzN2VAAiKrlNIC5waNrlU/yDXNOd8v9EDERm8tLj
+vUYAGm0CuiVdjaExUd1URhxN25mW7xocBFymFe944Hn+Xds+qkxV/ZoVqW/hpvvf
+cDDpw+5CRu3CkwWJ+n1jez/QcYF8AOiYrg54NMMl+68KnyBr3TsTjxKM4kEaSHpz
+oHdpx7Zcf4LIHv5YGygrqGytXm3ABdJ7t+uA/iU3/gKbaKxCXcPu9czc8FB10jZp
+nOZ7BN9uBmm23goJSFmH63sUYHpkqmlD75HHTOwY3WzvUy2MmeFe8nI+z1TIvWfs
+pA9MRf/TuTAjB0yPEL+GltmZWrSZVxykzLsViVO6LAUP5MSeGbEYNNVMnbrt9x+v
+JJUEeKgDu+6B5dpffItKoZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R
+8k8HWV+LLUNS60YMlOH1Zkd5d9VUWx+tJDfLRVpOoERIyNiwmcUVhAn21klJwGW4
+5hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
+-----END CERTIFICATE-----

configs/nginx/ssl/dot2024.key

@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

configs/nginx/ssl/dot2025.crt

@@ -0,0 +1,107 @@
+-----BEGIN CERTIFICATE-----
+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
+DIQhj8h1rzW2eyc=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIRAIN9TriekS/nLK07x2kt3CAwDQYJKoZIhvcNAQELBQAw
+TDEgMB4GA1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkds
+b2JhbFNpZ24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMjUwNTIxMDIzNjUyWhcN
+MjcwNTIxMDAwMDAwWjBVMQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2ln
+biBudi1zYTErMCkGA1UEAxMiR2xvYmFsU2lnbiBHQ0MgUjYgQWxwaGFTU0wgQ0Eg
+MjAyNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ/oiu0Bviq52UUE
+ADbFWmgu3rC7KDSMoorLN1Wd03McG3Z1aP71DlPCE33838r72Dfuj5M9LXfiQLJp
+Au6MwNExmKOzothw4x0zGf5oBYyrCMGm3fBpLPafwYQ3MchBOWMTbf83rKUPLH48
+KCJ0MnU8GUl8oA/J81wIvbbKPuNrFf6hvJDccjzc4NyxLz3A89zjV2g5whCg5O0u
+9YX4Zxk9JHuc/LvllOJO4waAYLjbWBJkz3rV3ts1SmSYnJqmyRTIjXwQgRvhEYqt
+DbRskt0W7M6cPwCze3GTBN2UHNpHkMs3YmVxku68I0aOQn5+uz//fDROP3z1Z/7I
+APteRtECAwEAAaOCAV8wggFbMA4GA1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggr
+BgEFBQcDAQYIKwYBBQUHAwIwEgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQU
+xbSTj28r3B5Iv7cQMIXO0bK7SC0wHwYDVR0jBBgwFoAUrmwFo5MT4qLn4tcc1sfw
+f8hnU6AwewYIKwYBBQUHAQEEbzBtMC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcDIu
+Z2xvYmFsc2lnbi5jb20vcm9vdHI2MDsGCCsGAQUFBzAChi9odHRwOi8vc2VjdXJl
+Lmdsb2JhbHNpZ24uY29tL2NhY2VydC9yb290LXI2LmNydDA2BgNVHR8ELzAtMCug
+KaAnhiVodHRwOi8vY3JsLmdsb2JhbHNpZ24uY29tL3Jvb3QtcjYuY3JsMCEGA1Ud
+IAQaMBgwCAYGZ4EMAQIBMAwGCisGAQQBoDIKAQMwDQYJKoZIhvcNAQELBQADggIB
+AB/uvBuZf4CiuSahwiXn4geF52roAH+6jxsEPTXTfb7bbeMDXsYgRRsOTNA70ruZ
+Tnz5DfFMuBhNoFhIFb0qR1izdy6VkdKOqFPNF2dOFI1EcnY9l2ory9mrzHqVbrL4
+vzUd17FLUVyjTVU7PAv4nxyhnO1GTeT83YlrdRF31NyR6bvZVTEERHmpbWSgeveJ
+LRtaMzlGWiLZ8IwkH7o6GH3jp/KPtDW4Npu8w64HrRZdN2pqQhi7+YKwfHM7H+2U
+dM1BGN0sjOWMVbMSB9MtCsleS2Mb7TRZEbOHxECJLLIluQypZr7Pol3+hAqrhyKI
+k+6y+Da0NeDuWxW59Ku4NvClqW1UFX1SpfNGhzVfp/CH+vPM1tySomx2jE0EnYZu
+GwVucXPBsp5nUWqUV9+143glVuS7GTg9hFPjNBInn17HbCoIIQIOzj5Vd9bK3A9U
+GxXNpwenDHEalCsD/4eQYDHPhFE7sNe0D/OXu+FAM02VZkARx37Jp4bDdujvgL9P
+vZPR3wThvDN1CTU8Bc3xea3yKFAraKcPZLkhReQUAm2VpR+HSJRPlUpYizlF9WkL
+h3KcAVCBJWvnOkVwxyU5QJMcnwW95JlOtx+9100GL99jHE5rs3gXp7F4bg8H01QT
+9jVOhBBmQ7nQoXuwI0tqal2QUqZz3eeu62CU7xBwtfYR
+-----END CERTIFICATE-----
+
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIORea7A4Mzw4VlSOb/RVEwDQYJKoZIhvcNAQEMBQAwTDEg
+MB4GA1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2Jh
+bFNpZ24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMTQxMjEwMDAwMDAwWhcNMzQx
+MjEwMDAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSNjET
+MBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAJUH6HPKZvnsFMp7PPcNCPG0RQssgrRI
+xutbPK6DuEGSMxSkb3/pKszGsIhrxbaJ0cay/xTOURQh7ErdG1rG1ofuTToVBu1k
+ZguSgMpE3nOUTvOniX9PeGMIyBJQbUJmL025eShNUhqKGoC3GYEOfsSKvGRMIRxD
+aNc9PIrFsmbVkJq3MQbFvuJtMgamHvm566qjuL++gmNQ0PAYid/kD3n16qIfKtJw
+LnvnvJO7bVPiSHyMEAc4/2ayd2F+4OqMPKq0pPbzlUoSB239jLKJz9CgYXfIWHSw
+1CM69106yqLbnQneXUQtkPGBzVeS+n68UARjNN9rkxi+azayOeSsJDa38O+2HBNX
+k7besvjihbdzorg1qkXy4J02oW9UivFyVm4uiMVRQkQVlO6jxTiWm05OWgtH8wY2
+SXcwvHE35absIQh1/OZhFj931dmRl4QKbNQCTXTAFO39OfuD8l4UoQSwC+n+7o/h
+bguyCLNhZglqsQY6ZZZZwPA1/cnaKI0aEYdwgQqomnUdnjqGBQCe24DWJfncBZ4n
+WUx2OVvq+aWh2IMP0f/fMBH5hc8zSPXKbWQULHpYT9NLCEnFlWQaYw55PfWzjMpY
+rZxCRXluDocZXFSxZba/jJvcE+kNb7gu3GduyYsRtYQUigAZcIN5kZeR1Bonvzce
+MgfYFGM8KEyvAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBSubAWjkxPioufi1xzWx/B/yGdToDAfBgNVHSMEGDAWgBSu
+bAWjkxPioufi1xzWx/B/yGdToDANBgkqhkiG9w0BAQwFAAOCAgEAgyXt6NH9lVLN
+nsAEoJFp5lzQhN7craJP6Ed41mWYqVuoPId8AorRbrcWc+ZfwFSY1XS+wc3iEZGt
+Ixg93eFyRJa0lV7Ae46ZeBZDE1ZXs6KzO7V33EByrKPrmzU+sQghoefEQzd5Mr61
+55wsTLxDKZmOMNOsIeDjHfrYBzN2VAAiKrlNIC5waNrlU/yDXNOd8v9EDERm8tLj
+vUYAGm0CuiVdjaExUd1URhxN25mW7xocBFymFe944Hn+Xds+qkxV/ZoVqW/hpvvf
+cDDpw+5CRu3CkwWJ+n1jez/QcYF8AOiYrg54NMMl+68KnyBr3TsTjxKM4kEaSHpz
+oHdpx7Zcf4LIHv5YGygrqGytXm3ABdJ7t+uA/iU3/gKbaKxCXcPu9czc8FB10jZp
+nOZ7BN9uBmm23goJSFmH63sUYHpkqmlD75HHTOwY3WzvUy2MmeFe8nI+z1TIvWfs
+pA9MRf/TuTAjB0yPEL+GltmZWrSZVxykzLsViVO6LAUP5MSeGbEYNNVMnbrt9x+v
+JJUEeKgDu+6B5dpffItKoZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R
+8k8HWV+LLUNS60YMlOH1Zkd5d9VUWx+tJDfLRVpOoERIyNiwmcUVhAn21klJwGW4
+5hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
+-----END CERTIFICATE-----

configs/nginx/ssl/dot2025.key

@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

configs/nuxt/.env

@@ -1,16 +0,0 @@
-NUXT_HOST=0.0.0.0
-NUXT_PORT=3000
-NUXT_ENV_DEVALUE_LOG_LEVEL=silent
-WS_PROTOCOL=wss
-BASE_URL=dot-dot.ru
-API_URL=https://dot-dot.ru/
-DOMAIN=dot-dot.ru
-
-APP_HOST=dot-dot.ru
-APP_SCHEME=https
-APP_ENVIRONMENT=production
-DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833
-YANDEX_METRIKA_ID=50156956
-PHONE_KEY=qwefghzcx
-
-SMARTCAPTCHA_CLIENT_KEY=ysc1_GLQZ8QPaFh0eXqZ5KaRM0WJYqoP9vL0uqhujfcw75c1487df

configs/php/.env

@@ -1,6 +1,8 @@
-APP_ENV=dev
+APP_ENV=prod
 APP_SECRET=c35a0abba25a5396d74ec17fca238d9a
 
+CONTAINER_NAME=php
+
 LOCK_DSN=flock
 PHP_SOCKET_PORT=8080
 
@@ -8,7 +10,7 @@ DATABASE_URL_DOT=mysql://root:ahwaireiNeebeeW9keiZ@db:3306/dot?serverVersion=mar
 DATABASE_URL_DOT_STATISTIC=mysql://root:ahwaireiNeebeeW9keiZ@db:3306/dot_statistic?serverVersion=mariadb-10.3.25
 
 DOCUMENT_ROOT=/application
-APP_HOST=dot-dot.ru
+APP_HOST=c2d.dot-dot.ru
 APP_SCHEME=https
 
 MAILER_DSN=null://null
@@ -21,7 +23,7 @@ SP_PASSWORD=xmlweb
 SP_KEY=secret
 SP_TEST=true
 
-SP_V3_URL=https://spasskievorota.ru/services/test/cargo_3.php
+SP_V3_URL=https://spasskievorota.ru/services/work/cargo_3.php
 SP_V3_KEY=secret
 
 DEFAULT_EMAIL=no_reply@dot-dot.ru
@@ -130,3 +132,17 @@ SOVKOM_API_URL=secret
 ###< SOVKOM###
 
 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
+
+###> OTK ###
+OTK_API_END_POINT_URL="https://test-api.otk.su"
+OTK_API_TOKEN="Q5vBE9jusg38Rk7wHt2bzycT4K6pePFZ"
+###< OTK ###
+
+ACCOUNTING_AUDIT_URL=https://crm.dot-dot.ru
+ACCOUNTING_AUDIT_LOGIN=secret
+ACCOUNTING_AUDIT_PASSWORD=secret

configs/php/.env.local

@@ -1,4 +1,5 @@
-APP_ENV=prod
+
+APP_ENV=dev
 
 DATABASE_URL=mysql://root:ahwaireiNeebeeW9keiZ@db:3306/dot?serverVersion=mariadb-10.3.25
 
@@ -54,7 +55,7 @@ THREESELLER_PASSWORD=Logistika01
 NUXT_BASE_URL=dot-dot.ru
 
 ATISU_API_TOKEN_OLD=a9698671a68441c7b3959e43995d1506
-ATISU_API_TOKEN=25d7e2857f7f4b65a408d7664899aed7
+ATISU_API_TOKEN=46b599c3ab7f4574b560f48ea005d9f3
 
 ###> google/apiclient ###
 ANALITIC_GOOGLE_CLIENT_ID=672035500859-32f85hchubthu9givkdtgkqhvjg00c8e.apps.googleusercontent.com
@@ -139,9 +140,6 @@ DPD_CLIENT_NUMBER=1001066989
 DPD_CLIENT_KEY=8D52BF0F4D272FA91AF7B8EFC64C74EA31B89C4D
 ###< DPD ###
 
-
-ACCOUNTING_AUDIT_URL="https://crm.dot-dot.ru/TTLBuhreport/hs/TT/reconciliationreport"
-
 PAPA_FINANCE_API_URL=https://prod.papafinance.ru/api/ttn
 PAPA_FINANCE_PASSWORD='4sw$!cN#2j$tvcm2'  
 PAPA_FINANCE_LOGIN=tochka-tochka-logistika
@@ -163,7 +161,7 @@ YTRACKER_ORGANISATION_ID=355207
 
 SMARTCAPTCHA_SERVER_KEY=ysc2_GLQZ8QPaFh0eXqZ5KaRMuRRZOX7qNNMy7P9Mq82V6c4e7b81
 
-ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://ml.dot-dot.ru/v1/schedule/carrier/scoring
+ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://ml.dot-dot.ru/v2/schedule/carrier/scoring
 
 ML_UNCERTAIN_DIRECTIONS_URL=https://ml.dot-dot.ru/v1/classification/direction/uncertain
 
@@ -172,3 +170,37 @@ SENTRY_DSN="https://eedc2e8b1310ec9b04c2b0da8490dc01@sentry.dot-dot.ru/3"
 SENTRY_SERVER_NAME=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://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=90ac3a27a097dbab7045f2dcc2cd8f9883503610
+USER_TRUST_CHECK_BACKEND=true
+###< API_KONTUR_FOCUS### 
+
+QUEUE_DSN_USER_TRUST=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/USER_TRUST
+
+PROSTOR_SMS_LOGIN=ap142656
+PROSTOR_SMS_PASSWORD=808350
+
+###> OTK ###
+OTK_API_END_POINT_URL="https://api.otk.su"
+OTK_API_TOKEN="wSMxTp3ye9mtPcNG7CbQszq6VLK38jaQ"
+###< OTK ###
+
+ACCOUNTING_AUDIT_LOGIN=ReportServis
+ACCOUNTING_AUDIT_PASSWORD=fE7mubiv
+
+ML_CALCULATOR_SPOT_URL=https://ml.dot-dot.ru/v1/price_calculator/spot

configs/php/www.conf

@@ -0,0 +1,455 @@
+; Start a new pool named 'www'.
+; the variable $pool can be used in any directive and will be replaced by the
+; pool name ('www' here)
+[www]
+
+; Per pool prefix
+; It only applies on the following directives:
+; - 'access.log'
+; - 'slowlog'
+; - 'listen' (unixsocket)
+; - 'chroot'
+; - 'chdir'
+; - 'php_values'
+; - 'php_admin_values'
+; When not set, the global prefix (or NONE) applies instead.
+; Note: This directive can also be relative to the global prefix.
+; Default Value: none
+;prefix = /path/to/pools/$pool
+
+; Unix user/group of processes
+; Note: The user is mandatory. If the group is not set, the default user's group
+;       will be used.
+user = www-data
+group = www-data
+
+; The address on which to accept FastCGI requests.
+; Valid syntaxes are:
+;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific IPv4 address on
+;                            a specific port;
+;   '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
+;                            a specific port;
+;   'port'                 - to listen on a TCP socket to all addresses
+;                            (IPv6 and IPv4-mapped) on a specific port;
+;   '/path/to/unix/socket' - to listen on a unix socket.
+; Note: This value is mandatory.
+listen = 127.0.0.1:9000
+
+; Set listen(2) backlog.
+; Default Value: 511 (-1 on FreeBSD and OpenBSD)
+;listen.backlog = 511
+
+; Set permissions for unix socket, if one is used. In Linux, read/write
+; permissions must be set in order to allow connections from a web server. Many
+; BSD-derived systems allow connections regardless of permissions. The owner
+; and group can be specified either by name or by their numeric IDs.
+; Default Values: user and group are set as the running user
+;                 mode is set to 0660
+;listen.owner = www-data
+;listen.group = www-data
+;listen.mode = 0660
+; When POSIX Access Control Lists are supported you can set them using
+; these options, value is a comma separated list of user/group names.
+; When set, listen.owner and listen.group are ignored
+;listen.acl_users =
+;listen.acl_groups =
+
+; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
+; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
+; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
+; must be separated by a comma. If this value is left blank, connections will be
+; accepted from any ip address.
+; Default Value: any
+;listen.allowed_clients = 127.0.0.1
+
+; Specify the nice(2) priority to apply to the pool processes (only if set)
+; The value can vary from -19 (highest priority) to 20 (lower priority)
+; Note: - It will only work if the FPM master process is launched as root
+;       - The pool processes will inherit the master process priority
+;         unless it specified otherwise
+; Default Value: no set
+; process.priority = -19
+
+; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user
+; or group is different than the master process user. It allows to create process
+; core dump and ptrace the process for the pool user.
+; Default Value: no
+; process.dumpable = yes
+
+; Choose how the process manager will control the number of child processes.
+; Possible Values:
+;   static  - a fixed number (pm.max_children) of child processes;
+;   dynamic - the number of child processes are set dynamically based on the
+;             following directives. With this process management, there will be
+;             always at least 1 children.
+;             pm.max_children      - the maximum number of children that can
+;                                    be alive at the same time.
+;             pm.start_servers     - the number of children created on startup.
+;             pm.min_spare_servers - the minimum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is less than this
+;                                    number then some children will be created.
+;             pm.max_spare_servers - the maximum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is greater than this
+;                                    number then some children will be killed.
+;  ondemand - no children are created at startup. Children will be forked when
+;             new requests will connect. The following parameter are used:
+;             pm.max_children           - the maximum number of children that
+;                                         can be alive at the same time.
+;             pm.process_idle_timeout   - The number of seconds after which
+;                                         an idle process will be killed.
+; Note: This value is mandatory.
+pm = dynamic
+
+; The number of child processes to be created when pm is set to 'static' and the
+; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
+; This value sets the limit on the number of simultaneous requests that will be
+; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
+; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
+; CGI. The below defaults are based on a server without much resources. Don't
+; forget to tweak pm.* to fit your needs.
+; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
+; Note: This value is mandatory.
+pm.max_children = 25
+
+; The number of child processes created on startup.
+; Note: Used only when pm is set to 'dynamic'
+; Default Value: (min_spare_servers + max_spare_servers) / 2
+pm.start_servers = 10
+
+; The desired minimum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.min_spare_servers = 10
+
+; The desired maximum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.max_spare_servers = 20
+
+; The number of seconds after which an idle process will be killed.
+; Note: Used only when pm is set to 'ondemand'
+; Default Value: 10s
+;pm.process_idle_timeout = 10s;
+
+; The number of requests each child process should execute before respawning.
+; This can be useful to work around memory leaks in 3rd party libraries. For
+; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
+; Default Value: 0
+;pm.max_requests = 500
+
+; The URI to view the FPM status page. If this value is not set, no URI will be
+; recognized as a status page. It shows the following information:
+;   pool                 - the name of the pool;
+;   process manager      - static, dynamic or ondemand;
+;   start time           - the date and time FPM has started;
+;   start since          - number of seconds since FPM has started;
+;   accepted conn        - the number of request accepted by the pool;
+;   listen queue         - the number of request in the queue of pending
+;                          connections (see backlog in listen(2));
+;   max listen queue     - the maximum number of requests in the queue
+;                          of pending connections since FPM has started;
+;   listen queue len     - the size of the socket queue of pending connections;
+;   idle processes       - the number of idle processes;
+;   active processes     - the number of active processes;
+;   total processes      - the number of idle + active processes;
+;   max active processes - the maximum number of active processes since FPM
+;                          has started;
+;   max children reached - number of times, the process limit has been reached,
+;                          when pm tries to start more children (works only for
+;                          pm 'dynamic' and 'ondemand');
+; Value are updated in real time.
+; Example output:
+;   pool:                 www
+;   process manager:      static
+;   start time:           01/Jul/2011:17:53:49 +0200
+;   start since:          62636
+;   accepted conn:        190460
+;   listen queue:         0
+;   max listen queue:     1
+;   listen queue len:     42
+;   idle processes:       4
+;   active processes:     11
+;   total processes:      15
+;   max active processes: 12
+;   max children reached: 0
+;
+; By default the status page output is formatted as text/plain. Passing either
+; 'html', 'xml' or 'json' in the query string will return the corresponding
+; output syntax. Example:
+;   http://www.foo.bar/status
+;   http://www.foo.bar/status?json
+;   http://www.foo.bar/status?html
+;   http://www.foo.bar/status?xml
+;
+; By default the status page only outputs short status. Passing 'full' in the
+; query string will also return status for each pool process.
+; Example:
+;   http://www.foo.bar/status?full
+;   http://www.foo.bar/status?json&full
+;   http://www.foo.bar/status?html&full
+;   http://www.foo.bar/status?xml&full
+; The Full status returns for each process:
+;   pid                  - the PID of the process;
+;   state                - the state of the process (Idle, Running, ...);
+;   start time           - the date and time the process has started;
+;   start since          - the number of seconds since the process has started;
+;   requests             - the number of requests the process has served;
+;   request duration     - the duration in µs of the requests;
+;   request method       - the request method (GET, POST, ...);
+;   request URI          - the request URI with the query string;
+;   content length       - the content length of the request (only with POST);
+;   user                 - the user (PHP_AUTH_USER) (or '-' if not set);
+;   script               - the main script called (or '-' if not set);
+;   last request cpu     - the %cpu the last request consumed
+;                          it's always 0 if the process is not in Idle state
+;                          because CPU calculation is done when the request
+;                          processing has terminated;
+;   last request memory  - the max amount of memory the last request consumed
+;                          it's always 0 if the process is not in Idle state
+;                          because memory calculation is done when the request
+;                          processing has terminated;
+; If the process is in Idle state, then informations are related to the
+; last request the process has served. Otherwise informations are related to
+; the current request being served.
+; Example output:
+;   ************************
+;   pid:                  31330
+;   state:                Running
+;   start time:           01/Jul/2011:17:53:49 +0200
+;   start since:          63087
+;   requests:             12808
+;   request duration:     1250261
+;   request method:       GET
+;   request URI:          /test_mem.php?N=10000
+;   content length:       0
+;   user:                 -
+;   script:               /home/fat/web/docs/php/test_mem.php
+;   last request cpu:     0.00
+;   last request memory:  0
+;
+; Note: There is a real-time FPM status monitoring sample web page available
+;       It's available in: /usr/local/share/php/fpm/status.html
+;
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set
+;pm.status_path = /status
+
+; The address on which to accept FastCGI status request. This creates a new
+; invisible pool that can handle requests independently. This is useful
+; if the main pool is busy with long running requests because it is still possible
+; to get the status before finishing the long running requests.
+;
+; Valid syntaxes are:
+;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific IPv4 address on
+;                            a specific port;
+;   '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
+;                            a specific port;
+;   'port'                 - to listen on a TCP socket to all addresses
+;                            (IPv6 and IPv4-mapped) on a specific port;
+;   '/path/to/unix/socket' - to listen on a unix socket.
+; Default Value: value of the listen option
+;pm.status_listen = 127.0.0.1:9001
+
+; The ping URI to call the monitoring page of FPM. If this value is not set, no
+; URI will be recognized as a ping page. This could be used to test from outside
+; that FPM is alive and responding, or to
+; - create a graph of FPM availability (rrd or such);
+; - remove a server from a group if it is not responding (load balancing);
+; - trigger alerts for the operating team (24/7).
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set
+;ping.path = /ping
+
+; This directive may be used to customize the response of a ping request. The
+; response is formatted as text/plain with a 200 response code.
+; Default Value: pong
+;ping.response = pong
+
+; The access log file
+; Default: not set
+;access.log = log/$pool.access.log
+
+; The access log format.
+; The following syntax is allowed
+;  %%: the '%' character
+;  %C: %CPU used by the request
+;      it can accept the following format:
+;      - %{user}C for user CPU only
+;      - %{system}C for system CPU only
+;      - %{total}C  for user + system CPU (default)
+;  %d: time taken to serve the request
+;      it can accept the following format:
+;      - %{seconds}d (default)
+;      - %{milliseconds}d
+;      - %{mili}d
+;      - %{microseconds}d
+;      - %{micro}d
+;  %e: an environment variable (same as $_ENV or $_SERVER)
+;      it must be associated with embraces to specify the name of the env
+;      variable. Some examples:
+;      - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
+;      - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
+;  %f: script filename
+;  %l: content-length of the request (for POST request only)
+;  %m: request method
+;  %M: peak of memory allocated by PHP
+;      it can accept the following format:
+;      - %{bytes}M (default)
+;      - %{kilobytes}M
+;      - %{kilo}M
+;      - %{megabytes}M
+;      - %{mega}M
+;  %n: pool name
+;  %o: output header
+;      it must be associated with embraces to specify the name of the header:
+;      - %{Content-Type}o
+;      - %{X-Powered-By}o
+;      - %{Transfert-Encoding}o
+;      - ....
+;  %p: PID of the child that serviced the request
+;  %P: PID of the parent of the child that serviced the request
+;  %q: the query string
+;  %Q: the '?' character if query string exists
+;  %r: the request URI (without the query string, see %q and %Q)
+;  %R: remote IP address
+;  %s: status (response code)
+;  %t: server time the request was received
+;      it can accept a strftime(3) format:
+;      %d/%b/%Y:%H:%M:%S %z (default)
+;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
+;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+;  %T: time the log has been written (the request has finished)
+;      it can accept a strftime(3) format:
+;      %d/%b/%Y:%H:%M:%S %z (default)
+;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
+;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+;  %u: remote user
+;
+; Default: "%R - %u %t \"%m %r\" %s"
+;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"
+
+; The log file for slow requests
+; Default Value: not set
+; Note: slowlog is mandatory if request_slowlog_timeout is set
+;slowlog = log/$pool.log.slow
+
+; The timeout for serving a single request after which a PHP backtrace will be
+; dumped to the 'slowlog' file. A value of '0s' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_slowlog_timeout = 0
+
+; Depth of slow log stack trace.
+; Default Value: 20
+;request_slowlog_trace_depth = 20
+
+; The timeout for serving a single request after which the worker process will
+; be killed. This option should be used when the 'max_execution_time' ini option
+; does not stop script execution for some reason. A value of '0' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_terminate_timeout = 0
+
+; The timeout set by 'request_terminate_timeout' ini option is not engaged after
+; application calls 'fastcgi_finish_request' or when application has finished and
+; shutdown functions are being called (registered via register_shutdown_function).
+; This option will enable timeout limit to be applied unconditionally
+; even in such cases.
+; Default Value: no
+;request_terminate_timeout_track_finished = no
+
+; Set open file descriptor rlimit.
+; Default Value: system defined value
+;rlimit_files = 1024
+
+; Set max core size rlimit.
+; Possible Values: 'unlimited' or an integer greater or equal to 0
+; Default Value: system defined value
+;rlimit_core = 0
+
+; Chroot to this directory at the start. This value must be defined as an
+; absolute path. When this value is not set, chroot is not used.
+; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
+; of its subdirectories. If the pool prefix is not set, the global prefix
+; will be used instead.
+; Note: chrooting is a great security feature and should be used whenever
+;       possible. However, all PHP paths will be relative to the chroot
+;       (error_log, sessions.save_path, ...).
+; Default Value: not set
+;chroot =
+
+; Chdir to this directory at the start.
+; Note: relative path can be used.
+; Default Value: current directory or / when chroot
+;chdir = /var/www
+
+; Redirect worker stdout and stderr into main error log. If not set, stdout and
+; stderr will be redirected to /dev/null according to FastCGI specs.
+; Note: on highloaded environment, this can cause some delay in the page
+; process time (several ms).
+; Default Value: no
+;catch_workers_output = yes
+
+; Decorate worker output with prefix and suffix containing information about
+; the child that writes to the log and if stdout or stderr is used as well as
+; log level and time. This options is used only if catch_workers_output is yes.
+; Settings to "no" will output data as written to the stdout or stderr.
+; Default value: yes
+;decorate_workers_output = no
+
+; Clear environment in FPM workers
+; Prevents arbitrary environment variables from reaching FPM worker processes
+; by clearing the environment in workers before env vars specified in this
+; pool configuration are added.
+; Setting to "no" will make all environment variables available to PHP code
+; via getenv(), $_ENV and $_SERVER.
+; Default Value: yes
+;clear_env = no
+
+; Limits the extensions of the main script FPM will allow to parse. This can
+; prevent configuration mistakes on the web server side. You should only limit
+; FPM to .php extensions to prevent malicious users to use other extensions to
+; execute php code.
+; Note: set an empty value to allow all extensions.
+; Default Value: .php
+;security.limit_extensions = .php .php3 .php4 .php5 .php7
+
+; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
+; the current environment.
+; Default Value: clean env
+;env[HOSTNAME] = $HOSTNAME
+;env[PATH] = /usr/local/bin:/usr/bin:/bin
+;env[TMP] = /tmp
+;env[TMPDIR] = /tmp
+;env[TEMP] = /tmp
+
+; Additional php.ini defines, specific to this pool of workers. These settings
+; overwrite the values previously defined in the php.ini. The directives are the
+; same as the PHP SAPI:
+;   php_value/php_flag             - you can set classic ini defines which can
+;                                    be overwritten from PHP call 'ini_set'.
+;   php_admin_value/php_admin_flag - these directives won't be overwritten by
+;                                     PHP call 'ini_set'
+; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
+
+; Defining 'extension' will load the corresponding shared extension from
+; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
+; overwrite previously defined php.ini values, but will append the new value
+; instead.
+
+; Note: path INI options can be relative and will be expanded with the prefix
+; (pool, global or /usr/local)
+
+; Default Value: nothing is defined by default except the values in php.ini and
+;                specified at startup with the -d argument
+;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
+;php_flag[display_errors] = off
+;php_admin_value[error_log] = /var/log/fpm-php.www.log
+;php_admin_flag[log_errors] = on
+;php_admin_value[memory_limit] = 32M

docker-compose.yml

@@ -1,16 +1,30 @@
-version: "3.3"
-
 volumes:
   certbot_volume:
   nginx_log_volume:
   mysql_data_volume:
   mysql_backup_volume:
   php_var_volume:
-  bookstack_data_volume:
   rabbitmq_volume:
   redis_volume:
+  php_support_volume:
 
 
+x-defaults-php: &defaults-php
+  image: registry.dot-dot.ru/dot-dot:${DOTDOT_TAG}
+  restart: unless-stopped
+  volumes:
+    - ./configs/php/.env:/application/.env
+    - ./configs/php/.env.local:/application/.env.local
+    - ./configs/php/zz-docker.conf:/usr/local/etc/php-fpm.d/zz-docker.conf
+    - php_var_volume:/application/var
+    - 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
+  depends_on:
+    - db
+  networks:
+    - dd
+
 networks:
   dd:
     name: ${NETWORK}
@@ -45,19 +59,30 @@ services:
     networks:
       - dd
 
-  php:
+  backend:
-    image: registry.dot-dot.ru/dot-dot:${DOTDOT_TAG}
+    <<: *defaults-php
     # command: "php-fpm && nginx -g 'daemon off;'"
-    restart: unless-stopped
+
-    volumes:
+  php:
-      - ./configs/php/.env:/application/.env
+    # TODO: Денис должен переделать и добавить 
-      - ./configs/php/.env.local:/application/.env.local
+    command: ./bin/console app:auction:reload
-      - ./configs/php/zz-docker.conf:/usr/local/etc/php-fpm.d/zz-docker.conf
+    <<: *defaults-php
-      - php_var_volume:/application/var
+
-    depends_on:
+  statistic-export:
-      - db
+    <<: *defaults-php
-    networks:
+    command: ./bin/console messenger:consume StatisticExport
-      - dd
+
+  carrier-offers:
+    <<: *defaults-php
+    command: ./bin/console messenger:consume CarrierOffers
+
+  user-trust:
+    <<: *defaults-php
+    command: ./bin/console messenger:consume UserTrust
+
+  auction:
+    <<: *defaults-php
+    command: sh -c 'while true; do echo run; ./bin/console app:auction:process; sleep 60;done'
 
   lms:
     image: registry.dot-dot.ru/lms:${LMS_TAG}
@@ -65,8 +90,10 @@ services:
     command: npm run start
     volumes:
       - ./configs/lms/.env:/app/.env
+      - ./configs/lms/entrypoint.sh:/entrypoint.sh
     env_file:
       - ./configs/lms/.env
+    entrypoint: /entrypoint.sh
     networks:
       - dd
 
@@ -76,23 +103,6 @@ services:
     networks:
       - dd
 
-  help-platform:
-    image: registry.dot-dot.ru/help-platform:${HELP_TAG}
-    restart: unless-stopped
-    networks:
-      - dd
-
-  nuxt:
-    image: registry.dot-dot.ru/front:${FRONT_TAG}
-    restart: unless-stopped
-    command: npm run start
-    volumes:
-      - ./configs/nuxt/.env:/app/.env
-    env_file:
-      - ./configs/nuxt/.env
-    networks:
-      - dd
-
   nginx:
     image: nginx:1.25.3-alpine3.18
     restart: unless-stopped
@@ -104,77 +114,15 @@ services:
       - ./configs/nginx/other:/etc/nginx/other
       - certbot_volume:/etc/letsencrypt
       - nginx_log_volume:/var/log/nginx
-    ports:
-      - 80:80
-      - 443:443
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.nginx${NETWORK}.rule=Host(`${NETWORK}.dot-dot.ru`)"
-      - "traefik.http.services.nginx${NETWORK}.loadbalancer.server.port=80"
     depends_on:
-      - nuxt
+      - lms
       - php
       - static
     networks:
-      - dd
+      dd:
-      - ingress
+      ingress:
-
+        aliases:
-  node-exporter:
+          - c2d-nginx
-    image: prom/node-exporter:v1.7.0
-    container_name: node-exporter
-    restart: unless-stopped
-    volumes:
-      - /proc:/host/proc:ro
-      - /sys:/host/sys:ro
-      - /:/rootfs:ro
-    command:
-      - '--path.procfs=/host/proc'
-      - '--path.rootfs=/rootfs'
-      - '--path.sysfs=/host/sys'
-      - '--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)'
-    networks:
-      - dd
-
-  cadvisor:
-    image: gcr.io/cadvisor/cadvisor:v0.47.2
-    restart: unless-stopped
-    container_name: cadvisor
-    volumes:
-      - /:/rootfs:ro
-      - /var/run:/var/run:ro
-      - /sys:/sys:ro
-      - /var/lib/docker/:/var/lib/docker:ro
-      - /dev/disk:/dev/disk:ro
-    devices:
-      - /dev/kmsg:/dev/kmsg
-    networks:
-      - dd
-
-  bookstack:
-    image: ghcr.io/linuxserver/bookstack:24.02.3
-    restart: unless-stopped
-    container_name: bookstack
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - APP_URL="https://wiki.dot-dot.ru"
-      - DB_HOST=db
-      - DB_USER=root
-      - DB_PASS=${MYSQL_ROOT_PASSWORD}
-      - DB_DATABASE=bookstack
-      - MAIL_DRIVER=${MAIL_DRIVER}
-      - MAIL_HOST=${MAIL_HOST}
-      - MAIL_PORT=${MAIL_PORT}
-      - MAIL_USERNAME=${MAIL_USERNAME}
-      - MAIL_PASSWORD=${MAIL_PASSWORD}
-      - MAIL_ENCRYPTION=${MAIL_ENCRYPTION}
-      - MAIL_FROM=${MAIL_FROM}
-      - MAIL_FROM_NAME=${MAIL_FROM_NAME}
-    volumes:
-      - ./configs/bookstack:/config
-        #- bookstack_data_volume:
-    networks:
-      - dd
 
   rabbitmq:
     image: rabbitmq:3.12.1-management-alpine
@@ -209,3 +157,16 @@ services:
       - "--redis.password=${REDIS_PASSWORD}"
     networks:
       dd: {}
+
+  admin:
+    image: registry.dot-dot.ru/admin:${ADMIN_TAG}
+    restart: unless-stopped
+    command: sh -c 'php-fpm -D; nginx'
+    volumes:
+      - ./configs/admin/default:/etc/nginx/sites-enabled/default
+      - ./configs/admin/.env:/application/.env
+      - ./configs/nginx/ssl:/etc/nginx/ssl
+    depends_on:
+      - db
+    networks:
+      dd:

scripts/chowner.sh

@@ -1,7 +0,0 @@
-#!/bin/bash 
-
-
-volume='/var/lib/docker/volumes/prod_php_var_volume/_data/log'
-for x in $(sudo ls -l $volume | grep root | awk -F' ' '{print $9}');do 
-	sudo chown 82:82 $volume/$x;
-done

scripts/make_backup_mysql.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-SS_CONTAINER='backup_db'
-BACK_DIR='/var/tmp/db/backups'
-
-# Remote backup
-MYSQL_CRED='-uroot -pahwaireiNeebeeW9keiZ'
-
-HOST=$(hostname -s)
-DATABASES=$(docker exec -i -u root prod-db-1 mysql ${MYSQL_CRED} -s  -AN -e 'show databases' | grep -vE "information_schema|analytics|performance_schema|trash|sys")
-for database in ${DATABASES}; do
-	DUMPFILE="${database}.$(date +%a).sql.gz"
-	docker exec -i -u root prod-db-1 mysqldump ${MYSQL_CRED} --max_allowed_packet=1G --add-drop-table --single-transaction --extended-insert ${database} | gzip -c > $BACK_DIR/${DUMPFILE} 2>&1
-	rclone move $BACK_DIR/${DUMPFILE} selectel:backup_db/dot/${DUMPFILE}
-	#rm -vf $BACK_DIR/${DUMPFILE} 2>&1
-done