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/EDA-Viewer.conf b/conf/includes/EDA-Viewer.conf new file mode 100644 index 0000000..91cff5a --- /dev/null +++ b/conf/includes/EDA-Viewer.conf @@ -0,0 +1,11 @@ +location / { + proxy_pass http://localhost:5003; #EDA Viewer#5003 +} +#C:\Users\mesedasvc\AppData\Local\IFXApps\nginx-1.20.1 +#nginx -t +#nginx -s reload +# +#sc stop "EDA Viewer 5003" +#sc delete "EDA Viewer 5003" +#http://localhost:5003/Home/Background/?EDAViewer +# \ 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/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/www.conf b/conf/includes/www.conf index 83febd8..fffa956 100644 --- a/conf/includes/www.conf +++ b/conf/includes/www.conf @@ -1,4 +1,3 @@ location / { - root "D://www"; - index index.html index.htm; + root "D:\\Tmp\\Phares\\www"; } \ 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..64a4dd2 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,60 +1,38 @@ -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 5050; + server_name localhost; location / { - include "includes/Archive.conf"; + root html; + index index.html index.htm; + } + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; } } 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"; + listen 80; + server_name localhost; + location / { + proxy_pass http://localhost:5002; #APC Viewer + } } } -# 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 +#cd "C:\Users\MESYODASVC\AppData\Local\IFXApps\nginx-1.20.1" +#nginx -t +#nginx -s reload +# +#sc stop "APC Viewer 5002" +# +#sc delete "APC Viewer 5002" +# +#http://localhost:5002/Home/Background?APC \ No newline at end of file