diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6eaa28a..e0fb9c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,6 @@ include: file: "/templates/docker/deploy-template.gitlab-ci.yml" stages: - clean - # - check - build - deploy clear-old-images: @@ -30,10 +29,11 @@ clear-old-images: # - frontbuild # image: # name: penahub.gitlab.yandexcloud.net:5050/devops/dockerhub-backup/nginx +# before_script: +# - cp /builds/frontend/nginx-proxy/nginx.conf /etc/nginx/nginx.conf +# - cp /builds/frontend/nginx-proxy/default.conf /etc/nginx/conf.d/default.conf # script: -# - pwd -# - ls -# - nginx -t -c /builds/frontend/nginx-proxy/default.conf +# - nginx -t # stage: check build-app: diff --git a/default.conf b/default.conf index 0ca2572..deea0e2 100644 --- a/default.conf +++ b/default.conf @@ -40,7 +40,7 @@ server { - location /auth// { + location /auth/ { if ($request_method = OPTIONS) { add_header Access-Control-Allow-Origin $http_origin always; add_header Access-Control-Allow-Credentials true always; @@ -120,7 +120,7 @@ server { - location /strator// { + location /strator/ { if ($request_method = OPTIONS) { add_header Access-Control-Allow-Origin $http_origin always; add_header Access-Control-Allow-Credentials true always; @@ -204,7 +204,7 @@ server { - location /treasurer// { + location /treasurer/ { if ($request_method = OPTIONS) { add_header Access-Control-Allow-Origin $http_origin always; add_header Access-Control-Allow-Credentials true always; @@ -232,7 +232,7 @@ server { - location /price// { + location /price/ { if ($request_method = OPTIONS) { add_header Access-Control-Allow-Origin $http_origin always; add_header Access-Control-Allow-Credentials true always; @@ -260,7 +260,7 @@ server { - location /feedback// { + location /feedback/ { if ($request_method = OPTIONS) { add_header Access-Control-Allow-Origin $http_origin always; add_header Access-Control-Allow-Credentials true always; @@ -288,7 +288,7 @@ server { - location /requestquiz// { + location /requestquiz/ { if ($request_method = OPTIONS) { add_header Access-Control-Allow-Origin $http_origin always; add_header Access-Control-Allow-Credentials true always; @@ -349,7 +349,7 @@ server { - location /pena-social-auth-service// { + location /pena-social-auth-service/ { if ($request_method = OPTIONS) { add_header Access-Control-Allow-Origin $http_origin always; add_header Access-Control-Allow-Credentials true always; @@ -384,7 +384,7 @@ server { - location /cbrfworker-service-staging// { + location /cbrfworker-service-staging/ { if ($request_method = OPTIONS) { add_header Access-Control-Allow-Origin $http_origin always; add_header Access-Control-Allow-Credentials true always; @@ -412,7 +412,7 @@ server { - location /squiz-amocrm// { + location /squiz-amocrm/ { if ($request_method = OPTIONS) { add_header Access-Control-Allow-Origin $http_origin always; add_header Access-Control-Allow-Credentials true always; @@ -522,7 +522,7 @@ server { - location /squiz// { + location /squiz/ { if ($request_method = OPTIONS) { add_header Access-Control-Allow-Origin $http_origin always; add_header Access-Control-Allow-Credentials true always;