From 9f02c40f247d12bb6bf26e27a39072068a4d2722 Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Tue, 21 Nov 2023 07:17:13 -0700 Subject: [PATCH] 390000458C91080AB5F7777F0400000000458C --- .gitignore | 1 + .vscode/settings.json | 3 +- conf/includes/BaGet.conf | 12 ++--- conf/includes/cdn.conf | 31 +++++++++++++ conf/includes/code-marketplace.conf | 9 ++++ conf/includes/code-server.conf | 25 ++++++++++ conf/includes/default.conf | 8 ++++ conf/includes/dex.conf | 21 +++++++++ conf/includes/github.conf | 16 +++++++ conf/includes/json.conf | 41 +++++++++++++---- conf/includes/metrology.conf | 28 +++++++++++ conf/includes/oi-metrology-viewer-prod.cer | 44 ++++++++++++++++++ conf/includes/oi-metrology-viewer-prod.conf | 36 +++++++++++++++ conf/includes/oi-metrology-viewer-prod.csr | 23 ++++++++++ conf/includes/oi-metrology-viewer-prod.key | 30 ++++++++++++ conf/includes/oi-metrology-viewer-prod.pass | 1 + conf/includes/wwwroot.conf | 4 ++ conf/nginx.conf | 51 +-------------------- 18 files changed, 318 insertions(+), 66 deletions(-) create mode 100644 .gitignore create mode 100644 conf/includes/cdn.conf create mode 100644 conf/includes/code-marketplace.conf create mode 100644 conf/includes/code-server.conf create mode 100644 conf/includes/default.conf create mode 100644 conf/includes/dex.conf create mode 100644 conf/includes/github.conf create mode 100644 conf/includes/metrology.conf create mode 100644 conf/includes/oi-metrology-viewer-prod.cer create mode 100644 conf/includes/oi-metrology-viewer-prod.conf create mode 100644 conf/includes/oi-metrology-viewer-prod.csr create mode 100644 conf/includes/oi-metrology-viewer-prod.key create mode 100644 conf/includes/oi-metrology-viewer-prod.pass create mode 100644 conf/includes/wwwroot.conf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3b1b42c --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +nginx-1.20.1 \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 261bf63..bc8e09f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,5 +6,6 @@ "files.exclude": { "**/.git": false }, - "coverage-gutters.coverageBaseDir": "./.vscode/ReportGenerator/Cobertura/*" + "coverage-gutters.coverageBaseDir": "./.vscode/ReportGenerator/Cobertura/*", + "thunder-client.saveToWorkspace": false } \ No newline at end of file diff --git a/conf/includes/BaGet.conf b/conf/includes/BaGet.conf index dd8900e..a51479d 100644 --- a/conf/includes/BaGet.conf +++ b/conf/includes/BaGet.conf @@ -1,11 +1,11 @@ -location / -{ - proxy_pass http://localhost:5555; +location / { 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= "" diff --git a/conf/includes/cdn.conf b/conf/includes/cdn.conf new file mode 100644 index 0000000..86ac203 --- /dev/null +++ b/conf/includes/cdn.conf @@ -0,0 +1,31 @@ +location /cdn/ { + root "D://web-sites//cdn"; + autoindex on; + 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; + } +} \ No newline at end of file diff --git a/conf/includes/code-marketplace.conf b/conf/includes/code-marketplace.conf new file mode 100644 index 0000000..1af8f42 --- /dev/null +++ b/conf/includes/code-marketplace.conf @@ -0,0 +1,9 @@ +location / { + proxy_pass http://localhost:3001/; + proxy_set_header Host $host; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection upgrade; + proxy_set_header Accept-Encoding gzip; + proxy_set_header X-Forwarded-Host $http_host; + proxy_set_header X-Forwarded-Proto $scheme; +} \ No newline at end of file diff --git a/conf/includes/code-server.conf b/conf/includes/code-server.conf new file mode 100644 index 0000000..42cd670 --- /dev/null +++ b/conf/includes/code-server.conf @@ -0,0 +1,25 @@ +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 +} \ No newline at end of file diff --git a/conf/includes/default.conf b/conf/includes/default.conf new file mode 100644 index 0000000..c6b4fe2 --- /dev/null +++ b/conf/includes/default.conf @@ -0,0 +1,8 @@ +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 _; +} diff --git a/conf/includes/dex.conf b/conf/includes/dex.conf new file mode 100644 index 0000000..fca3a3c --- /dev/null +++ b/conf/includes/dex.conf @@ -0,0 +1,21 @@ +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; +} \ No newline at end of file diff --git a/conf/includes/github.conf b/conf/includes/github.conf new file mode 100644 index 0000000..d7ec8e4 --- /dev/null +++ b/conf/includes/github.conf @@ -0,0 +1,16 @@ + + server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + server_name github; + # https://github + ssl_certificate "includes/localhost.crt"; + ssl_certificate_key "includes/localhost.key"; + ssl_protocols TLSv1.2 TLSv1.1 TLSv1; + location / { + root "D://Tmp//phares//www"; + autoindex on; + } + error_page 500 502 503 504 /50x.html; + include "includes/html-error.conf"; + } \ No newline at end of file diff --git a/conf/includes/json.conf b/conf/includes/json.conf index d801e61..9db138c 100644 --- a/conf/includes/json.conf +++ b/conf/includes/json.conf @@ -1,24 +1,47 @@ -# 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 /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; + # 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; + # 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; + } } \ No newline at end of file diff --git a/conf/includes/metrology.conf b/conf/includes/metrology.conf new file mode 100644 index 0000000..cc8174f --- /dev/null +++ b/conf/includes/metrology.conf @@ -0,0 +1,28 @@ +server { + listen 4439 ssl http2; + listen [::]:4439 ssl http2; + # https://oi-metrology-viewer-prod + server_name oi-metrology-viewer-prod; + # http://oi-metrology-viewer-prod:8080 + ssl_certificate "includes/oi-metrology-viewer-prod.cer"; + ssl_certificate_key "includes/oi-metrology-viewer-prod.key"; + ssl_password_file "includes/oi-metrology-viewer-prod.pass"; + ssl_protocols TLSv1.2 TLSv1.1 TLSv1; + location / { + autoindex on; + root "D://Tmp//phares//wwwroot"; + } + location /api/ { + proxy_http_version 1.1; + proxy_cache_bypass $http_upgrade; + proxy_pass http://localhost:5002; + 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; + } + error_page 500 502 503 504 /50x.html; + include "includes/html-error.conf"; +} + +# see pipeline yml \ No newline at end of file diff --git a/conf/includes/oi-metrology-viewer-prod.cer b/conf/includes/oi-metrology-viewer-prod.cer new file mode 100644 index 0000000..0631f85 --- /dev/null +++ b/conf/includes/oi-metrology-viewer-prod.cer @@ -0,0 +1,44 @@ +-----BEGIN CERTIFICATE----- +MIIHyjCCBbKgAwIBAgITOQAARYyRCAq193d/BAAAAABFjDANBgkqhkiG9w0BAQsF +ADBcMQswCQYDVQQGEwJERTEhMB8GA1UEChMYSW5maW5lb24gVGVjaG5vbG9naWVz +IEFHMSowKAYDVQQDEyFJbmZpbmVvbiBUZWNobm9sb2dpZXMgQUcgU1NMIENBIDQw +HhcNMjMxMTIxMDY1NTE1WhcNMjUxMTIwMDY1NTE1WjCBpzELMAkGA1UEBhMCVVMx +EDAOBgNVBAgMB0FyaXpvbmExDTALBgNVBAcMBE1lc2ExLTArBgNVBAoMJEluZmlu +ZW9uIFRlY2hub2xvZ2llcyBBbWVyaWNhcyBDb3JwLjEUMBIGA1UECwwLRGV2ZWxv +cG1lbnQxMjAwBgNVBAMMKW9pLW1ldHJvbG9neS12aWV3ZXItcHJvZC5tZXMuaW5m +aW5lb24uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxlG4XRep +Kob6QKPp7sMtbEsCxpNUvrxojmNtVYSUQzHPm7eS0vyTFWWdx3DiClrI+6NUYPJc +n2XxyjJgwTgH40K09oD5TUWpJUP7/ZTPMM78iGmqc8fNjDZizi6cv1lcOKMVy+AO +aWDJEdbCCSbondleoJrA6KAsLicYQSMYVvwvH/+gMPHwXk5qY/qHi+7ZHL0CAKny +lCkMK/bRtCNHvebDABpJ4ZbS+OfpB91FqkUqnCmtoKwFQ6tO4mN+qs1ndbqnSTtv +lRKm+BKyFZreYpArXhGwbBJ72/KP/XKt2r6XtmYrsZzCzSzCS1p4q4AxjlNhLOXj +gPqxsBI/7jJIOQIDAQABo4IDNzCCAzMwggGJBgNVHREEggGAMIIBfIIpb2ktbWV0 +cm9sb2d5LXZpZXdlci1wcm9kLm1lcy5pbmZpbmVvbi5jb22CLG9pLW1ldHJvbG9n +eS12aWV3ZXItYXJjaGl2ZS5tZXMuaW5maW5lb24uY29tgihvaS1tZXRyb2xvZ3kt +dmlld2VyLWFwaS5tZXMuaW5maW5lb24uY29tghdtZXNzYTAxMGVjLmluZmluZW9u +LmNvbYIKbWVzc2EwMTBlY4IJbG9jYWxob3N0ggkxMjcuMC4wLjGCKW9pLW1ldHJv +bG9neS12aWV3ZXItcHJvZC5tZXMuaW5maW5lb24uY29tgixvaS1tZXRyb2xvZ3kt +dmlld2VyLWFyY2hpdmUubWVzLmluZmluZW9uLmNvbYIob2ktbWV0cm9sb2d5LXZp +ZXdlci1hcGkubWVzLmluZmluZW9uLmNvbYIXbWVzc2EwMTBlYy5pbmZpbmVvbi5j +b22CCm1lc3NhMDEwZWOCCWxvY2FsaG9zdIIJMTI3LjAuMC4xMB0GA1UdDgQWBBRE +dn7G3NnxlTL3JYr4ckMgEacDuTAfBgNVHSMEGDAWgBQgV1qTIvyOAfWjDKoGbzLW +nawKqzA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmluZmluZW9uLmNvbS9T +U0xDQTQvU1NMQ0E0LmNybDBFBggrBgEFBQcBAQQ5MDcwNQYIKwYBBQUHMAKGKWh0 +dHA6Ly9jcmwuaW5maW5lb24uY29tL1NTTENBNC9TU0xDQTQuY3J0MAwGA1UdEwEB +/wQCMAAwCwYDVR0PBAQDAgWgMDsGCSsGAQQBgjcVBwQuMCwGJCsGAQQBgjcVCPSv +PoTfzh2G6ZMfgb6MSoSt3zRGhoLgC8faEAIBZAIBIjAdBgNVHSUEFjAUBggrBgEF +BQcDAgYIKwYBBQUHAwEwJwYJKwYBBAGCNxUKBBowGDAKBggrBgEFBQcDAjAKBggr +BgEFBQcDATBBBgNVHSAEOjA4MDYGDSqCFABECoF6AQEBAQEwJTAjBggrBgEFBQcC +ARYXaHR0cDovL2Nwcy5pbmZpbmVvbi5jb20wDQYJKoZIhvcNAQELBQADggIBAG0d +IVhxnOsHJS40BrdEUU8zcD89b6cDP6V0QSpSCHbKizfFIH5XU8K13yjpoGGSkb5K +GAv47Q+XkkHl9ZnjlGSZZ68i0uey/jlTrCfFtG02uvVGHUUDmx/DIqnGlQI8KV4X +2U2H/C7fATRAoSRXJVn5IW3RPuOl1hFZx+LEupWy4hIV0AHeclwyK1woa7iNLqT5 +YSCKOC1kEvxHZuZcnFPayZ1aarZswM7Fd7QE3A0kTJ66IyCoIfIL7wFLF1cwIQvE +SOw0PFQ4jtQBz3r7TnuptadY5aeCV05uoSbv6NQ6fyDZReJoFQgXtwXJKw30u5SJ +FcT0wJ1UQ/xTE5BRje1Sz1ueIxvtvkcP49gYnUqxREPcqpBwP2yh8jENUUkwpmGp +2kG/a9mgo6ofbV3r4l6Gd8MFFnzCNW864AOfUTakG6frdtF0NjGG3nXuBQuqKgLh +Xgd4z7yp44nrQS9WzVBbFWAeq1bgSCkU7xxChtkbzvquLePwX7ofp0UqJMKqRKr/ +H03lZp0MR8ONLP4QUQaGnIZsA8cI8YYs/x3pGW94YVk5gF/p1P0BO0/sskufmWUo +8AS9JHtwA/VJD5/puqBOFPeTu58vyM8WlsIET3Vd1P3azDYsMV4G1f/CCbDkMYVC +9dYN8P3mMROD+I5asUyDaviyEEF55CqIOukzOpIw +-----END CERTIFICATE----- diff --git a/conf/includes/oi-metrology-viewer-prod.conf b/conf/includes/oi-metrology-viewer-prod.conf new file mode 100644 index 0000000..146bb31 --- /dev/null +++ b/conf/includes/oi-metrology-viewer-prod.conf @@ -0,0 +1,36 @@ +[req] +default_bits = 2048 +default_keyfile = localhost.key +distinguished_name = req_distinguished_name +req_extensions = req_ext +x509_extensions = v3_ca + +[req_distinguished_name] +countryName = Country Name (2 letter code) +countryName_default = US +stateOrProvinceName = State or Province Name (full name) +stateOrProvinceName_default = Arizona +localityName = Locality Name (eg, city) +localityName_default = Mesa +organizationName = Organization Name (eg, company) +organizationName_default = Infineon Technologies Americas Corp. +organizationalUnitName = organizationalunit +organizationalUnitName_default = Development +commonName = Common Name (e.g. server FQDN or YOUR name) +commonName_default = oi-metrology-viewer-prod.mes.infineon.com +commonName_max = 64 + +[req_ext] +subjectAltName = @alt_names + +[v3_ca] +subjectAltName = @alt_names + +[alt_names] +DNS.1 = oi-metrology-viewer-prod.mes.infineon.com +DNS.2 = oi-metrology-viewer-archive.mes.infineon.com +DNS.3 = oi-metrology-viewer-api.mes.infineon.com +DNS.4 = messa010ec.infineon.com +DNS.5 = messa010ec +DNS.6 = localhost +DNS.7 = 127.0.0.1 diff --git a/conf/includes/oi-metrology-viewer-prod.csr b/conf/includes/oi-metrology-viewer-prod.csr new file mode 100644 index 0000000..9d5df0d --- /dev/null +++ b/conf/includes/oi-metrology-viewer-prod.csr @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIDzjCCArYCAQAwgacxCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdBcml6b25hMQ0w +CwYDVQQHDARNZXNhMS0wKwYDVQQKDCRJbmZpbmVvbiBUZWNobm9sb2dpZXMgQW1l +cmljYXMgQ29ycC4xFDASBgNVBAsMC0RldmVsb3BtZW50MTIwMAYDVQQDDClvaS1t +ZXRyb2xvZ3ktdmlld2VyLXByb2QubWVzLmluZmluZW9uLmNvbTCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBAMZRuF0XqSqG+kCj6e7DLWxLAsaTVL68aI5j +bVWElEMxz5u3ktL8kxVlncdw4gpayPujVGDyXJ9l8coyYME4B+NCtPaA+U1FqSVD ++/2UzzDO/IhpqnPHzYw2Ys4unL9ZXDijFcvgDmlgyRHWwgkm6J3ZXqCawOigLC4n +GEEjGFb8Lx//oDDx8F5OamP6h4vu2Ry9AgCp8pQpDCv20bQjR73mwwAaSeGW0vjn +6QfdRapFKpwpraCsBUOrTuJjfqrNZ3W6p0k7b5USpvgSshWa3mKQK14RsGwSe9vy +j/1yrdq+l7ZmK7Gcws0swktaeKuAMY5TYSzl44D6sbASP+4ySDkCAwEAAaCB4DCB +3QYJKoZIhvcNAQkOMYHPMIHMMIHJBgNVHREEgcEwgb6CKW9pLW1ldHJvbG9neS12 +aWV3ZXItcHJvZC5tZXMuaW5maW5lb24uY29tgixvaS1tZXRyb2xvZ3ktdmlld2Vy +LWFyY2hpdmUubWVzLmluZmluZW9uLmNvbYIob2ktbWV0cm9sb2d5LXZpZXdlci1h +cGkubWVzLmluZmluZW9uLmNvbYIXbWVzc2EwMTBlYy5pbmZpbmVvbi5jb22CCm1l +c3NhMDEwZWOCCWxvY2FsaG9zdIIJMTI3LjAuMC4xMA0GCSqGSIb3DQEBCwUAA4IB +AQBWnv6zzqy4MZ9Iy3eU5Ix4jkba85pgwT4Yxr6b9IV1y7oa0Q23+liR2nCROtEt +wgaL7KcYNMrP/UtXPERcqBY9185qUlKbE6s/Xlb9uvrm8GcpLHFFvmIAWopLrGTy +dzdyKsUcYhrvyaQCXJz0ud7IDNUoCj8BKPYpc15ZCzG5PV5w45/EZG7nLbUgpEKz +EMKxMTRZDd7oeuFVJzFWGmavIZqVCYr8Og8Vm+xvrwsBGfbMIF4rXruhEDOry9Hy +ickWJbzL2AlEYFmamR4cIAgU7ndyuWBSFCu4wkL7FQ6GJrUdWrM0UVpL4P4deM3+ +25aW3QlwtZ9tEBdswbDDqYHl +-----END CERTIFICATE REQUEST----- diff --git a/conf/includes/oi-metrology-viewer-prod.key b/conf/includes/oi-metrology-viewer-prod.key new file mode 100644 index 0000000..b4e739f --- /dev/null +++ b/conf/includes/oi-metrology-viewer-prod.key @@ -0,0 +1,30 @@ +-----BEGIN ENCRYPTED PRIVATE KEY----- +MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIR6bKghSUbHcCAggA +MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECH078SRrtpd4BIIEyBIrJ1JSPn6L +7tUim7rY8Q1BQwJqLYMZeoQG8ev9LfEUiWoa2kerSoIpEp7WdRO5R5kFE6nvSuWj +RIxUSL5KIuKzh+LKH9FqmYTz6WN60/mO8q/vGskLmnXPxEQ3pPaecV65Rf0rLjPx +tgbJdvSv+D5iNjZV2ClkSuzzyAx6fWcrfn18uJLqAXCC/4oDgqveDbZ/YWM66zuu +QKv82MMUq8w9dwq1MccbqqydcTfVFk7AWzqzB+lZ3fE/QezV3Er9SUKyuEq2QJnB +A/arv/lQqWo4OIsiJj+tKz24Jr79abrHW+LZVCv7zJF5Sdwwt4uSQNd/3YTKF40n +i7+lBIgXGtWcdZO2v7jfjuhrNi+ItELPFO13m5gl0Or90k/v/sHF844EbA4c8OQn +BAN31HR9XtLZ1B794cBb3hQFRsrKZdv3MAUP8qGd1+GKYEJvif/nwKHDlqkDHGdl +ohIc3cr+sRvv5mhRU2fGAfdZwDxJmE06OYIw3Tyg+0+eIqkZiZwozzY0byVp+G7R +h+tTF9OY4+UwIls2UKZcywv15qxsyaqBIYQ0yzFeK0mhIO3Ooi/nKLOSRWttyO0L +5h3e5LVN6JjuJhPGAt1zhT06D/riAbpx2YN/8wpxNV7MDLivCb+oQG0KWrIU2722 +8F0uPCWjyqLDMaOZNlTV+i6XagkUmfK9AvOVc7SzGP4Xr8sryZyClJl48k/1Vyib +6Egkdr4dtnvZRvXHM6FsC0GUyYanITss04InKiEHO8M2IgJFg1KhFRGCQ4v1Cpeg +m+Cd8ikUPO7e9FssHW7F3wSSfFTPLBh6+T0iR05OXjodRBxXaWuEUrQXIOlNImeS +TA2Gc3v3WHQVNoH93bwiSOtUkNX61nASnXAEz3ymWtpCzVtVPljqhW+Nd0z0o6cY +3K1OuZym5R150dvkk2UbUGsqw+qhHaOxg5JasOXuYxvRMvzI3fhntRa0OC/bSqUU +yAlA/0SOF5EZNyVvPB2+ODYoygfp5IIFCOT0JDyFvFu2FLP38nAaZsm3JE8YU1vS +32puBdvPTDpyw7UDlPbBTerYDkdfTv2AeuTvtg9sXT/l5rhusvgmwzls6mkhvRFt +Aj4jq/QOLGip/YmbJ1xdUCKh8iyYKddKc8KovXk6fz6ijL86a03mdEkNrqpM/7UR +u9OKTDNcuaHqVEJISXmkuIhEXIV0ukAd0Ydxxc+wU3uxcdBry3P/9/5ZNVoJ3GXM +OcBV6vQGjfF1Mo9nH8hpJ5OwzkEs+w5CqWPIqGzWCucdhP7zEFR+q3b/p3juBDEe +yVw7AkKezvMD/ktPzHOnR6r3MdNSJanWpEjdDnLG1Q8bKtne3HlxGz++6ZGQgTiU +1QVadDfXxUrwnk9HgckqeG7C2W83S9mzatJEKYVaKgnOdZJnPQp+bcNooGnpwuBd +F8clJYT1dBLEPU7045JNGbGO0V8EHzF+ZtQikKkh2UQv8EgdUVr00TQhWn9jm6lx +rMalYSmeRAkzEw9ZVADZgP0I7GnVzmCxWd+V/ern2wuLILmrHN/YCDOw52yePbWG +lF/angcNB1GUdO0zkQArQZOFtJyvgK1je3NkAnWvbjm6QoICM9DWDPKPRAAgoLxS +Y9zPoaiH+9DFfxlNaspIXQ== +-----END ENCRYPTED PRIVATE KEY----- diff --git a/conf/includes/oi-metrology-viewer-prod.pass b/conf/includes/oi-metrology-viewer-prod.pass new file mode 100644 index 0000000..8728151 --- /dev/null +++ b/conf/includes/oi-metrology-viewer-prod.pass @@ -0,0 +1 @@ +https://intranet.infineon.com/ \ No newline at end of file diff --git a/conf/includes/wwwroot.conf b/conf/includes/wwwroot.conf new file mode 100644 index 0000000..159b1f3 --- /dev/null +++ b/conf/includes/wwwroot.conf @@ -0,0 +1,4 @@ +location / { + root "D://wwwroot"; + try_files $uri $uri/ /index.html =404; +} \ No newline at end of file diff --git a/conf/nginx.conf b/conf/nginx.conf index 257981d..68130bb 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -4,57 +4,8 @@ events { } http { include "includes/mime.types"; + include "includes/metrology.conf"; 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; - 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"; - } } -# 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