diff --git a/admin.conf b/admin.conf index 22cdb42..eb312b2 100644 --- a/admin.conf +++ b/admin.conf @@ -24,7 +24,7 @@ server { proxy_pass http://10.6.0.11:59301; } if ($host != sadmin.pena) { - proxy_pass http://10.6.0.11:59300; + proxy_pass http://10.8.0.8:59300; } proxy_hide_header Access-Control-Allow-Origin; add_header Access-Control-Allow-Origin $http_origin always; @@ -42,11 +42,11 @@ server { add_header Access-Control-Allow-Credentials true always; add_header Access-Control-Allow-Headers content-type,authorization always; add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; - proxy_pass http://10.6.0.11:59300; + proxy_pass http://10.8.0.8:59300; } location /swagger/ { - proxy_pass http://10.6.0.11:59300/; + proxy_pass http://10.8.0.8:59300/; } location /heruvym/ { @@ -61,7 +61,7 @@ server { chunked_transfer_encoding off; proxy_buffering off; proxy_cache off; - proxy_pass https://10.6.0.11:1488/; + proxy_pass https://10.8.0.8:1488/; } location /strator/ { @@ -76,7 +76,7 @@ server { add_header Access-Control-Allow-Credentials true always; add_header Access-Control-Allow-Headers content-type,authorization always; add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; - proxy_pass http://10.6.0.11:59303/; + proxy_pass http://10.8.0.8:59303/; } location /customer/ { @@ -91,7 +91,7 @@ server { add_header Access-Control-Allow-Credentials true always; add_header Access-Control-Allow-Headers content-type,authorization always; add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; - proxy_pass http://10.6.0.11:8065/; + proxy_pass http://10.8.0.8:8065/; } location /codeword/ { @@ -106,61 +106,8 @@ server { add_header Access-Control-Allow-Credentials true always; add_header Access-Control-Allow-Headers content-type,authorization always; add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; - proxy_pass http://10.6.0.11:59664/; + proxy_pass http://10.8.0.8:59664/; } - - location /answer/ { - if ($request_method = OPTIONS) { - add_header Access-Control-Allow-Origin $http_origin always; - add_header Access-Control-Allow-Credentials true always; - add_header Access-Control-Allow-Headers content-type,authorization always; - add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; - return 200; - } - add_header Access-Control-Allow-Origin $http_origin always; - add_header Access-Control-Allow-Credentials true always; - add_header Access-Control-Allow-Headers content-type,authorization always; - add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; - proxy_pass http://10.6.0.23:1490/; - } - - location /squiz/ { - if ($request_method = OPTIONS) { - add_header Access-Control-Allow-Origin $http_origin always; - add_header Access-Control-Allow-Credentials true always; - add_header Access-Control-Allow-Headers content-type,authorization always; - add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; - return 200; - } - add_header Access-Control-Allow-Origin $http_origin always; - add_header Access-Control-Allow-Credentials true always; - add_header Access-Control-Allow-Headers content-type,authorization always; - add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; - proxy_pass http://10.6.0.23:1488/; - } - - location /squizstorer/ { - if ($request_method = OPTIONS) { - add_header Access-Control-Allow-Origin $http_origin always; - add_header Access-Control-Allow-Credentials true always; - add_header Access-Control-Allow-Headers content-type,authorization always; - add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; - return 200; - } - add_header Access-Control-Allow-Origin $http_origin always; - add_header Access-Control-Allow-Credentials true always; - add_header Access-Control-Allow-Headers content-type,authorization always; - add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; - proxy_set_header Referer $host; - proxy_set_header Origin $http_origin; - proxy_set_header Connection ''; - proxy_http_version 1.1; - chunked_transfer_encoding off; - proxy_buffering off; - proxy_cache off; - proxy_pass http://10.6.0.23:1489/; - } - location /price/ { if ($request_method = OPTIONS) { add_header Access-Control-Allow-Origin $http_origin always; @@ -173,20 +120,7 @@ server { add_header Access-Control-Allow-Credentials true always; add_header Access-Control-Allow-Headers content-type,authorization always; add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; - proxy_pass http://10.6.0.11:8001/; - } - location /feedback/ { - if ($request_method = OPTIONS) { - add_header Access-Control-Allow-Origin $http_origin always; - add_header Access-Control-Allow-Credentials true always; - add_header Access-Control-Allow-Headers content-type always; - return 200; - } - add_header Access-Control-Allow-Origin $http_origin always; - add_header Access-Control-Allow-Credentials true always; - add_header Access-Control-Allow-Headers content-type always; - proxy_set_header Host $host; - proxy_pass http://10.6.0.17:8006/; + proxy_pass http://10.8.0.8:8001/; } location /verification1 { if ($request_method = OPTIONS) { @@ -206,24 +140,6 @@ server { proxy_cache off; proxy_pass https://storage.yandexcloud.net; } - location /squizimages { - if ($request_method = OPTIONS) { - add_header Access-Control-Allow-Origin $http_origin always; - add_header Access-Control-Allow-Credentials true always; - add_header Access-Control-Allow-Headers content-type always; - add_header Access-Control-Allow-Methods GET; - - return 200; - } - add_header Access-Control-Allow-Origin $http_origin always; - add_header Access-Control-Allow-Credentials true always; - add_header Access-Control-Allow-Headers content-type always; - add_header Access-Control-Allow-Methods GET; - chunked_transfer_encoding off; - proxy_buffering off; - proxy_cache off; - proxy_pass https://storage.yandexcloud.net; - } location /verification/ { if ($request_method = OPTIONS) { add_header Access-Control-Allow-Origin $http_origin always; @@ -243,7 +159,7 @@ server { chunked_transfer_encoding off; proxy_buffering off; proxy_cache off; - proxy_pass http://10.6.0.17:7035/; + proxy_pass http://10.8.0.8:7035/; } diff --git a/deployments/main/docker-compose.yaml b/deployments/main/docker-compose.yaml index 8c8da21..f764f62 100644 --- a/deployments/main/docker-compose.yaml +++ b/deployments/main/docker-compose.yaml @@ -8,6 +8,6 @@ services: - default hostname: admin ports: - - 10.8.0.8:80:80 - - 10.8.0.8:443:443 + - 10.8.0.3:80:80 + - 10.8.0.3:443:443 tty: true