diff --git a/.env b/.env index ba3a846..5743628 100755 --- a/.env +++ b/.env @@ -4,7 +4,7 @@ NETWORK=teste FRONT_TAG=DD-3615-STORY DOTDOT_TAG=DD-3615-STORY LMS_TAG=DD-3615-STORY -ADMIN_TAG=dashboard +ADMIN_TAG=master CABINET_TAG=master MYSQL_PORT=0.0.0.0:33065 diff --git a/configs/admin/.env b/configs/admin/.env index 034d40c..3c4e7e9 100644 --- a/configs/admin/.env +++ b/configs/admin/.env @@ -3,9 +3,9 @@ APP_ENV=production APP_KEY=base64:54d0glUSEueuhTWS0B45/WMCLlnbgFKpUP2hfgE7Xs4= APP_DEBUG=true APP_TIMEZONE=UTC -APP_URL=https://testaadmin.dot-dot.ru -FRONTEND_URL=https://testaadmin.dot-dot.ru -ASSET_URL=https://testaadmin.dot-dot.ru +APP_URL=https://testeadmin.dot-dot.ru +FRONTEND_URL=https://testeadmin.dot-dot.ru +ASSET_URL=https://testeadmin.dot-dot.ru APP_EMAIL_DOMAIN="dot-dot.ru" APP_LOCALE=ru @@ -77,4 +77,4 @@ AWS_USE_PATH_STYLE_ENDPOINT=false VITE_APP_NAME="${APP_NAME}" -DOT_DOT_HOST=https://testa.dot-dot.ru +DOT_DOT_HOST=https://teste.dot-dot.ru diff --git a/configs/nginx/conf.d/admin.conf b/configs/nginx/conf.d/admin.conf index 063e14f..d17ba0b 100644 --- a/configs/nginx/conf.d/admin.conf +++ b/configs/nginx/conf.d/admin.conf @@ -1,23 +1,23 @@ server { listen 80; - server_name testaadmin.dot-dot.ru; + server_name testeadmin.dot-dot.ru; return 301 https://$server_name$request_uri; } server { listen 443 ssl ; - server_name testaadmin.dot-dot.ru; + server_name testeadmin.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/testaadmin.dot-dot.ru_access.log json; - error_log /var/log/nginx/testaadmin.dot-dot.ru_error.log; + access_log /var/log/nginx/testeadmin.dot-dot.ru_access.log json; + error_log /var/log/nginx/testeadmin.dot-dot.ru_error.log; location / { - proxy_pass https://testa-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 866773d..b3227b4 100644 --- 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 18c6922..c7a66cf 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: