light weight + admin2
This commit is contained in:
parent
5823de394e
commit
c3412a3dd8
92
80.conf
92
80.conf
@ -3,21 +3,21 @@ server {
|
||||
server_name inno-ijl.ru;
|
||||
# index index.php index.html index.htm index.nginx-debian.html;
|
||||
|
||||
location /api/ {
|
||||
# add_header 'Access-Control-Allow-Origin' '*';
|
||||
# location /api/ {
|
||||
# # 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://backend/;
|
||||
# }
|
||||
|
||||
# location /multystub/ {
|
||||
# # 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://backend/;
|
||||
}
|
||||
|
||||
location /multystub/ {
|
||||
# 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://multystub/;
|
||||
}
|
||||
# proxy_pass http://multystub/;
|
||||
# }
|
||||
|
||||
location / {
|
||||
add_header 'Access-Control-Allow-Origin' '*';
|
||||
@ -32,13 +32,7 @@ server {
|
||||
listen 80;
|
||||
server_name b1.inno-ijl.ru;
|
||||
|
||||
location /api/ {
|
||||
proxy_pass http://backend/;
|
||||
}
|
||||
|
||||
location /multystub/ {
|
||||
proxy_pass http://multystub/;
|
||||
}
|
||||
include "parts/api-multystub.conf"
|
||||
|
||||
location / {
|
||||
add_header 'Access-Control-Allow-Origin' '*';
|
||||
@ -72,54 +66,30 @@ server {
|
||||
proxy_pass http://admin/;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
index index.php index.html index.htm index.nginx-debian.html;
|
||||
server_name khv-sanek.inno-ijl.ru;
|
||||
root /home/ijl/ijl/apps/xxl;
|
||||
server_name admin2.inno-ijl.ru;
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ =404;
|
||||
index index.html;
|
||||
}
|
||||
|
||||
location ~ \.php$ {
|
||||
include fastcgi-php.conf;
|
||||
fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
|
||||
proxy_pass http://89.223.94.192:3072;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
index index.php index.html index.htm index.nginx-debian.html;
|
||||
server_name victorina.inno-ijl.ru;
|
||||
root /home/ijl/ijl/apps/petrus/dist;
|
||||
# server {
|
||||
# listen 80;
|
||||
# index index.php index.html index.htm index.nginx-debian.html;
|
||||
# server_name victorina.inno-ijl.ru;
|
||||
# root /home/ijl/ijl/apps/petrus/dist;
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ /index.html;
|
||||
}
|
||||
}
|
||||
# location / {
|
||||
# try_files $uri $uri/ /index.html;
|
||||
# }
|
||||
# }
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
index index.php index.html index.htm index.nginx-debian.html;
|
||||
server_name alexei.inno-ijl.ru;
|
||||
root /home/ijl/ijl/apps/alexei;
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ =404;
|
||||
index index.html;
|
||||
}
|
||||
|
||||
location ~ \.php$ {
|
||||
include fastcgi-php.conf;
|
||||
fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
index index.html;
|
||||
server_name alinakhaff.inno-ijl.ru;
|
||||
root /home/ijl/ijl/apps/alinakhaff;
|
||||
}
|
||||
# server {
|
||||
# listen 80;
|
||||
# index index.html;
|
||||
# server_name alinakhaff.inno-ijl.ru;
|
||||
# root /home/ijl/ijl/apps/alinakhaff;
|
||||
# }
|
2
docker up.sh
Normal file
2
docker up.sh
Normal file
@ -0,0 +1,2 @@
|
||||
docker container run --name jenkins-docker --detach --privileged --network jenkins --network-alias docker --env DOCKER_TLS_CERTDIR=/certs --volume jenkins-docker-certs:/certs/client --volume jenkins-data:/var/jenkins_home --publish 2376:2376 docker:dind;
|
||||
docker container run --name jenkins-blueocean --detach --network jenkins --env DOCKER_HOST=tcp://docker:2376 --env DOCKER_CERT_PATH=/certs/client --env DOCKER_TLS_VERIFY=1 --publish 8080:8080 --publish 50000:50000 --volume jenkins-data:/var/jenkins_home --volume jenkins-docker-certs:/certs/client:ro jenkinsci/blueocean;
|
54
nginx.conf
54
nginx.conf
@ -27,38 +27,38 @@ http {
|
||||
server 89.223.94.192:8090;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 8080;
|
||||
# server_name inno-ijl.ru;
|
||||
# index index.php index.html index.htm index.nginx-debian.html;
|
||||
# server {
|
||||
# listen 8080;
|
||||
# # server_name inno-ijl.ru;
|
||||
# # index index.php index.html index.htm index.nginx-debian.html;
|
||||
|
||||
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://89.223.94.192:8079/;
|
||||
}
|
||||
# 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://89.223.94.192:8079/;
|
||||
# }
|
||||
|
||||
location /api {
|
||||
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://backend;
|
||||
}
|
||||
# location /api {
|
||||
# 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://backend;
|
||||
# }
|
||||
|
||||
location /multystub/ {
|
||||
#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://multystub/;
|
||||
}
|
||||
}
|
||||
# location /multystub/ {
|
||||
# #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://multystub/;
|
||||
# }
|
||||
# }
|
||||
|
||||
# include ./83-php.conf;
|
||||
include 3002-apps-static.conf;
|
||||
# include 3002-apps-static.conf;
|
||||
include 80.conf;
|
||||
}
|
||||
|
||||
|
15
parts/api-miltystub.conf
Normal file
15
parts/api-miltystub.conf
Normal file
@ -0,0 +1,15 @@
|
||||
location /api/ {
|
||||
# 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://backend/;
|
||||
}
|
||||
|
||||
location /multystub/ {
|
||||
# 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://multystub/;
|
||||
}
|
Loading…
Reference in New Issue
Block a user