desktop-h6jg91b

2023-12-28 14:41:54 -07:00
14 changed files with 102 additions and 230 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +0,0 @@
-conf/includes/localhost.crt
-conf/includes/localhost.key
-conf/includes/ec-server.key
-conf/includes/ec-server.crt
--- a/conf/includes/BaGet.conf
+++ b/conf/includes/BaGet.conf
@ -1,11 +1,11 @@
-location / {
+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;
-    proxy_pass http://localhost:5555;
-    proxy_set_header Host $http_host;
-    proxy_set_header Connection keep-alive;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header X-Forwarded-Proto https;
 }

 # 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= ""
--- a/conf/includes/Gogs.conf
+++ b/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;
-}
--- a/conf/includes/code-server.conf
+++ b/conf/includes/code-server.conf
@ -1,25 +0,0 @@
-server {
-    server_name phares3757.ddns.net;
-    location / {
-        proxy_pass http://localhost:8007/;
-        proxy_set_header Host $host;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection upgrade;
-        proxy_set_header Accept-Encoding gzip;
-    }
-    listen [::]:443 ssl ipv6only=on; # managed by Certbot
-    listen 443 ssl; # managed by Certbot
-    ssl_certificate /etc/letsencrypt/live/phares3757.ddns.net/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/phares3757.ddns.net/privkey.pem; # managed by Certbot
-    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
-    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-}
-server {
-    if ($host = phares3757.ddns.net) {
-        return 301 https://$host$request_uri;
-        } # managed by Certbot
-    listen 80;
-    listen [::]:80;
-    server_name phares3757.ddns.net;
-    return 404; # managed by Certbot
-}
--- a/conf/includes/default.conf
+++ b/conf/includes/default.conf
@ -1,8 +0,0 @@
-server {
-    listen 8008 default_server;
-    listen [::]:8008 default_server;
-    ## Trun on /cgi-bin/ support to run CGI apps ##
-    include /etc/nginx/fcgiwrap.conf;
-    root /var/www/html;
-    server_name _;
-}
--- a/conf/includes/desktop-h6jg91b.conf
+++ b/conf/includes/desktop-h6jg91b.conf
@ -1,6 +1,6 @@
 [req]
 default_bits       = 2048
-default_keyfile    = localhost.key
+default_keyfile    = desktop-h6jg91b.key
 distinguished_name = req_distinguished_name
 req_extensions     = req_ext
 x509_extensions    = v3_ca
@ -11,13 +11,13 @@ countryName_default         = US
 stateOrProvinceName         = State or Province Name (full name)
 stateOrProvinceName_default = Arizona
 localityName                = Locality Name (eg, city)
-localityName_default        = Mesa
+localityName_default        = Anthem
 organizationName            = Organization Name (eg, company)
-organizationName_default    = Infineon Technologies Americas Corp.
+organizationName_default    = Phares
 organizationalUnitName      = organizationalunit
 organizationalUnitName_default = Development
 commonName                  = Common Name (e.g. server FQDN or YOUR name)
-commonName_default          = example.com
+commonName_default          = desktop-h6jg91b
 commonName_max              = 64

 [req_ext]
@ -27,15 +27,10 @@ subjectAltName = @alt_names
 subjectAltName = @alt_names

 [alt_names]
-DNS.1   = example.com
+DNS.1   = desktop-h6jg91b
 DNS.2   = localhost
 DNS.3   = 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
+# openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout L:\Git\NGINX-Conf\conf\includes\desktop-h6jg91b.key -out L:\Git\NGINX-Conf\conf\includes\desktop-h6jg91b.crt -config L:\Git\NGINX-Conf\conf\includes\desktop-h6jg91b.conf
--- a/conf/includes/desktop-h6jg91b.crt
+++ b/conf/includes/desktop-h6jg91b.crt
@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIUHNUT7UMv/DhFqIN2tHs1atq8/ywwDQYJKoZIhvcNAQEL
+BQAwcTELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB0FyaXpvbmExDzANBgNVBAcMBkFu
+dGhlbTEPMA0GA1UECgwGUGhhcmVzMRQwEgYDVQQLDAtEZXZlbG9wbWVudDEYMBYG
+A1UEAwwPZGVza3RvcC1oNmpnOTFiMB4XDTIzMTIyMzIwNTQ0MFoXDTI0MTIyMjIw
+NTQ0MFowcTELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB0FyaXpvbmExDzANBgNVBAcM
+BkFudGhlbTEPMA0GA1UECgwGUGhhcmVzMRQwEgYDVQQLDAtEZXZlbG9wbWVudDEY
+MBYGA1UEAwwPZGVza3RvcC1oNmpnOTFiMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEA1gLqYJPuJFbjuoEVqW7fCyZTFIJika/OeOXYbVTakN9xfm+EmLEW
+RXx8zCNENAsdUIgxdfUVk1RxK513oYrQCpADEWHGvRyLCran7IM/udBacIl6CuFK
+tuPd+FQoRZ/77Z71FQU/30xoYfRFk5V3SghBblCa5zzZO87EFwk6v4BWXwPjSfnU
+sQLclaivmtYS65Pbcq2YrGG9326AieT5lZb6DqQKBLhHdNzvlFYbapvMNUXSwCuB
+QkwV7Yx6fM0P8JGrJ+DJwPBInYDodri0OQUTolMMmWyBekbZPzJBKp7MJkHqj6d4
+KeRC16g6bHhH74TGBzTYb53PvvdYcn6NAwIDAQABo1MwUTAwBgNVHREEKTAngg9k
+ZXNrdG9wLWg2amc5MWKCCWxvY2FsaG9zdIIJMTI3LjAuMC4xMB0GA1UdDgQWBBTP
+f3CbPpa4/kT5sLe2OICnMC4upzANBgkqhkiG9w0BAQsFAAOCAQEAYNxDqeId7D6i
+7Aypgegap99XsWDbSHIiqbZM7dkO00kSWq9MUcq2YlZL837uZX/INEPjxnh2iib0
+tMANt+HpOjWoSd0eUZMWTqIuui6xUrsVsbWiLPR7iDLw9jjYHmQXOt4Wh3AepjBA
+FOJC+J8sGP5Zt+UikC3smi/hQGaJraA/BBX7h498a7GgF2Wyk1wMl/rmP9PdWV2T
+fCCVkG9Te+jEudESqU8LBtn6L8BCt2fsxBlcX4iLpUyXaWDccgjKjydvLu7nn5Uf
+/Fp/U0br5I+VR7NCHcWNDGKc3mxQyw63HTDALg3Vi7pG1JK6/wYdZzdt4EGJF4F+
+cFH7RXkHwg==
+-----END CERTIFICATE-----
--- a/conf/includes/desktop-h6jg91b.key
+++ b/conf/includes/desktop-h6jg91b.key
@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDWAupgk+4kVuO6
+gRWpbt8LJlMUgmKRr8545dhtVNqQ33F+b4SYsRZFfHzMI0Q0Cx1QiDF19RWTVHEr
+nXehitAKkAMRYca9HIsKtqfsgz+50FpwiXoK4Uq24934VChFn/vtnvUVBT/fTGhh
+9EWTlXdKCEFuUJrnPNk7zsQXCTq/gFZfA+NJ+dSxAtyVqK+a1hLrk9tyrZisYb3f
+boCJ5PmVlvoOpAoEuEd03O+UVhtqm8w1RdLAK4FCTBXtjHp8zQ/wkasn4MnA8Eid
+gOh2uLQ5BROiUwyZbIF6Rtk/MkEqnswmQeqPp3gp5ELXqDpseEfvhMYHNNhvnc++
+91hyfo0DAgMBAAECggEAKGkehqQISLZbhAER7Q9xcHKJJ4tDP4056JxGFMb8CnUW
+wjAekpKFyRMroYRbQZSDsYw2ArcHnu1H/VtblpZWmFf/LE4RL+5u1tQMu11BMD4G
+hc9/ywQljolShaymehcug/0K/DAkkm6kGzL73FVR1Bng+QqhZV6ZCnENl+f3PueN
+XHY8CqoMpU9ZtzzxOSwbNowVqSTQmIcrbU7tWhd4dGjByAOvj8VBWfouDnA1CxzJ
+ns3JJwHrW9xreijKr+am8JvjWEMyJOXD8I9v5TaICm8pnTQHuf3xZ5+bMJfmA8HT
+9sGHWK5Cq2p42isimdZoW9g+q1zJiOcm9FhQbInj+QKBgQD3+gho0diIIrHg4Rzx
+nliB1JoF4pugwZqDhFSySyVMc2jTfs34i4AQY5cwhuRvi75DAh5kSnsrv8z4enpA
+bNvNqVKkQihRKXf3Dyjc94jRNtzodjNYpKRIpn4/0kW4vX0cKyMnb4nWs58e7Q+D
+pnKqwIiGmounvfy7rVMj74/dXwKBgQDc740lGL20v40ZRnploVunK3hu/hgDrktw
+TB2+QPdFdBNA9oluo0JUFhooivIgedBCr84AyD+lI1duPYx3/AOR8CMppe6JwoVv
+swhVCZIZT4oZItWk0AYHBAzT5vcu38oDl6UPqMTD27HBOPKl5RpUPto3k4bqWb+
+HB/FxxbO3QKBgQDnjh3+Kz2j2an6UJsjb/Y7vdfZeQJT+ZUcDBy+pHb+zaHsJDOX
+TERYiXarhLqZAoe2sKrKgdZEQwTWXh/8OuqBQASAh5p4N13jYM+Kjsa+fhmIJJ/L
+vWn+wSGQ3PvoB2FlRU69S2UODIqgaUMcbvgSRFj4QCX6i+kNI0tIejH/xwKBgHls
+JlRG/qvBwpgrhcUpIygC2hOWDjinp8o16vrO1ZcULii71dg6XY+8/e9ePaffire7
+yyne5Cur+rcZmIOwu32PTqPrD+giQhfC7EE88DVFfx3P9ExGbSlS8wxgKjbrzPyE
+uTIcIp+tEaLLay3ClMw0t5dw5diKB5KMfmHCAyT5AoGBANfahu1+7Gux2d7LiWZx
+E9JE8ObR7vXWtV19DAAFAlrhAed3X366+hSzH4TnvsMhSn/r0XeiYjEVgWwsVDju
+/pLgSy9f6LFLyiLUuxHUikK05Br+vKSW22o55xP3w8YXi5m1d7UlZRvFsjKYw+A/
+kxgA8Bt0zAWAMiEc2s2N9Xbv
+-----END PRIVATE KEY-----
--- a/conf/includes/dex.conf
+++ b/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;
-}
--- a/conf/includes/ec-server.pass
+++ b/conf/includes/ec-server.pass
@ -1 +0,0 @@
-nocert
--- a/conf/includes/github.conf
+++ b/conf/includes/github.conf
@ -1,4 +0,0 @@
-location / {
-    root "D://www//github";
-    index index.html index.htm;
-}
--- a/conf/includes/json.conf
+++ b/conf/includes/json.conf
@ -1,47 +1,24 @@
+# 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;
-    # 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";
    # 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;
 }
--- a/conf/includes/wwwroot.conf
+++ b/conf/includes/wwwroot.conf
@ -1,4 +0,0 @@
-location / {
-    root "D://wwwroot";
-    try_files $uri $uri/ /index.html =404;
-}
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@ -3,112 +3,36 @@ events {
    worker_connections 1024;
 }
 http {
-    include "includes/mime.types";
-    default_type application/octet-stream;
-    sendfile on;
-    keepalive_timeout 65;
-    server {
-        # listen 80;
-        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;
-        # 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;
-        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/dex.conf";
-    }
-    server {
-        listen 5053;
-        server_name localhost;
-        include "includes/ProgramData.conf";
-    }
-    server {
-        listen 5054;
-        server_name localhost;
-        include "includes/json.conf";
-    }
-    server {
-        listen 5055;
-        server_name localhost;
-        include "includes/wwwroot.conf";
-    }
-    server {
-        listen 8011;
-        server_name localhost;
-        include "includes/Gogs.conf";
-    }
-    # server {
-    #     listen 8080;
-    #     server_name ~(oi-metrology-viewer-archive).mes.infineon.com;
-    #     location / {
-    #         include "includes/Archive.conf";
-    #     }
-    # }
-    # 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";
+  include "includes/mime.types";
+  default_type application/octet-stream;
+  sendfile on;
+  keepalive_timeout 65;
+  server {
+      listen 443 ssl http2;
+      listen [::]:443 ssl http2;
+      server_name localhost;
+      ssl_certificate "includes/desktop-h6jg91b.crt";
+      ssl_certificate_key "includes/desktop-h6jg91b.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";
+  }
+  server {
+    listen 80;
+    listen [::]:80;
+    server_name localhost;
+    location / {
+      proxy_pass http://localhost:8080/;
+      proxy_set_header Host $host;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection upgrade;
+      proxy_set_header Accept-Encoding gzip;
    }
+  }
 }
-# 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\phares\AppData\Local\IFXApps\nginx-1.20.1\conf"
-# mklink /J "C:\Users\phares\AppData\Local\IFXApps\nginx-1.20.1\conf" "L:\DevOps\Mesa_FI\NGINX-Conf\conf"
-# -
-# As administrator
-# -
-# cd "C:\Users\phares\AppData\Local\IFXApps\nssm-2.24\win64"
-# nssm install "nginx"
-# -
-# C:\Users\phares\AppData\Local\IFXApps\nginx-1.20.1\nginx.exe
-# C:\Users\phares\AppData\Local\IFXApps\nginx-1.20.1
-# -
-# start nginx
-# C:\Users\phares\AppData\Local\IFXApps\nginx-1.20.1\logs\service.out.log
-# C:\Users\phares\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:\DevOps\Mesa_FI\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