CDE5

conf/includes/EAF-Viewer.Server.conf

@@ -1 +1 @@
-location / { proxy_pass http://localhost:5010; }
+location / { proxy_pass http://localhost:5006; }

conf/includes/EDA Viewer.conf

@@ -1,2 +0,0 @@
-location / { proxy_pass http://localhost:5003; }
-# http://localhost:5003/Background?set_is_primary_instance=false&a

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,29 +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;
-    # 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:\Git\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:\Git\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;
-}

conf/includes/ec-server.cer

@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFWDCCBECgAwIBAgITEQAJ/3uYCRkLXZxaDgAAAAn/ezANBgkqhkiG9w0BAQsF
-ADBZMQswCQYDVQQGEwJERTEhMB8GA1UECgwYSW5maW5lb24gVGVjaG5vbG9naWVz
-IEFHMScwJQYDVQQDDB5JbmZpbmVvbiBUZWNobm9sb2dpZXMgQUcgRUMgQ0EwHhcN
-MjMwMTI1MTkyODQxWhcNMjUwMTI0MTkyODQxWjAeMRwwGgYDVQQDDBNtZXN0c2Ew
-N2VjLmVjLmxvY2FsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA38Ko
-D0sme6AQZH/b07SJ9QwQBb0WIiW5Y4L/XCOHnPuXXde/kvgXpAMwvCa2ccB17boj
-DJHFQlGZZ2950ung73f0rayD5NC5CEQFwjpVb8XFkzjAiCXf6zVxrGcZe3FDfGtP
-YsstFsuizfWYtsdmBe3nQSXU+zDzhGTo3J5TBjEPx2weIsWlj629jQl+SGUCEYUG
-CsVsqdb9jGZUMeHgdK9AI1ayOVXK7cyXfgiy8cGIwa6AKjGtvgjwomELOMPu7uMV
-lR9jUpwp7vaz+RUYPohPEWn9hihUR/V3JhI19tieE4Rp+O+tuYTg36Q9T2XSCi0R
-sbZakyP/LFBsb23lPQIDAQABo4ICUjCCAk4wPgYJKwYBBAGCNxUHBDEwLwYnKwYB
-BAGCNxUIhK+7M4S3+nmFmZcqhfiyeYaXu2aBA4XPrD2DhJoTAgFkAgFVMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwQgYDVR0g
-BDswOTA3Bg0qghQARAqBAgEBAQEBMCYwJAYIKwYBBQUHAgEWGGh0dHA6Ly9jcHMu
-aW5maW5lb24uY29tADAnBgkrBgEEAYI3FQoEGjAYMAoGCCsGAQUFBwMBMAoGCCsG
-AQUFBwMCMB0GA1UdDgQWBBTsLgN7IUPfLrMt8tbisLoDxR5T9jAnBgNVHREEIDAe
-ghxlYWYtc3RhZ2luZy5tZXMuaW5maW5lb24uY29tMB8GA1UdIwQYMBaAFJmmdkAB
-8r7pT1pg9efTboOQCXhgMIIBBQYDVR0fBIH9MIH6MIH3oIH0oIHxhoHMbGRhcDov
-Ly9DTj1JbmZpbmVvbiUyMFRlY2hub2xvZ2llcyUyMEFHJTIwRUMlMjBDQSxDTj1F
-TFNTQUVDMDIsQ049Q0RQLENOPVB1YmxpYyUyMEtleSUyMFNlcnZpY2VzLENOPVNl
-cnZpY2VzLENOPUNvbmZpZ3VyYXRpb24sREM9RUMsREM9bG9jYWw/Y2VydGlmaWNh
-dGVSZXZvY2F0aW9uTGlzdD9iYXNlP29iamVjdENsYXNzPWNSTERpc3RyaWJ1dGlv
-blBvaW50hiBodHRwOi8vY3JsLmVjLmxvY2FsL2NybC9FY0NBLmNybDANBgkqhkiG
-9w0BAQsFAAOCAQEAYrVZucfWpS4CscR/WH+8vUtH7wH1peOpRYPJm4x2ABpP33a/
-z4jHwqLDrYqYE7syTvq1ffmV7FW8rFx7ArN/0KG1o1BM/BPduN4gihsuzgMZQyCH
-Ewps6WBWMxPaxJC48tcSSTXq+NVQgZoNFi2957cWaoXFlmAhq8Npr4yE9aArEqkY
-wTKVjadxw1oUGXYd4pkr2ig6IdgW6jVQy3iJxp6c34mMw4bVngEB92Mp2zZCxohd
-Kwfugh+zWZU81xXOGshYE+9YBIg6cxJjGZkZwiOk/AimlAuw4qFLt9wGDaJ7/pnt
-x8c68811JnzFkf2fnpUQDZRL2eg84UvNJ14W8Q==
------END CERTIFICATE-----

conf/includes/ec-server.crt

@@ -1,37 +0,0 @@
-Bag Attributes
-    localKeyID: 01 00 00 00 
-subject=CN = mestsa07ec.ec.local
-
-issuer=C = DE, O = Infineon Technologies AG, CN = Infineon Technologies AG EC CA
-
------BEGIN CERTIFICATE-----
-MIIFWDCCBECgAwIBAgITEQAJ/3uYCRkLXZxaDgAAAAn/ezANBgkqhkiG9w0BAQsF
-ADBZMQswCQYDVQQGEwJERTEhMB8GA1UECgwYSW5maW5lb24gVGVjaG5vbG9naWVz
-IEFHMScwJQYDVQQDDB5JbmZpbmVvbiBUZWNobm9sb2dpZXMgQUcgRUMgQ0EwHhcN
-MjMwMTI1MTkyODQxWhcNMjUwMTI0MTkyODQxWjAeMRwwGgYDVQQDDBNtZXN0c2Ew
-N2VjLmVjLmxvY2FsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA38Ko
-D0sme6AQZH/b07SJ9QwQBb0WIiW5Y4L/XCOHnPuXXde/kvgXpAMwvCa2ccB17boj
-DJHFQlGZZ2950ung73f0rayD5NC5CEQFwjpVb8XFkzjAiCXf6zVxrGcZe3FDfGtP
-YsstFsuizfWYtsdmBe3nQSXU+zDzhGTo3J5TBjEPx2weIsWlj629jQl+SGUCEYUG
-CsVsqdb9jGZUMeHgdK9AI1ayOVXK7cyXfgiy8cGIwa6AKjGtvgjwomELOMPu7uMV
-lR9jUpwp7vaz+RUYPohPEWn9hihUR/V3JhI19tieE4Rp+O+tuYTg36Q9T2XSCi0R
-sbZakyP/LFBsb23lPQIDAQABo4ICUjCCAk4wPgYJKwYBBAGCNxUHBDEwLwYnKwYB
-BAGCNxUIhK+7M4S3+nmFmZcqhfiyeYaXu2aBA4XPrD2DhJoTAgFkAgFVMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAwQgYDVR0g
-BDswOTA3Bg0qghQARAqBAgEBAQEBMCYwJAYIKwYBBQUHAgEWGGh0dHA6Ly9jcHMu
-aW5maW5lb24uY29tADAnBgkrBgEEAYI3FQoEGjAYMAoGCCsGAQUFBwMBMAoGCCsG
-AQUFBwMCMB0GA1UdDgQWBBTsLgN7IUPfLrMt8tbisLoDxR5T9jAnBgNVHREEIDAe
-ghxlYWYtc3RhZ2luZy5tZXMuaW5maW5lb24uY29tMB8GA1UdIwQYMBaAFJmmdkAB
-8r7pT1pg9efTboOQCXhgMIIBBQYDVR0fBIH9MIH6MIH3oIH0oIHxhoHMbGRhcDov
-Ly9DTj1JbmZpbmVvbiUyMFRlY2hub2xvZ2llcyUyMEFHJTIwRUMlMjBDQSxDTj1F
-TFNTQUVDMDIsQ049Q0RQLENOPVB1YmxpYyUyMEtleSUyMFNlcnZpY2VzLENOPVNl
-cnZpY2VzLENOPUNvbmZpZ3VyYXRpb24sREM9RUMsREM9bG9jYWw/Y2VydGlmaWNh
-dGVSZXZvY2F0aW9uTGlzdD9iYXNlP29iamVjdENsYXNzPWNSTERpc3RyaWJ1dGlv
-blBvaW50hiBodHRwOi8vY3JsLmVjLmxvY2FsL2NybC9FY0NBLmNybDANBgkqhkiG
-9w0BAQsFAAOCAQEAYrVZucfWpS4CscR/WH+8vUtH7wH1peOpRYPJm4x2ABpP33a/
-z4jHwqLDrYqYE7syTvq1ffmV7FW8rFx7ArN/0KG1o1BM/BPduN4gihsuzgMZQyCH
-Ewps6WBWMxPaxJC48tcSSTXq+NVQgZoNFi2957cWaoXFlmAhq8Npr4yE9aArEqkY
-wTKVjadxw1oUGXYd4pkr2ig6IdgW6jVQy3iJxp6c34mMw4bVngEB92Mp2zZCxohd
-Kwfugh+zWZU81xXOGshYE+9YBIg6cxJjGZkZwiOk/AimlAuw4qFLt9wGDaJ7/pnt
-x8c68811JnzFkf2fnpUQDZRL2eg84UvNJ14W8Q==
------END CERTIFICATE-----

conf/includes/ec-server.key

@@ -1,37 +0,0 @@
-Bag Attributes
-    Microsoft Local Key set: <No Values>
-    localKeyID: 01 00 00 00 
-    Microsoft CSP Name: Microsoft RSA SChannel Cryptographic Provider
-    friendlyName: te-InfineonECServer-0ebec69d-5716-4924-bd1a-35b09db88d23
-Key Attributes
-    X509v3 Key Usage: 10 
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQI3O+s+UopEO8CAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECBCrtEzp5P7WBIIEyLxZeSAWjnzn
-ukLW94b931grQbAq66MjIcplcKvySjxXfkSf+uzEuB9C9IIpFzrMqZfYPkyvcpfa
-AtIspPBG8947LqKDNKPE0HuSIrMSZhVOTB1JEgJX/yPeEz7SEg8lWCla+hA7Etkx
-8bgocSms0FXgdKYehmOzXtyaypptnevdG+nvdzpWr4DCGlTzgBJ05vp67ZAOS9M0
-CQa/aEAwoCqWsDzHuwC/PbUsPbwWYaQSkbMblgoHUhjWzaqZmU6leqoShjy8TZtY
-Z8M+elt1dafhE5uryFHJMDdrbyH0jfkyX2ENLTsEuI3FGNtkzUGXunEE0JZ6A3/O
-xZwFOOjCWTqp0MZTpb4N8RzDN6TjYXCQD4AdgGq3A07lH7sfixyqBTg6LaqOv4jf
-XW4zO1sIGMz5kCcEquxSp+IDX1zfr0vcrksri/RU1a/rddwXJiheaUB3fLnJOeIq
-FO2AOIeOsbkHUOMiZfYNjy65nvrZlaENUGrVf+L+8BET0ygyTok7Lw5YYLE6Ax0S
-AHFQO8mRDHgcBV8EvboSNxBwpo4xZ+zj/G7PizyL5Y3ZrdKaU6esmPFVddUC/5Jh
-q/N6WWMi7lz5tvrJ9YhKKnweumBLfZmYKYWYZV3DoBOal1gQtCRdmPHj0imDqK17
-KaFxEOJV66sz5PZrkTigQQ/gul7k8xDMcBV5iWnb6L1iWI01UhqatLyH2Yw7jmz4
-KyjgKTTLq8+UHTdsIEDfYBpF1bIUQpQyb58l7nnPIWoqTGTzf00j5XzhhvJX71C8
-TiJ0ocoCqClo2uoWpy9z0Uph+mY0ACx7J83A+6azKmUH8aNr+OZJKmLjkJYg7Xjz
-NIK5jLK+q45xBVTW/a6wRITSXDxL1P2wD2PQpUo/KraDD5V6AhUuIH+AmU0x42NI
-P6uu9GrAA9QidZr72nOQb49Wz7WWIt1cPWTotFWyem+8Bdzib219Xc2jrzNqkC89
-GGBV6ZpvmM9cbx3hqwEJNI0pN9vNTsPv3LRck8TrM+gGuWPTt0TL1LW6DcTNlES2
-P8xjJ71K2McX/pTXaqGSWYNXeGVl3vC0I+sMGjWiX75fl4KTHMTFVpZmm8OKdRLE
-Bx3dpTZ/u9cDxxAdz+UXQNtwq1ycr2wjoxgiv72sk6c3AXsPDMdtjhlyWq/P6GaU
-ZbfWCRNwMQqLJHNzqJLmOFVvAlY/O5xqGwcK2xoOSBUTeNOW+/elgQTlpGgsNGqK
-z2st1VHTaXZdlfVhoCdmvVpPBQR8nIawzQmsjuZaXAtJ4mTK7gGQ77CUA4Div6GD
-V5nkVfxqMBnVrKwfXgyTgnu3vmtdRbeMjlW9tnGREtMOqJ/ir6SqEW0XWjvEfqP+
-c8FxPoqUkxgIRDw54kiwjOD+H4C8b7lflPOUxfdvdIYI/sef5w3ZCN3FYm+GKRNF
-yOCs5F4V880yBvx0hqehE9fxoTrn0ZJMi+Nm3XRmgiKkK4lOqe6LjjPyZ6u+Ylgc
-J51JT7y74RPiuZy98C8uvZcprICx9+xMvQeIcYVIx98pPxjzYPUI6MfmNUvtWRZv
-Gt9EcrTmlEQDlO+aFt8u25dpgokyMjXNcVR44uA7W+43dowekJCIjLCN0hcpUHPN
-bw8aA212iVGRtKKoZu9nzg==
------END ENCRYPTED PRIVATE KEY-----

conf/includes/ec-server.pass

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

conf/includes/localhost.conf

@@ -17,7 +17,7 @@ organizationName_default    = localhost
 organizationalUnitName      = organizationalunit
 organizationalUnitName_default = Development
 commonName                  = Common Name (e.g. server FQDN or YOUR name)
-commonName_default          = eaf-staging.mes.infineon.com
+commonName_default          = localhost
 commonName_max              = 64
 
 [req_ext]
@@ -27,16 +27,10 @@ subjectAltName = @alt_names
 subjectAltName = @alt_names
 
 [alt_names]
-DNS.1   = eaf-staging.mes.infineon.com
+DNS.1   = localhost
-DNS.2   = http://mestsa07ec.ec.local/
+DNS.2   = 127.0.0.1
-DNS.3   = localhost
-DNS.4   = 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/wwwroot.conf

@@ -1,4 +0,0 @@
-location / {
-    root "D://wwwroot";
-    try_files $uri $uri/ /index.html =404;
-}

conf/nginx.conf

@@ -11,34 +11,12 @@ http {
         listen 80;
         listen 443 ssl http2;
         listen [::]:443 ssl http2;
-        server_name *.mes.infineon.com;
-        # http://eaf-staging.mes.infineon.com/Background?set_is_primary_instance=true
-        # 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/EAF-Viewer.Server.conf";
-    }
-    server {
-        listen 80;
-        listen 443 ssl http2;
-        listen [::]:443 ssl http2;
-        server_name mestsa07ec.*;
-        # http://mestsa07ec.infineon.com/Background?set_is_primary_instance=true&a
-        # 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/EDA Viewer.conf";
-    }
-    server {
-        listen 5050;
         server_name localhost;
-        include "includes/html.conf";
+        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";
     }
@@ -63,24 +41,19 @@ http {
         include "includes/ProgramData.conf";
     }
     server {
-        listen 8011;
+        listen 8080;
-        server_name localhost;
+        server_name ~(oi-metrology-viewer-archive).mes.infineon.com;
-        include "includes/Gogs.conf";
+        location / {
+            include "includes/Archive.conf";
+        }
+    }
+    server {
+        listen 8080;
+        server_name ~(oi-metrology-viewer-prod).mes.infineon.com;
+        location / {
+            include "includes/Viewer.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;