CDE5

conf/includes/Gogs.conf

@@ -1,8 +0,0 @@
-location / {
-    proxy_hide_header Authorization;
-    if ($http_Authorization != "Basic asdf") {
-        return 401;
-    }
-    proxy_set_header Authorization "Basic asdf";
-    proxy_pass http://localhost:3000;
-}

conf/includes/dex.conf

@@ -1,21 +0,0 @@
-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;
-    # root /var/www/html/637998119172547651;
-    root "D://Tmp//phares//www";
-}
-location / {
-    index index.html index.htm;
-    # root /var/www/html/637998119172547651;
-    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;
-}

conf/includes/ec-server.pass

@@ -1 +0,0 @@
-nocert

conf/includes/github.conf

@@ -1,4 +0,0 @@
-location / {
-    root "D://www//github";
-    index index.html index.htm;
-}

conf/includes/json.conf

@@ -1,47 +1,29 @@
 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;
-    root "C://SAM_2.1.10//Result";
+    # ln -s /etc/nginx/sites-available/json /etc/nginx/sites-enabled/
+    # ln -s /srv/samba/share/637998119172547651 /var/www/html/637998119172547651
+    # ln -s /var/www/html/NGINdeX.io /var/www/html/637998119172547651/NGINdeX.io
+    # ln -s /srv/git /var/www/html/637998119172547651/git
+    # root /var/www/html/637998119172547651;
+    # 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;
     # root /var/www/html/637998119172547651;
-    root "C://SAM_2.1.10//Result";
+    # 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;
+    addition_types application/json;
     # Calling from SERVERNAME/autoindex/*
-    # add_before_body /NGINdeX.io/header.html;
-    # add_after_body /NGINdeX.io/footer.html;
+    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;
-    if ($request_method = 'OPTIONS') {
-        add_header 'Access-Control-Allow-Origin' '*';
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-        #
-        # Custom headers and headers various browsers *should* be OK with but aren't
-        #
-        add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
-        #
-        # Tell client that this pre-flight info is valid for 20 days
-        #
-        add_header 'Access-Control-Max-Age' 1728000;
-        add_header 'Content-Type' 'text/plain; charset=utf-8';
-        add_header 'Content-Length' 0;
-        return 204;
-    }
-    if ($request_method = 'POST') {
-        add_header 'Access-Control-Allow-Origin' '*' always;
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
-        add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always;
-        add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
-    }
-    if ($request_method = 'GET') {
-        add_header 'Access-Control-Allow-Origin' '*' always;
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
-        add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always;
-        add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
-    }
+    add_header Content-Type text/html;
 }

conf/includes/localhost.conf

@@ -13,11 +13,11 @@ stateOrProvinceName_default = Arizona
 localityName                = Locality Name (eg, city)
 localityName_default        = Mesa
 organizationName            = Organization Name (eg, company)
-organizationName_default    = Infineon Technologies Americas Corp.
+organizationName_default    = localhost
 organizationalUnitName      = organizationalunit
 organizationalUnitName_default = Development
 commonName                  = Common Name (e.g. server FQDN or YOUR name)
-commonName_default          = example.com
+commonName_default          = localhost
 commonName_max              = 64
 
 [req_ext]
@@ -27,15 +27,10 @@ subjectAltName = @alt_names
 subjectAltName = @alt_names
 
 [alt_names]
-DNS.1   = example.com
-DNS.2   = localhost
-DNS.3   = 127.0.0.1
+DNS.1   = localhost
+DNS.2   = 127.0.0.1
 
 # https://webscoot.io/blog/create-self-signed-certificate-ubuntu-windows-nginx/
 # cd "C:\Program Files\Git\usr\bin"
 # openssl
 # req -x509 -nodes -days 365 -newkey rsa:2048 -keyout L:\Git\NGINX-Conf\conf\includes\localhost.key -out L:\Git\NGINX-Conf\conf\includes\localhost.crt -config L:\Git\NGINX-Conf\conf\includes\localhost.conf
-# openssl
-# pkcs12 -in L:\git\NGINX-Conf\conf\includes\ec-server.pfx -nocerts -out L:\Git\NGINX-Conf\conf\includes\ec-server.key
-# openssl
-# pkcs12 -in L:\git\NGINX-Conf\conf\includes\ec-server.pfx -clcerts -nokeys -out L:\Git\NGINX-Conf\conf\includes\ec-server.crt

conf/includes/www.conf

@@ -1,4 +1,4 @@
 location / {
-    root "C://SAM_2.1.10//Result";
+    root "D://www";
     index index.html index.htm;
 }

conf/includes/wwwroot.conf

@@ -1,4 +0,0 @@
-location / {
-    root "C://SAM_2.1.10//Result";
-    try_files $uri $uri/ /index.html =404;
-}

conf/nginx.conf

@@ -9,21 +9,16 @@ http {
     keepalive_timeout 65;
     server {
         listen 80;
-        # listen 443 ssl http2;
-        # listen [::]:443 ssl http2;
+        listen 443 ssl http2;
+        listen [::]:443 ssl http2;
         server_name localhost;
-        # ssl_certificate "includes/localhost.crt";
-        # ssl_certificate_key "includes/localhost.key";
-        # ssl_certificate "includes/ec-server.cer";
-        # ssl_certificate "includes/ec-server.crt";
-        # ssl_certificate_key "includes/ec-server.key";
-        # ssl_password_file "includes/ec-server.pass";
-        # ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
+        ssl_certificate "includes/localhost.crt";
+        ssl_certificate_key "includes/localhost.key";
+        ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
         # include "includes/html.conf";
         include "includes/BaGet.conf";
         error_page 500 502 503 504 /50x.html;
         include "includes/html-error.conf";
-        # include "includes/github.conf";
     }
     server {
         listen 4430;
@@ -38,7 +33,7 @@ http {
     server {
         listen 5052;
         server_name localhost;
-        include "includes/dex.conf";
+        include "includes/json.conf";
     }
     server {
         listen 5053;
@@ -46,45 +41,26 @@ http {
         include "includes/ProgramData.conf";
     }
     server {
-        listen 5054;
-        server_name localhost;
-        include "includes/json.conf";
+        listen 8080;
+        server_name ~(oi-metrology-viewer-archive).mes.infineon.com;
+        location / {
+            include "includes/Archive.conf";
+        }
     }
     server {
-        listen 5055;
-        server_name localhost;
-        include "includes/wwwroot.conf";
+        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";
     }
 }
-# mkdir "L:\DevOps\Mesa_FI"
-# cd "L:\DevOps\Mesa_FI"
-# git clone https://tfs.intra.infineon.com/tfs/ManufacturingIT/Mesa_FI/_git/NGINX-Conf
-# -
-# rmdir /s "C:\Users\Administrator\AppData\Local\IFXApps\nginx-1.20.1\conf"
-# mklink /J "C:\Users\Administrator\AppData\Local\IFXApps\nginx-1.20.1\conf" "L:\Git\NGINX-Conf\conf"
-# -
-# As administrator
-# -
-# cd "C:\Users\Administrator\AppData\Local\IFXApps\nssm-2.24\win64"
-# nssm install "nginx"
-# -
-# C:\Users\Administrator\AppData\Local\IFXApps\nginx-1.20.1\nginx.exe
-# C:\Users\Administrator\AppData\Local\IFXApps\nginx-1.20.1
-# -
-# start nginx
-# C:\Users\Administrator\AppData\Local\IFXApps\nginx-1.20.1\logs\service.out.log
-# C:\Users\Administrator\AppData\Local\IFXApps\nginx-1.20.1\logs\service.error.log
-# -
-# mklink /J "D:\Tmp\Phares\www\pictures" "D:\Documents\Pictures"
-# mklink /J "D:\Tmp\Phares\www\NGINdeX.io" "L:\Git\NGINdeX.io"
-# mklink /J "D:\Tmp\Phares\www\pictures" "D:\Documents\Pictures"
-# mklink /J "D:\Tmp\Phares\www\NGINdeX.io" "L:\DevOps\Mesa_FI\NGINdeX.io"
-# -
-# ln -s /etc/nginx/sites-available/json /etc/nginx/sites-enabled/
-# ln -s /srv/samba/share/637998119172547651 /var/www/html/637998119172547651
-# ln -s /var/www/html/NGINdeX.io /var/www/html/637998119172547651/NGINdeX.io
-# ln -s /srv/git /var/www/html/637998119172547651/git
-# -
-# cd "C:\Users\phares\AppData\Local\IFXApps\nginx-1.20.1"
+# mklink /J "C:\Users\mikep\AppData\Local\PharesApps\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
+# .\nginx -s reload