Compare commits
22 Commits
back-to-ht
...
master
Author | SHA1 | Date | |
---|---|---|---|
b9a7b392d0 | |||
a538743f67 | |||
7f7d7035e6 | |||
1c0441eb4b | |||
965c831313 | |||
923d50054b | |||
fb6d28bb33 | |||
0a928447b0 | |||
a1ede6401f | |||
177df76764 | |||
bb962c6c9b | |||
5de55a05aa | |||
f4130d64fa | |||
fbc0feb1bf | |||
e751f0f3a9 | |||
098d69a0b8 | |||
84f1096bde | |||
2552bb3f54 | |||
deedaa8b42 | |||
1a9a61bf98 | |||
f858c7949d | |||
19b937f45a |
228
443.conf
228
443.conf
@ -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,8 +31,80 @@ 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://35.193.122.195/;
|
proxy_pass http://212.193.59.173:8046/;
|
||||||
|
# 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/;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -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/;
|
||||||
|
# }
|
||||||
|
}
|
30
80.conf
30
80.conf
@ -57,8 +57,8 @@ 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_pass http://212.193.59.173:8078/;
|
||||||
proxy_pass http://35.193.122.195/;
|
# proxy_pass http://35.193.122.195/;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -111,23 +111,23 @@ server {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# server {
|
server {
|
||||||
# listen 80;
|
listen 80;
|
||||||
# # listen 443 ssl http2;
|
# listen 443 ssl http2;
|
||||||
# # listen [::]:443 ssl http2;
|
# listen [::]:443 ssl http2;
|
||||||
|
|
||||||
# server_name old.admin.inno-js.ru;
|
server_name old.admin.inno-js.ru;
|
||||||
|
|
||||||
# # ssl_certificate /etc/letsencrypt/live/inno-js.ru/fullchain.pem;
|
# ssl_certificate /etc/letsencrypt/live/inno-js.ru/fullchain.pem;
|
||||||
# # ssl_certificate_key /etc/letsencrypt/live/inno-js.ru/privkey.pem;
|
# ssl_certificate_key /etc/letsencrypt/live/inno-js.ru/privkey.pem;
|
||||||
# # ssl_trusted_certificate /etc/letsencrypt/live/inno-js.ru/chain.pem;
|
# ssl_trusted_certificate /etc/letsencrypt/live/inno-js.ru/chain.pem;
|
||||||
|
|
||||||
# # include /etc/nginx/snippets/ssl-params.conf;
|
# include /etc/nginx/snippets/ssl-params.conf;
|
||||||
|
|
||||||
# location / {
|
location / {
|
||||||
# proxy_pass http://admin/;
|
proxy_pass http://admin/;
|
||||||
# }
|
}
|
||||||
# }
|
}
|
||||||
|
|
||||||
# server {
|
# server {
|
||||||
# listen 80;
|
# listen 80;
|
||||||
|
14
nginx.conf
14
nginx.conf
@ -33,10 +33,22 @@ http {
|
|||||||
server 212.193.59.173:8043;
|
server 212.193.59.173:8043;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
upstream ms {
|
||||||
|
server 212.193.59.173:8044;
|
||||||
|
}
|
||||||
|
|
||||||
|
upstream red_coder {
|
||||||
|
server 212.193.59.173:8045;
|
||||||
|
}
|
||||||
|
|
||||||
upstream admin {
|
upstream admin {
|
||||||
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;
|
||||||
@ -70,7 +82,7 @@ http {
|
|||||||
# include ./83-php.conf;
|
# include ./83-php.conf;
|
||||||
# include 3002-apps-static.conf;
|
# include 3002-apps-static.conf;
|
||||||
include 80.conf;
|
include 80.conf;
|
||||||
# include 443.conf;
|
include 443.conf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -14,6 +14,35 @@ 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/ {
|
||||||
|
# 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://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;
|
||||||
|
Loading…
Reference in New Issue
Block a user