From 9ce22bf871929ba8cbb2190c46872a0c6c25e113 Mon Sep 17 00:00:00 2001 From: ddadmin Date: Mon, 3 Feb 2025 14:57:58 +0300 Subject: [PATCH] update --- .env | 8 ++--- configs/nginx/conf.d/admin.conf | 2 +- configs/nginx/conf.d/default.conf | 56 ++++++++++++++----------------- docker-compose.yml | 6 ++-- 4 files changed, 34 insertions(+), 38 deletions(-) diff --git a/.env b/.env index 670c3b4..a6b4bbf 100644 --- a/.env +++ b/.env @@ -1,10 +1,10 @@ COMPOSE_PROJECT_NAME=testb NETWORK=testb -FRONT_TAG=develop -DOTDOT_TAG=DD-3834 -LMS_TAG=develop -ADMIN_TAG=dashboard +FRONT_TAG=DD-3776-STORY +DOTDOT_TAG=DD-3776-STORY +LMS_TAG=DD-3776-STORY +ADMIN_TAG=master CABINET_TAG=master MYSQL_PORT=0.0.0.0:33062 diff --git a/configs/nginx/conf.d/admin.conf b/configs/nginx/conf.d/admin.conf index d7704de..ac9426e 100644 --- a/configs/nginx/conf.d/admin.conf +++ b/configs/nginx/conf.d/admin.conf @@ -17,7 +17,7 @@ server { error_log /var/log/nginx/testbadmin.dot-dot.ru_error.log; location / { - proxy_pass https://testb-admin-1:443; + proxy_pass https://admin:443; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection 'upgrade'; diff --git a/configs/nginx/conf.d/default.conf b/configs/nginx/conf.d/default.conf index d1cec96..863d234 100755 --- a/configs/nginx/conf.d/default.conf +++ b/configs/nginx/conf.d/default.conf @@ -116,35 +116,31 @@ server { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; } - location /mysql_exporter { - access_log /var/log/nginx/mysql_exporter_access.log json; - error_log /var/log/nginx/mysql_exporter_error.log; + # 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; - } + # #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; + # } } diff --git a/docker-compose.yml b/docker-compose.yml index 82ec220..7384276 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -113,12 +113,12 @@ services: admin: 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 + 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: