From fa6a17103255cae5028df4a94c93cb7a51d103b1 Mon Sep 17 00:00:00 2001 From: skeris Date: Mon, 15 Jul 2024 13:03:42 +0300 Subject: [PATCH] amo integration release --- default.conf | 425 ++++++++++++++++++++++++++- deployments/main/docker-compose.yaml | 1 + 2 files changed, 424 insertions(+), 2 deletions(-) diff --git a/default.conf b/default.conf index 67af84f..148fb10 100644 --- a/default.conf +++ b/default.conf @@ -39,6 +39,34 @@ server { proxy_pass http://10.8.0.9:1490/; } + + location /answer/v1.0.0/ { + 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; + + 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,x-sessionkey,device,browser,os,devicetype,response-type always; + add_header Access-Control-Expose-Headers x-sessionkey,devicetype 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,x-sessionkey,device,browser,os,devicetype,response-type always; + add_header Access-Control-Expose-Headers x-sessionkey,devicetype always; + add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; + + proxy_pass http://10.8.0.9:1491/; + } location /squizimages { add_header Access-Control-Allow-Origin $http_origin always; @@ -116,6 +144,20 @@ server { proxy_cache off; proxy_pass https://10.8.0.8:1488/; } + location /heruvym/v1.0.0/ { + add_header Access-Control-Allow-Origin quiz.pena.digital always; + add_header Access-Control-Allow-Credentials true always; + add_header Access-Control-Allow-Headers content-type,authorization,sess,response-type 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 https://10.8.0.8:1487/; + } location /strator/ { add_header Access-Control-Allow-Origin quiz.pena.digital always; @@ -132,6 +174,16 @@ server { add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; proxy_pass http://10.8.0.8:8065/; } + location /customer/v1.0.0/ { + add_header Access-Control-Allow-Origin quiz.pena.digital always; + add_header Access-Control-Allow-Credentials true always; + add_header Access-Control-Allow-Headers content-type,authorization,response-type always; + add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Client-Port $remote_port; + proxy_set_header Origin $host; + proxy_pass http://10.8.0.8:8066/; + } location /codeword/ { add_header Access-Control-Allow-Origin quiz.pena.digital always; @@ -140,6 +192,16 @@ server { add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; proxy_pass http://10.8.0.8:59664/; } + location /codeword/v1.0.0/ { + add_header Access-Control-Allow-Origin quiz.pena.digital always; + add_header Access-Control-Allow-Credentials true always; + add_header Access-Control-Allow-Headers content-type,authorization,response-type always; + add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Client-Port $remote_port; + proxy_set_header Origin $host; + proxy_pass http://10.8.0.8:59666/; + } location /price/ { add_header Access-Control-Allow-Origin quiz.pena.digital always; @@ -169,6 +231,74 @@ server { proxy_pass http://10.8.0.9:1490/; } + location /answer/v1.0.0/ { + 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; + + 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,x-sessionkey,device,browser,os,devicetype,response-type always; + add_header Access-Control-Expose-Headers x-sessionkey,devicetype 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,x-sessionkey,device,browser,os,devicetype,response-type always; + add_header Access-Control-Expose-Headers x-sessionkey,devicetype always; + add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; + + proxy_pass http://10.8.0.9:1491/; + } + location /squiz/amocrm/ { + + 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; + + if ($request_method = OPTIONS) { + return 200; + } + + proxy_pass http://10.8.0.9:1492/amocrm/; + } + location /squiz/amocrm/oauth/ { + + 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; + + 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,device,browser,os,devicetype,response-type 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,device,browser,os,devicetype,response-type always; + add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; + proxy_pass http://10.8.0.9:1492/webhook/create/; + } + + location /squiz/ { add_header Access-Control-Allow-Origin quiz.pena.digital always; add_header Access-Control-Allow-Credentials true always; @@ -191,6 +321,23 @@ server { proxy_cache off; proxy_pass http://10.8.0.9:1489/; } + location /squizstorer/v1.0.0/ { + add_header Access-Control-Allow-Origin quiz.pena.digital always; + add_header Access-Control-Allow-Credentials true always; + add_header Access-Control-Allow-Headers content-type,authorization,response-type 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_set_header X-Real-IP $remote_addr; + proxy_set_header X-Client-Port $remote_port; + proxy_set_header Origin $host; + proxy_http_version 1.1; + chunked_transfer_encoding off; + proxy_buffering off; + proxy_cache off; + proxy_pass http://10.8.0.9:1589/; + } location /squizimages { add_header Access-Control-Allow-Origin quiz.pena.digital always; @@ -264,6 +411,23 @@ server { proxy_cache off; proxy_pass https://10.8.0.8:1488/; } + location /heruvym/v1.0.0/ { + add_header Access-Control-Allow-Origin quiz.pena.digital always; + add_header Access-Control-Allow-Credentials true always; + add_header Access-Control-Allow-Headers content-type,authorization,sess,response-type 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_set_header X-Real-IP $remote_addr; + proxy_set_header X-Client-Port $remote_port; + proxy_set_header Origin $host; + proxy_http_version 1.1; + chunked_transfer_encoding off; + proxy_buffering off; + proxy_cache off; + proxy_pass https://10.8.0.8:1487/; + } location /strator/ { add_header Access-Control-Allow-Origin penaquiz.online always; @@ -280,6 +444,16 @@ server { add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; proxy_pass http://10.8.0.8:8065/; } + location /customer/v1.0.0/ { + add_header Access-Control-Allow-Origin quiz.pena.digital always; + add_header Access-Control-Allow-Credentials true always; + add_header Access-Control-Allow-Headers content-type,authorization,response-type always; + add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Client-Port $remote_port; + proxy_set_header Origin $host; + proxy_pass http://10.8.0.8:8066/; + } location /codeword/ { add_header Access-Control-Allow-Origin penaquiz.online always; @@ -288,6 +462,16 @@ server { add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; proxy_pass http://10.8.0.8:59664/; } + location /codeword/v1.0.0/ { + add_header Access-Control-Allow-Origin quiz.pena.digital always; + add_header Access-Control-Allow-Credentials true always; + add_header Access-Control-Allow-Headers content-type,authorization,response-type always; + add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Client-Port $remote_port; + proxy_set_header Origin $host; + proxy_pass http://10.8.0.8:59666/; + } location /price/ { add_header Access-Control-Allow-Origin penaquiz.online always; @@ -316,6 +500,72 @@ server { add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; proxy_pass http://10.8.0.9:1490/; } + location /answer/v1.0.0/ { + 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; + + 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,x-sessionkey,device,browser,os,devicetype,response-type always; + add_header Access-Control-Expose-Headers x-sessionkey,devicetype 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,x-sessionkey,device,browser,os,devicetype,response-type always; + add_header Access-Control-Expose-Headers x-sessionkey,devicetype always; + add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; + + proxy_pass http://10.8.0.9:1491/; + } + location /squiz/amocrm/ { + + 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; + + if ($request_method = OPTIONS) { + return 200; + } + + proxy_pass http://10.8.0.9:1492/amocrm/; + } + location /squiz/amocrm/oauth/ { + + 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; + + 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,device,browser,os,devicetype,response-type 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,device,browser,os,devicetype,response-type always; + add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; + proxy_pass http://10.8.0.9:1492/webhook/create/; + } location /squiz/ { add_header Access-Control-Allow-Origin penaquiz.online always; @@ -339,6 +589,23 @@ server { proxy_cache off; proxy_pass http://10.8.0.9:1489/; } + location /squizstorer/v1.0.0/ { + add_header Access-Control-Allow-Origin quiz.pena.digital always; + add_header Access-Control-Allow-Credentials true always; + add_header Access-Control-Allow-Headers content-type,authorization,response-type 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_set_header X-Real-IP $remote_addr; + proxy_set_header X-Client-Port $remote_port; + proxy_set_header Origin $host; + proxy_http_version 1.1; + chunked_transfer_encoding off; + proxy_buffering off; + proxy_cache off; + proxy_pass http://10.8.0.9:1589/; + } location /squizimages { add_header Access-Control-Allow-Origin penaquiz.online always; @@ -412,6 +679,20 @@ server { proxy_cache off; proxy_pass https://10.8.0.8:1488/; } + location /heruvym/v1.0.0/ { + add_header Access-Control-Allow-Origin quiz.pena.digital always; + add_header Access-Control-Allow-Credentials true always; + add_header Access-Control-Allow-Headers content-type,authorization,sess,response-type 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 https://10.8.0.8:1487/; + } location /strator/ { add_header Access-Control-Allow-Origin penaquiz.ru always; @@ -428,6 +709,16 @@ server { add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; proxy_pass http://10.8.0.8:8065/; } + location /customer/v1.0.0/ { + add_header Access-Control-Allow-Origin quiz.pena.digital always; + add_header Access-Control-Allow-Credentials true always; + add_header Access-Control-Allow-Headers content-type,authorization,response-type always; + add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Client-Port $remote_port; + proxy_set_header Origin $host; + proxy_pass http://10.8.0.8:8066/; + } location /codeword/ { add_header Access-Control-Allow-Origin penaquiz.ru always; @@ -436,6 +727,16 @@ server { add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; proxy_pass http://10.8.0.8:59664/; } + location /codeword/v1.0.0/ { + add_header Access-Control-Allow-Origin quiz.pena.digital always; + add_header Access-Control-Allow-Credentials true always; + add_header Access-Control-Allow-Headers content-type,authorization,response-type always; + add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Client-Port $remote_port; + proxy_set_header Origin $host; + proxy_pass http://10.8.0.8:59666/; + } location /price/ { add_header Access-Control-Allow-Origin penaquiz.ru always; @@ -464,7 +765,73 @@ server { add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; proxy_pass http://10.8.0.9:1490/; } + location /answer/v1.0.0/ { + 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; + 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,x-sessionkey,device,browser,os,devicetype,response-type always; + add_header Access-Control-Expose-Headers x-sessionkey,devicetype 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,x-sessionkey,device,browser,os,devicetype,response-type always; + add_header Access-Control-Expose-Headers x-sessionkey,devicetype always; + add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; + + proxy_pass http://10.8.0.9:1491/; + } + + location /squiz/amocrm/ { + + 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; + + if ($request_method = OPTIONS) { + return 200; + } + + proxy_pass http://10.8.0.9:1492/amocrm/; + } + location /squiz/amocrm/oauth/ { + + 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; + + 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,device,browser,os,devicetype,response-type 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,device,browser,os,devicetype,response-type always; + add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; + proxy_pass http://10.8.0.9:1492/webhook/create/; + } location /squiz/ { add_header Access-Control-Allow-Origin penaquiz.ru always; add_header Access-Control-Allow-Credentials true always; @@ -487,6 +854,23 @@ server { proxy_cache off; proxy_pass http://10.8.0.9:1489/; } + location /squizstorer/v1.0.0/ { + add_header Access-Control-Allow-Origin quiz.pena.digital always; + add_header Access-Control-Allow-Credentials true always; + add_header Access-Control-Allow-Headers content-type,authorization,response-type 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_set_header X-Real-IP $remote_addr; + proxy_set_header X-Client-Port $remote_port; + proxy_set_header Origin $host; + proxy_http_version 1.1; + chunked_transfer_encoding off; + proxy_buffering off; + proxy_cache off; + proxy_pass http://10.8.0.9:1589/; + } location /squizimages { add_header Access-Control-Allow-Origin penaquiz.ru always; @@ -579,6 +963,20 @@ server { proxy_cache off; proxy_pass https://10.8.0.8:1488/; } + location /heruvym/v1.0.0/ { + add_header Access-Control-Allow-Origin quiz.pena.digital always; + add_header Access-Control-Allow-Credentials true always; + add_header Access-Control-Allow-Headers content-type,authorization,sess,response-type 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 https://10.8.0.8:1487/; + } location /strator/ { add_header Access-Control-Allow-Origin hub.pena.digital always; @@ -595,6 +993,16 @@ server { add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; proxy_pass http://10.8.0.8:8065/; } + location /customer/v1.0.0/ { + add_header Access-Control-Allow-Origin quiz.pena.digital always; + add_header Access-Control-Allow-Credentials true always; + add_header Access-Control-Allow-Headers content-type,authorization,response-type always; + add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Client-Port $remote_port; + proxy_set_header Origin $host; + proxy_pass http://10.8.0.8:8066/; + } location /codeword/ { add_header Access-Control-Allow-Origin hub.pena.digital always; @@ -603,6 +1011,16 @@ server { add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; proxy_pass http://10.8.0.8:59664/; } + location /codeword/v1.0.0/ { + add_header Access-Control-Allow-Origin quiz.pena.digital always; + add_header Access-Control-Allow-Credentials true always; + add_header Access-Control-Allow-Headers content-type,authorization,response-type always; + add_header Access-Control-Allow-Methods OPTIONS,GET,POST,PATCH,PUT,DELETE; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Client-Port $remote_port; + proxy_set_header Origin $host; + proxy_pass http://10.8.0.8:59666/; + } location /price/ { add_header Access-Control-Allow-Origin hub.pena.digital always; @@ -623,7 +1041,7 @@ server { proxy_pass https://storage.yandexcloud.net; } - location /verification/ { + location /verification/v1.0.0/ { add_header Access-Control-Allow-Origin hub.pena.digital always; add_header Access-Control-Allow-Credentials true always; add_header Access-Control-Allow-Headers content-type,authorization,response-type always; @@ -631,11 +1049,14 @@ server { proxy_set_header Referer $host; proxy_set_header Origin $http_origin; proxy_set_header Connection ''; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Client-Port $remote_port; + proxy_set_header Origin $host; proxy_http_version 1.1; chunked_transfer_encoding off; proxy_buffering off; proxy_cache off; - proxy_pass http://10.8.0.8:7035/; + proxy_pass http://10.8.0.8:7037/; } listen 443 ssl; # managed by Certbot diff --git a/deployments/main/docker-compose.yaml b/deployments/main/docker-compose.yaml index 7bd224e..449a527 100644 --- a/deployments/main/docker-compose.yaml +++ b/deployments/main/docker-compose.yaml @@ -1,3 +1,4 @@ +version: "3" services: router: image: $CI_REGISTRY_IMAGE/main:$CI_COMMIT_REF_SLUG.$CI_PIPELINE_ID