Compare commits

...

19 Commits
http ... master

Author SHA1 Message Date
b9a7b392d0 fix 2024-03-22 13:29:49 +03:00
a538743f67 chane file fix 2024-03-22 13:27:53 +03:00
7f7d7035e6 more headers 2024-03-22 13:24:12 +03:00
1c0441eb4b add git.inno... 2024-03-22 12:55:55 +03:00
965c831313 proxy_set_header Host $host 2024-02-19 16:21:53 +03:00
923d50054b multy middle 2024-02-19 14:24:56 +03:00
fb6d28bb33 subdomain 2 end 2024-02-17 23:06:28 +03:00
0a928447b0 sirius 2023-11-21 20:29:52 +03:00
a1ede6401f ms 2023-08-01 13:32:55 +03:00
177df76764 hub ssh port 2023-07-30 15:52:36 +03:00
bb962c6c9b fix 2023-07-27 23:10:26 +03:00
5de55a05aa comment servise 2023-07-27 23:09:28 +03:00
f4130d64fa service added 2023-07-27 23:04:33 +03:00
fbc0feb1bf mentor 2023-02-19 23:35:02 +03:00
e751f0f3a9 add devops as subdomain 2023-01-04 17:21:52 +03:00
098d69a0b8 other sert 2022-09-14 18:04:25 +03:00
84f1096bde add hub 2022-09-14 18:01:55 +03:00
2552bb3f54 fix cms upstream 2022-05-22 19:46:45 +03:00
deedaa8b42 slash cms 2022-05-22 19:43:28 +03:00
3 changed files with 193 additions and 62 deletions

226
443.conf
View File

@ -11,40 +11,6 @@
# return 301 https://$subdomain.inno-js.ru$request_uri; # return 301 https://$subdomain.inno-js.ru$request_uri;
# } # }
server {
# listen 80;
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name ^inno-js\.ru$;
index index.php index.html index.htm index.nginx-debian.html;
ssl_certificate /etc/letsencrypt/live/inno-js.ru/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/inno-js.ru/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/inno-js.ru/chain.pem;
include /etc/nginx/snippets/ssl-params.conf;
include "parts/api-multystub.conf";
root "/var/www/html";
location /project {
add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
alias "/home/ijl/ijl/project/";
}
# location / {
# add_header 'Access-Control-Allow-Origin' '*';
# add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
# add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
# add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
# proxy_pass http://212.193.59.173:8079/;
# }
}
server { server {
# listen 80; # listen 80;
listen 443 ssl http2; listen 443 ssl http2;
@ -65,11 +31,83 @@ server {
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range'; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
proxy_pass http://212.193.59.173:8078/; proxy_set_header Host $host;
proxy_pass http://212.193.59.173:8046/;
# proxy_pass http://35.193.122.195/; # proxy_pass http://35.193.122.195/;
} }
} }
server {
# listen 80;
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name hub.inno-js.ru;
ssl_certificate /etc/letsencrypt/live/hub.inno-js.ru/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/hub.inno-js.ru/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/hub.inno-js.ru/chain.pem;
include /etc/nginx/snippets/ssl-params.conf;
location / {
add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
proxy_set_header Host $host;
proxy_pass http://85.143.175.152:10880/;
# proxy_pass http://35.193.122.195/;
}
}
server {
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name git.inno-js.ru;
ssl_certificate /etc/letsencrypt/live/inno-js.ru-0001/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/inno-js.ru-0001/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/inno-js.ru-0001/chain.pem;
include /etc/nginx/snippets/ssl-params.conf;
location / {
add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
proxy_set_header Connection $http_connection;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://85.143.175.152:3000/;
# proxy_pass http://35.193.122.195/;
}
}
server {
# listen 80;
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name devops.inno-js.ru;
ssl_certificate /etc/letsencrypt/live/hub.inno-js.ru/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/hub.inno-js.ru/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/hub.inno-js.ru/chain.pem;
include /etc/nginx/snippets/ssl-params.conf;
location / {
proxy_set_header Host $host;
proxy_pass http://212.193.57.252:80/;
}
}
server { server {
# listen 80; # listen 80;
listen 443 ssl http2; listen 443 ssl http2;
@ -93,7 +131,63 @@ server {
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range'; add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range'; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
proxy_pass http://212.193.59.173:8075/; proxy_set_header Host $host;
proxy_pass http://212.193.59.173:8046/;
}
}
server {
# listen 80;
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name mentor.inno-js.ru;
ssl_certificate /etc/letsencrypt/live/inno-js.ru-0001/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/inno-js.ru-0001/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/inno-js.ru-0001/chain.pem;
# ssl_prefer_server_ciphers on;
ssl_verify_client off;
include "parts/api-multystub.conf";
include /etc/nginx/snippets/ssl-params.conf;
location / {
add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
proxy_pass http://212.193.59.173:8046/;
proxy_set_header Host $host;
}
}
server {
# listen 80;
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name service.inno-js.ru;
ssl_certificate /etc/letsencrypt/live/inno-js.ru-0001/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/inno-js.ru-0001/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/inno-js.ru-0001/chain.pem;
# ssl_prefer_server_ciphers on;
ssl_verify_client off;
include "parts/api-multystub.conf";
include /etc/nginx/snippets/ssl-params.conf;
location / {
add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
proxy_set_header Host $host;
proxy_pass http://212.193.59.173:8046/;
# proxy_pass http://212.193.63.122:8079/;
} }
} }
@ -119,32 +213,6 @@ server {
} }
} }
server {
# listen 80;
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name old.admin.inno-js.ru;
ssl_certificate /etc/letsencrypt/live/inno-js.ru/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/inno-js.ru/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/inno-js.ru/chain.pem;
include /etc/nginx/snippets/ssl-params.conf;
location / {
proxy_pass http://admin/;
}
}
# server {
# listen 80;
# server_name admin.inno-js.ru;
# location / {
# proxy_pass http://212.193.59.173:3072;
# }
# }
server { server {
# listen 80; # listen 80;
@ -190,3 +258,37 @@ server {
# server_name alinakhaff.inno-js.ru; # server_name alinakhaff.inno-js.ru;
# root /home/ijl/ijl/apps/alinakhaff; # root /home/ijl/ijl/apps/alinakhaff;
# } # }
server {
# listen 80;
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name ^inno-js\.ru$;
index index.php index.html index.htm index.nginx-debian.html;
ssl_certificate /etc/letsencrypt/live/inno-js.ru/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/inno-js.ru/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/inno-js.ru/chain.pem;
include /etc/nginx/snippets/ssl-params.conf;
include "parts/api-multystub.conf";
root "/var/www/html";
location /project {
add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
alias "/home/ijl/ijl/project/";
}
# location / {
# add_header 'Access-Control-Allow-Origin' '*';
# add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
# add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
# add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
# proxy_pass http://212.193.59.173:8079/;
# }
}

View File

@ -33,6 +33,10 @@ http {
server 212.193.59.173:8043; server 212.193.59.173:8043;
} }
upstream ms {
server 212.193.59.173:8044;
}
upstream red_coder { upstream red_coder {
server 212.193.59.173:8045; server 212.193.59.173:8045;
} }
@ -41,6 +45,10 @@ http {
server 212.193.59.173:8090; server 212.193.59.173:8090;
} }
upstream cms {
server 212.193.55.249:8045;
}
# server { # server {
# listen 8080; # listen 8080;
# # server_name inno-js.ru; # # server_name inno-js.ru;

View File

@ -14,6 +14,14 @@ location /multystub/ {
proxy_pass http://multystub/; proxy_pass http://multystub/;
} }
location /ms/ {
# add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
proxy_pass http://ms/;
}
location /red-coder/ { location /red-coder/ {
# add_header 'Access-Control-Allow-Origin' '*'; # add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
@ -22,6 +30,19 @@ location /red-coder/ {
proxy_pass http://red_coder/; proxy_pass http://red_coder/;
} }
location /cms/ {
# add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range';
proxy_pass http://cms/;
}
location /sirius-x/attendance/ {
proxy_pass http://sirius.inno-js.ru:3002/;
proxy_set_header X-Forwarded-Proto $scheme;
}
location /socket.io/ { location /socket.io/ {
proxy_pass http://websocket; proxy_pass http://websocket;