diff --git a/conf/includes/Archive.conf b/conf/includes/Archive.conf deleted file mode 100644 index 2c1e37a..0000000 --- a/conf/includes/Archive.conf +++ /dev/null @@ -1 +0,0 @@ -location / { proxy_pass http://localhost:5006; } \ No newline at end of file diff --git a/conf/includes/BaGet.conf b/conf/includes/BaGet.conf deleted file mode 100644 index dd8900e..0000000 --- a/conf/includes/BaGet.conf +++ /dev/null @@ -1,23 +0,0 @@ -location / -{ - proxy_pass http://localhost:5555; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection keep-alive; - proxy_set_header Host $http_host; - proxy_cache_bypass $http_upgrade; -} - -# sc create "Baget-5555" start= delayed-auto DisplayName="Baget-5555" binPath= "C:\Users\phares\AppData\Local\IFXApps\BaGet\src\BaGet\bin\Release\net6.0\win-x64\publish\BaGet.exe" obj= "infineon\phares" password= "" - -# $source = "C:\Users\ecphares\.nuget\packages" -# $destination = "http://localhost:5555/v3/index.json" -# & nuget.exe setapikey "ApiKey" -Source $destination -# $packages = nuget list -AllVersions -Source $source -# $packages | % { -# $id, $version = $_ -Split " " -# $nupkg = $id + "." + $version + ".nupkg" -# $path = [IO.Path]::Combine($source, $id, $version, $nupkg) -# Write-Host "nuget.exe push -Source $destination ""$path""" -# & nuget.exe push -Source $destination $path -# } \ No newline at end of file diff --git a/conf/includes/EAF-Viewer.Server.conf b/conf/includes/EAF-Viewer.Server.conf deleted file mode 100644 index 2c1e37a..0000000 --- a/conf/includes/EAF-Viewer.Server.conf +++ /dev/null @@ -1 +0,0 @@ -location / { proxy_pass http://localhost:5006; } \ No newline at end of file diff --git a/conf/includes/ProgramData.conf b/conf/includes/ProgramData.conf deleted file mode 100644 index ab692c3..0000000 --- a/conf/includes/ProgramData.conf +++ /dev/null @@ -1,6 +0,0 @@ -location ~* ^.+\.(application|manifest|deploy|msu|msp) { - #root html; - #root "C:\\Users\\mesedasvc\\AppData\\Local\\IFXApps\\nginx-1.20.1\\html"; - #root "D:\\ProgramData\\ClickOnce"; - root "D:\\ProgramData"; -} \ No newline at end of file diff --git a/conf/includes/Viewer.conf b/conf/includes/Viewer.conf deleted file mode 100644 index a9e5588..0000000 --- a/conf/includes/Viewer.conf +++ /dev/null @@ -1 +0,0 @@ -location / { proxy_pass http://localhost:5004; } \ No newline at end of file diff --git a/conf/includes/html-error.conf b/conf/includes/html-error.conf deleted file mode 100644 index fbdcfc5..0000000 --- a/conf/includes/html-error.conf +++ /dev/null @@ -1,3 +0,0 @@ -location = /50x.html { - root html; -} \ No newline at end of file diff --git a/conf/includes/html.conf b/conf/includes/html.conf deleted file mode 100644 index 04d4046..0000000 --- a/conf/includes/html.conf +++ /dev/null @@ -1,4 +0,0 @@ -location / { - root html; - index index.html index.htm; -} \ No newline at end of file diff --git a/conf/includes/json.conf b/conf/includes/json.conf deleted file mode 100644 index d801e61..0000000 --- a/conf/includes/json.conf +++ /dev/null @@ -1,24 +0,0 @@ -# location ~ /admin(.*)/$ { -location ~* .(3gp|apng|avi|avif|bmp|css|cur|flv|gif|htm|html|ico|jfif|jpeg|jpg|js|mid|mov|mp3|mp4|mpeg|mpg|ogg|pdf|php|pjp|pjpeg|png|svg|tif|tiff|txt|wav|webp|wmf|wml|wmv|xml|xml)$ { - expires 1d; - index index.html index.htm; - # mklink /J "D:\Tmp\Phares\www\pictures" "D:\Documents\Pictures" - # mklink /J "D:\Tmp\Phares\www\NGINdeX.io" "L:\GitHub\NGINdeX.io" - root "D://Tmp//phares//www"; -} -location / { - index index.html index.htm; - # mklink /J "D:\Tmp\Phares\www\pictures" "D:\Documents\Pictures" - # mklink /J "D:\Tmp\Phares\www\NGINdeX.io" "L:\GitHub\NGINdeX.io" - root "D://Tmp//phares//www"; - # First attempt to serve request as file, then - autoindex on; - # Send the data in JSON - autoindex_format json; - addition_types application/json; - # Calling from SERVERNAME/autoindex/* - add_before_body /NGINdeX.io/header.html; - add_after_body /NGINdeX.io/footer.html; - # Need to tell that we are sending HTML - add_header Content-Type text/html; -} \ No newline at end of file diff --git a/conf/includes/mime.types b/conf/includes/mime.types deleted file mode 100644 index c619639..0000000 --- a/conf/includes/mime.types +++ /dev/null @@ -1,101 +0,0 @@ - -types { - text/html html htm shtml; - text/css css; - text/xml xml; - image/gif gif; - image/jpeg jpeg jpg; - application/javascript js; - application/atom+xml atom; - application/rss+xml rss; - - text/mathml mml; - text/plain txt; - text/vnd.sun.j2me.app-descriptor jad; - text/vnd.wap.wml wml; - text/x-component htc; - - image/png png; - image/svg+xml svg svgz; - image/tiff tif tiff; - image/vnd.wap.wbmp wbmp; - image/webp webp; - image/x-icon ico; - image/x-jng jng; - image/x-ms-bmp bmp; - - font/woff woff; - font/woff2 woff2; - - application/java-archive jar war ear; - application/json json; - application/mac-binhex40 hqx; - application/msword doc; - application/pdf pdf; - application/postscript ps eps ai; - application/rtf rtf; - application/vnd.apple.mpegurl m3u8; - application/vnd.google-earth.kml+xml kml; - application/vnd.google-earth.kmz kmz; - application/vnd.ms-excel xls; - application/vnd.ms-fontobject eot; - application/vnd.ms-powerpoint ppt; - application/vnd.oasis.opendocument.graphics odg; - application/vnd.oasis.opendocument.presentation odp; - application/vnd.oasis.opendocument.spreadsheet ods; - application/vnd.oasis.opendocument.text odt; - application/vnd.openxmlformats-officedocument.presentationml.presentation - pptx; - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet - xlsx; - application/vnd.openxmlformats-officedocument.wordprocessingml.document - docx; - application/vnd.wap.wmlc wmlc; - application/x-7z-compressed 7z; - application/x-cocoa cco; - application/x-java-archive-diff jardiff; - application/x-java-jnlp-file jnlp; - application/x-makeself run; - application/x-perl pl pm; - application/x-pilot prc pdb; - application/x-rar-compressed rar; - application/x-redhat-package-manager rpm; - application/x-sea sea; - application/x-shockwave-flash swf; - application/x-stuffit sit; - application/x-tcl tcl tk; - application/x-x509-ca-cert der pem crt; - application/x-xpinstall xpi; - application/xhtml+xml xhtml; - application/xspf+xml xspf; - application/zip zip; - - application/octet-stream bin exe dll; - application/octet-stream deb; - application/octet-stream dmg; - application/octet-stream iso img; - application/octet-stream msi msp msm; - - audio/midi mid midi kar; - audio/mpeg mp3; - audio/ogg ogg; - audio/x-m4a m4a; - audio/x-realaudio ra; - - video/3gpp 3gpp 3gp; - video/mp2t ts; - video/mp4 mp4; - video/mpeg mpeg mpg; - video/quicktime mov; - video/webm webm; - video/x-flv flv; - video/x-m4v m4v; - video/x-mng mng; - video/x-ms-asf asx asf; - video/x-ms-wmv wmv; - video/x-msvideo avi; - - application/x-ms-application application; - application/x-ms-manifest manifest; - application/octet-stream deploy; -} diff --git a/conf/includes/www.conf b/conf/includes/www.conf deleted file mode 100644 index 83febd8..0000000 --- a/conf/includes/www.conf +++ /dev/null @@ -1,4 +0,0 @@ -location / { - root "D://www"; - index index.html index.htm; -} \ No newline at end of file diff --git a/conf/mime.types b/conf/mime.types index c619639..2961256 100644 --- a/conf/mime.types +++ b/conf/mime.types @@ -94,8 +94,4 @@ types { video/x-ms-asf asx asf; video/x-ms-wmv wmv; video/x-msvideo avi; - - application/x-ms-application application; - application/x-ms-manifest manifest; - application/octet-stream deploy; } diff --git a/conf/nginx.conf b/conf/nginx.conf index 257981d..4ecb213 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,60 +1,22 @@ -worker_processes 1; +worker_processes 1; events { - worker_connections 1024; + worker_connections 1024; } + http { - include "includes/mime.types"; - default_type application/octet-stream; - sendfile on; - keepalive_timeout 65; + include mime.types; + default_type application/octet-stream; + sendfile on; + keepalive_timeout 65; server { - listen 5050; - server_name localhost; - include "includes/html.conf"; - error_page 500 502 503 504 /50x.html; - include "includes/html-error.conf"; - } - server { - listen 4430; - server_name iscn5cg1325c0x.infineon.com; - include "includes/BaGet.conf"; - } - server { - listen 5051; - server_name localhost; - include "includes/www.conf"; - } - server { - listen 5052; - server_name localhost; - include "includes/json.conf"; - } - server { - listen 5053; - server_name localhost; - include "includes/ProgramData.conf"; - } - server { - listen 8080; - server_name ~(oi-metrology-viewer-archive).mes.infineon.com; + listen 80; + server_name localhost; location / { - include "includes/Archive.conf"; + #root html; + root "C:\4p_NT"; + index index.html index.htm; + autoindex on; + autoindex_format json; } } - server { - listen 8080; - server_name ~(oi-metrology-viewer-prod).mes.infineon.com; - location / { - include "includes/Viewer.conf"; - } - } - server { - listen 8088; - server_name *.mes.infineon.com; - include "includes/EAF-Viewer.Server.conf"; - } } -# mklink /J "C:\Users\phares\AppData\Local\IFXApps\nginx-1.20.1\conf" "L:\Git\NGINX-Conf\conf" -# cd "C:\Users\ECMESEAF\AppData\Local\IFXApps\nginx-1.20.1" -# .\nginx -t -# .\nginx -s reload diff --git a/conf/nginx.conf.old b/conf/nginx.conf.old new file mode 100644 index 0000000..29bc085 --- /dev/null +++ b/conf/nginx.conf.old @@ -0,0 +1,117 @@ + +#user nobody; +worker_processes 1; + +#error_log logs/error.log; +#error_log logs/error.log notice; +#error_log logs/error.log info; + +#pid logs/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include mime.types; + default_type application/octet-stream; + + #log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + # '$status $body_bytes_sent "$http_referer" ' + # '"$http_user_agent" "$http_x_forwarded_for"'; + + #access_log logs/access.log main; + + sendfile on; + #tcp_nopush on; + + #keepalive_timeout 0; + keepalive_timeout 65; + + #gzip on; + + server { + listen 80; + server_name localhost; + + #charset koi8-r; + + #access_log logs/host.access.log main; + + location / { + root html; + index index.html index.htm; + } + + #error_page 404 /404.html; + + # redirect server error pages to the static page /50x.html + # + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } + + # proxy the PHP scripts to Apache listening on 127.0.0.1:80 + # + #location ~ \.php$ { + # proxy_pass http://127.0.0.1; + #} + + # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000 + # + #location ~ \.php$ { + # root html; + # fastcgi_pass 127.0.0.1:9000; + # fastcgi_index index.php; + # fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name; + # include fastcgi_params; + #} + + # deny access to .htaccess files, if Apache's document root + # concurs with nginx's one + # + #location ~ /\.ht { + # deny all; + #} + } + + + # another virtual host using mix of IP-, name-, and port-based configuration + # + #server { + # listen 8000; + # listen somename:8080; + # server_name somename alias another.alias; + + # location / { + # root html; + # index index.html index.htm; + # } + #} + + + # HTTPS server + # + #server { + # listen 443 ssl; + # server_name localhost; + + # ssl_certificate cert.pem; + # ssl_certificate_key cert.key; + + # ssl_session_cache shared:SSL:1m; + # ssl_session_timeout 5m; + + # ssl_ciphers HIGH:!aNULL:!MD5; + # ssl_prefer_server_ciphers on; + + # location / { + # root html; + # index index.html index.htm; + # } + #} + +}