diff --git a/3002-apps-static.conf b/3002-apps-static.conf index e069802..55655ce 100644 --- a/3002-apps-static.conf +++ b/3002-apps-static.conf @@ -13,13 +13,6 @@ server { alias "$appsRoot/uds-middle/dist/"; } - 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 /static/ { add_header 'Access-Control-Allow-Origin' '*'; diff --git a/80.conf b/80.conf index 2f7f441..c765e86 100644 --- a/80.conf +++ b/80.conf @@ -1,27 +1,3 @@ -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; @@ -74,12 +50,26 @@ 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; + + 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; - server_name chat.inno-ijl.ru; - - location / { - proxy_pass http://chat/; - } + index index.html; + server_name alinakhaff.inno-ijl.ru; + root /home/ijl/ijl/apps/alinakhaff; } \ No newline at end of file diff --git a/nginx.conf b/nginx.conf index 37ec3d8..a1284dc 100644 --- a/nginx.conf +++ b/nginx.conf @@ -10,7 +10,6 @@ http { include mime.types; default_type application/octet-stream; - sendfile on; keepalive_timeout 10; server_names_hash_bucket_size 64; @@ -27,10 +26,6 @@ http { server 89.223.94.192:8090; } - upstream chat { - server 89.223.94.192:8081; - } - server { listen 8080; # server_name inno-ijl.ru;