From 7bd08c7c34c7f7ded9c2d9cc1f6913d60b2bf8d1 Mon Sep 17 00:00:00 2001 From: Sergey Paramoshkin Date: Sun, 2 Feb 2025 11:37:54 +0300 Subject: [PATCH] sync config --- configs/admin/.env | 83 +++++- configs/admin/entrypoint.sh | 10 - configs/cabinet/.env | 13 + configs/cabinet/entrypoint.sh | 10 + configs/dashboard/.env | 82 ------ configs/nginx/conf.d/admin.conf | 16 +- configs/nginx/conf.d/cabinet.conf | 21 ++ configs/nginx/conf.d/default.conf | 7 +- configs/nginx/conf.d/lms.conf | 6 +- configs/nginx/conf.d/rabbitmq.conf | 4 +- configs/php/.env.local | 13 +- configs/php/www.conf | 455 +++++++++++++++++++++++++++++ configs/php/zz-docker.conf | 5 + docker-compose.yml | 90 ++++-- 14 files changed, 677 insertions(+), 138 deletions(-) delete mode 100755 configs/admin/entrypoint.sh create mode 100755 configs/cabinet/.env create mode 100755 configs/cabinet/entrypoint.sh delete mode 100644 configs/dashboard/.env create mode 100644 configs/nginx/conf.d/cabinet.conf create mode 100755 configs/php/www.conf create mode 100755 configs/php/zz-docker.conf diff --git a/configs/admin/.env b/configs/admin/.env index 5e9f18d..fc8dd66 100644 --- a/configs/admin/.env +++ b/configs/admin/.env @@ -1,3 +1,80 @@ -NUXT_HOST=0.0.0.0 -NUXT_PORT=3000 -DOMAIN=testbadmin.dot-dot.ru +APP_NAME="DOT-DOT admin" +APP_ENV=production +APP_KEY=base64:54d0glUSEueuhTWS0B45/WMCLlnbgFKpUP2hfgE7Xs4= +APP_DEBUG=true +APP_TIMEZONE=UTC +APP_URL=https://testbadmin.dot-dot.ru +FRONTEND_URL=https://testbadmin.dot-dot.ru +ASSET_URL=https://testbadmin.dot-dot.ru +APP_EMAIL_DOMAIN="dot-dot.ru" + +APP_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=dot +DOT_DOT_DB_PASSWORD=dot + +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://testb.dot-dot.ru diff --git a/configs/admin/entrypoint.sh b/configs/admin/entrypoint.sh deleted file mode 100755 index ddc99b3..0000000 --- a/configs/admin/entrypoint.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -DOMAIN="${DOMAIN:-lmsadmin.dot-dot.ru}" - -for x in $(grep -lrw "lmsadmin.dot-dot.ru" .nuxt/);do - echo "replace lmsadmin.dot-dot.ru to https://${DOMAIN} in $x" - sed -i -e "s/lmsadmin.dot-dot.ru/${DOMAIN}/g" $x; -done - -"$@" diff --git a/configs/cabinet/.env b/configs/cabinet/.env new file mode 100755 index 0000000..309209f --- /dev/null +++ b/configs/cabinet/.env @@ -0,0 +1,13 @@ +NUXT_HOST=0.0.0.0 +NUXT_PORT=3000 +NUXT_ENV_DEVALUE_LOG_LEVEL=silent +WS_PROTOCOL=wss +BASE_URL=testbcabinet.dot-dot.ru +API_URL=https://testb.dot-dot.ru/ +DOMAIN=testbcabinet.dot-dot.ru + +APP_HOST=testb.dot-dot.ru +APP_SCHEME=https +APP_ENVIRONMENT=production +DADATA_API_TOKEN=c9aa5fdc338a746e23ce91ceb6fdb9e635749833 +YANDEX_METRIKA_ID=50156956 diff --git a/configs/cabinet/entrypoint.sh b/configs/cabinet/entrypoint.sh new file mode 100755 index 0000000..bc2988a --- /dev/null +++ b/configs/cabinet/entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +DOMAIN="${DOMAIN:-lmscabinet.dot-dot.ru}" + +for x in $(grep -lrw "lmscabinet.dot-dot.ru" .nuxt/);do + echo "replace lmscabinet.dot-dot.ru to https://${DOMAIN} in $x" + sed -i -e "s/lmscabinet.dot-dot.ru/${DOMAIN}/g" $x; +done + +"$@" diff --git a/configs/dashboard/.env b/configs/dashboard/.env deleted file mode 100644 index b035e7f..0000000 --- a/configs/dashboard/.env +++ /dev/null @@ -1,82 +0,0 @@ -APP_NAME="DOT-DOT admin" -APP_ENV=production -APP_KEY=base64:tt8hr1y+cfNtEPQfWtFi9OXEDgko6Qw6uxeNK7ka3YU= -APP_DEBUG=true -APP_TIMEZONE=UTC -APP_URL=https://testbadmin.dot-dot.ru -FRONTEND_URL=https://testbadmin.dot-dot.ru -ASSET_URL=https://testbadmin.dot-dot.ru -APP_EMAIL_DOMAIN="dot-dot.ru" - -APP_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=dot -DOT_DOT_DB_PASSWORD=dot - -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 - -DOT_DOT_HOST=https://testb.dot-dot.ru diff --git a/configs/nginx/conf.d/admin.conf b/configs/nginx/conf.d/admin.conf index 4561249..fcf621e 100644 --- a/configs/nginx/conf.d/admin.conf +++ b/configs/nginx/conf.d/admin.conf @@ -1,9 +1,23 @@ server { + listen 80; server_name testbadmin.dot-dot.ru; + return 301 https://$server_name$request_uri; +} + +server { + listen 443 ssl ; + server_name testbadmin.dot-dot.ru; + + ssl_certificate /etc/nginx/ssl/dot2024.crt; + ssl_certificate_key /etc/nginx/ssl/dot2024.key; + client_max_body_size 10m; + access_log /var/log/nginx/testbadmin.dot-dot.ru_access.log json; + error_log /var/log/nginx/testbadmin.dot-dot.ru_error.log; + location / { - proxy_pass http://dashboard:80; + proxy_pass http://testb-admin-1:80; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; diff --git a/configs/nginx/conf.d/cabinet.conf b/configs/nginx/conf.d/cabinet.conf new file mode 100644 index 0000000..7f7dd5f --- /dev/null +++ b/configs/nginx/conf.d/cabinet.conf @@ -0,0 +1,21 @@ +server { + listen 443 ssl ; + server_name testbcabinet.dot-dot.ru; + + ssl_certificate /etc/nginx/ssl/dot2024.crt; + ssl_certificate_key /etc/nginx/ssl/dot2024.key; + + client_max_body_size 10m; + + location / { + proxy_pass http://cabinet: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; + } +} diff --git a/configs/nginx/conf.d/default.conf b/configs/nginx/conf.d/default.conf index 995bf76..d6f9634 100755 --- a/configs/nginx/conf.d/default.conf +++ b/configs/nginx/conf.d/default.conf @@ -32,8 +32,9 @@ server { location /socket.io/auctionreload { proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_pass http://php:8080; + proxy_set_header Connection $connection_upgrade; + proxy_set_header Host $host; + proxy_pass http://php:8080/; } location @rewriteapp { @@ -109,7 +110,7 @@ server { 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_pass backend:9001; fastcgi_split_path_info ^(.+\.php)(/.*)$; include fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; diff --git a/configs/nginx/conf.d/lms.conf b/configs/nginx/conf.d/lms.conf index 6f03ea8..20dcaa1 100755 --- a/configs/nginx/conf.d/lms.conf +++ b/configs/nginx/conf.d/lms.conf @@ -8,8 +8,8 @@ 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; + ssl_certificate /etc/nginx/ssl/dot2024.crt; + ssl_certificate_key /etc/nginx/ssl/dot2024.key; root /application/public; @@ -116,7 +116,7 @@ server { 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_pass backend:9001; fastcgi_split_path_info ^(.+\.php)(/.*)$; include fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; diff --git a/configs/nginx/conf.d/rabbitmq.conf b/configs/nginx/conf.d/rabbitmq.conf index c1b8c5f..5658153 100755 --- a/configs/nginx/conf.d/rabbitmq.conf +++ b/configs/nginx/conf.d/rabbitmq.conf @@ -8,8 +8,8 @@ server { listen 443 ssl; server_name testbrabbitmq.dot-dot.ru; - access_log /var/log/nginx/rabbitmq_access.log json; - error_log /var/log/nginx/rabbitmq_error.log; + access_log /var/log/nginx/rabbitmqtestb.dot-dot.ru_access.log json; + error_log /var/log/nginx/rabbitmqtestb.dot-dot.ru_error.log; ssl_certificate /etc/nginx/ssl/dot2024.crt; ssl_certificate_key /etc/nginx/ssl/dot2024.key; diff --git a/configs/php/.env.local b/configs/php/.env.local index a36062c..b0c2c9e 100755 --- a/configs/php/.env.local +++ b/configs/php/.env.local @@ -127,9 +127,9 @@ YTRACKER_ORGANISATION_ID=355207 SMARTCAPTCHA_SERVER_KEY=ysc2_GLQZ8QPaFh0eXqZ5KaRMuRRZOX7qNNMy7P9Mq82V6c4e7b81 ###> sentry/sentry-symfony ### -SENTRY_DSN="https://1127a3ada375b040486c3ab0d86cbcab@sentry.dot-dot.ru/5" -SENTRY_SERVER_NAME=testb -SENTRY_SERVER_USER_NAME=sozonov +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 @@ -140,6 +140,7 @@ ML_REGULAR_DIRECTION_HISTORY_ORDER_URL=https://ml.dot-dot.ru/v1/schedule/transpo #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 +QUEUE_DSN_RELEVANT_CARRIER_EXPORT=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/RELEVANT_CARRIER_EXPORT CRYPTOPRO_PATH='/opt/cprocsp/bin/amd64/cryptcp -sign -dn '"ООО ""ТОЧКА-ТОЧКА ЛОГИСТИКА"""' -der' SIGNED_DOC_PATH="/application/var/documents/signeddocs" @@ -165,9 +166,3 @@ OTK_API_TOKEN="Q5vBE9jusg38Rk7wHt2bzycT4K6pePFZ" ACCOUNTING_AUDIT_LOGIN=ReportServis ACCOUNTING_AUDIT_PASSWORD=fE7mubiv - -FNS_ACCESS_TOKEN=a5639b93fe4e7c9a3f1dd85537e066d36439c35 - - -ML_CALCULATOR_SPOT_URL=https://ml.dot-dot.ru/v1/price_calculator/spot -ML_CARRIER_SCORING=https://ml.dot-dot.ru/v3/classification/carrier/scoring diff --git a/configs/php/www.conf b/configs/php/www.conf new file mode 100755 index 0000000..302be9c --- /dev/null +++ b/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 %{}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 %{}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 diff --git a/configs/php/zz-docker.conf b/configs/php/zz-docker.conf new file mode 100755 index 0000000..363ab1f --- /dev/null +++ b/configs/php/zz-docker.conf @@ -0,0 +1,5 @@ +[global] +daemonize = no + +[www] +listen = 0.0.0.0:9000 diff --git a/docker-compose.yml b/docker-compose.yml index 4dee9c9..82ec220 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,10 +6,32 @@ volumes: php_var_volume: rabbitmq_volume: redis_volume: - caddy_data: - caddy_config: + php_support_volume: +x-defaults-php: &defaults-php + image: registry.dot-dot.ru/dot-dot:${DOTDOT_TAG} + restart: unless-stopped + user: www-data + 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 + - rabbitmq + extra_hosts: + - "sentry.dot-dot.ru:192.168.100.111" + - "testbsigner.dot-dot.ru:192.168.100.110" + - "testb.dot-dot.ru:192.168.100.110" + - "testblms.dot-dot.ru:192.168.100.110" + networks: + - dd + networks: dd: name: ${NETWORK} @@ -33,18 +55,29 @@ services: networks: - dd + backend: + <<: *defaults-php + php: - image: registry.dot-dot.ru/dot-dot:${DOTDOT_TAG} - # command: "php-fpm && nginx -g 'daemon off;'" - restart: unless-stopped - volumes: - - ./configs/php/.env:/application/.env - - ./configs/php/.env.local:/application/.env.local - - php_var_volume:/application/var - depends_on: - - db - networks: - - dd + # TODO: Денис должен переделать и добавить + command: ./bin/console app:auction:reload + <<: *defaults-php + + statistic-export: + <<: *defaults-php + command: ./bin/console messenger:consume StatisticExport + + carrier-offers: + <<: *defaults-php + command: ./bin/console messenger:consume CarrierOffers + + user-trust: + <<: *defaults-php + command: sh -c 'while true; do echo run; ./bin/console messenger:consume UserTrust; sleep 60;done' + + auction: + <<: *defaults-php + command: sh -c 'while true; do echo run; ./bin/console app:auction:process; sleep 60;done' static: image: registry.dot-dot.ru/dot-dot-static:${DOTDOT_TAG} @@ -79,20 +112,18 @@ services: - dd admin: - image: registry.dot-dot.ru/dashboard:${DASHBORD_TAG} - command: frankenphp php-server -r /application/public + image: registry.dot-dot.ru/admin:${ADMIN_TAG} + # user: www-data + # command: frankenphp php-server -r /application/public + command: sh -c 'php-fpm -D; nginx' restart: unless-stopped - environment: - - SERVER_NAME=testbadmin.dot-dot.ru volumes: - - ./configs/dashboard/.env:/application/.env + - ./configs/admin/.env:/application/.env depends_on: - db networks: dd: - ingress: - aliases: - - ${NETWORK}-admin + nginx: image: nginx:1.25.3-alpine3.18 @@ -122,8 +153,6 @@ services: volumes: - rabbitmq_volume:/var/lib/rabbitmq - ./configs/rabbitmq/enabled_plugins:/etc/rabbitmq/enabled_plugins - - ./configs/rabbitmq/definitions.json:/etc/rabbitmq/definitions.json - - ./configs/rabbitmq/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf environment: - RABBITMQ_DEFAULT_USER=${RABBITMQ_USERNAME} - RABBITMQ_DEFAULT_PASS=${RABBITMQ_PASSWORD} @@ -138,7 +167,6 @@ services: - redis_volume:/data - ./configs/redis:/usr/local/etc/redis environment: - - REDIS_PASSWORD=${REDIS_PASSWORD} - REDIS_PORT=6379 networks: dd: {} @@ -147,6 +175,18 @@ services: image: oliver006/redis_exporter:v1.59.0 command: - "--redis.addr=redis://redis:6379" - - "--redis.password=${REDIS_PASSWORD}" networks: dd: {} + + cabinet: + image: registry.dot-dot.ru/dot_dot_cargo_carrier:${CABINET_TAG} + restart: unless-stopped + command: npm run start + volumes: + - ./configs/cabinet/.env:/app/.env + - ./configs/cabinet/entrypoint.sh:/entrypoint.sh + env_file: + - ./configs/cabinet/.env + entrypoint: /entrypoint.sh + networks: + - dd