diff --git a/3002-apps-static.conf b/3002-apps-static.conf new file mode 100644 index 0000000..65d474a --- /dev/null +++ b/3002-apps-static.conf @@ -0,0 +1,28 @@ +server { + listen 3002; + server_name localhost; + set $appsRoot "/home/ijl/ijl/apps"; + root $appsRoot; + + 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'; + index index.html index.htm; + alias "$appsRoot/uds-middle/dist/"; + } + + location /static/ { + 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 "$appsRoot/"; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } +} \ No newline at end of file diff --git a/80.conf b/80.conf new file mode 100644 index 0000000..336aa6a --- /dev/null +++ b/80.conf @@ -0,0 +1,85 @@ +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; + + 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; + 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.91.151: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 /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/; + } +} + +server { + listen 80; + server_name static.inno-ijl.ru; + set $appsRoot "/home/ijl/ijl/apps"; + root $appsRoot; + + 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'; + alias "$appsRoot/"; + } +} + +server { + listen 80; + server_name admin.inno-ijl.ru; + + location / { + proxy_pass http://admin/; + } +} + +server { + listen 80; + server_name chat.inno-ijl.ru; + + location / { + proxy_pass http://chat/; + } +} \ No newline at end of file diff --git a/83-php.conf b/83-php.conf new file mode 100644 index 0000000..18aea63 --- /dev/null +++ b/83-php.conf @@ -0,0 +1,19 @@ +server { + listen 83; + root /home/ijl/; + index index.php index.html index.htm index.nginx-debian.html; + server_name localhost; + + location / { + try_files $uri $uri/ =404; + } + + location ~ \.php$ { + include fastcgi-php.conf; + fastcgi_pass unix:/var/run/php/php7.2-fpm.sock; + } + + location ~ /\.ht { + deny all; + } +} \ No newline at end of file diff --git a/nginx.conf b/nginx.conf index 0277242..33324f2 100644 --- a/nginx.conf +++ b/nginx.conf @@ -9,6 +9,7 @@ http { resolver 127.0.0.1; include mime.types; default_type application/octet-stream; + sendfile on; keepalive_timeout 10; @@ -30,94 +31,11 @@ http { server 89.223.91.151:8081; } -# server { -# listen 81; -# server_name localhost; -# root /home/ijl/ijl/apps/lavr/master; -# -# location / { -# index index.html; -# } -# } - 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; - - 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 82; - #index index.php index.html index.htm index.nginx-debian.html; - # server_name inno-ijl.online inno-ijl.ru; - server_name localhost; - #root /home/ijl/ijl/apps/other; - - location / { - root /home/ijl/ijl/apps/other; - index index.html; - #try_files $uri $uri/ =404; - } - - location ~ \.php$ { - include fastcgi-php.conf; - fastcgi_pass unix:/var/run/php/php7.2-fpm.sock; - } - - location ~ /\.ht { - deny all; - } - } - - server { - listen 8080; - #server_name inno-ijl.online 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.91.151: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 /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/; - } - } - server { - listen 80; - server_name inno-ijl.online inno-ijl.ru; + 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'; @@ -127,106 +45,25 @@ http { } 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/; - } - } - - server { - listen 83; - root /home/ijl/; - index index.php index.html index.htm index.nginx-debian.html; - server_name localhost; - - location / { - try_files $uri $uri/ =404; - } - - location ~ \.php$ { - include fastcgi-php.conf; - fastcgi_pass unix:/var/run/php/php7.2-fpm.sock; - } - - location ~ /\.ht { - deny all; - } - } - - server { - listen 3002; - server_name localhost; - set $udsRoot "/home/ijl/ijl/apps"; - root $udsRoot; - - # index.html bootstrap - 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'; - index index.html index.htm; - alias "$udsRoot/uds-middle/dist/"; + proxy_pass http://backend; } - # index.html bootstrap - location /static/ { - add_header 'Access-Control-Allow-Origin' '*'; - add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; + 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'; - alias "$udsRoot/"; - # alias "$udsRoot/bootstrap/dist/index.js"; - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root html; + proxy_pass http://multystub/; } } - server { - listen 80; - server_name static.inno-ijl.online static.inno-ijl.ru; - set $appsRoot "/home/ijl/ijl/apps"; - root $appsRoot; - - 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'; - alias "$appsRoot/"; - } - } - - server { - listen 80; - server_name admin.inno-ijl.online admin.inno-ijl.ru; - - location / { - proxy_pass http://admin/; - } - } - - server { - listen 80; - server_name chat.inno-ijl.ru; - - location / { - proxy_pass http://chat/; - } - } + include ./83-php.conf; + include 3002-apps-static.conf; + include 80.conf; }