From 1d8b2cfa65ef131078fe8b22337a4f5b8153fa99 Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Mon, 18 Sep 2023 16:04:59 -0700 Subject: [PATCH] flop dex EDA mestsa07ec.ec.local Gogs proxy_set_header X-Forwarded-Proto https; ssl --- .gitignore | 2 + conf/includes/BaGet.conf | 12 +++--- conf/includes/EAF-Viewer.Server.conf | 2 +- conf/includes/EDA Viewer.conf | 1 + conf/includes/Gogs.conf | 8 ++++ conf/includes/code-server.conf | 25 ++++++++++++ conf/includes/default.conf | 8 ++++ conf/includes/dex.conf | 29 ++++++++++++++ conf/includes/ec-server.cer | 31 +++++++++++++++ conf/includes/ec-server.crt | 37 +++++++++++++++++ conf/includes/ec-server.key | 37 +++++++++++++++++ conf/includes/ec-server.pass | 1 + conf/includes/ec-server.pfx | Bin 0 -> 4292 bytes conf/includes/json.conf | 7 +++- conf/includes/localhost.conf | 42 ++++++++++++++++++++ conf/includes/wwwroot.conf | 4 ++ conf/nginx.conf | 57 +++++++++++++++++++++------ 17 files changed, 282 insertions(+), 21 deletions(-) create mode 100644 .gitignore create mode 100644 conf/includes/EDA Viewer.conf create mode 100644 conf/includes/Gogs.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/ec-server.cer create mode 100644 conf/includes/ec-server.crt create mode 100644 conf/includes/ec-server.key create mode 100644 conf/includes/ec-server.pass create mode 100644 conf/includes/ec-server.pfx create mode 100644 conf/includes/localhost.conf create mode 100644 conf/includes/wwwroot.conf diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..78e7043 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +conf/includes/localhost.crt +conf/includes/localhost.key \ 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/EAF-Viewer.Server.conf b/conf/includes/EAF-Viewer.Server.conf index 2c1e37a..5d8eb88 100644 --- a/conf/includes/EAF-Viewer.Server.conf +++ b/conf/includes/EAF-Viewer.Server.conf @@ -1 +1 @@ -location / { proxy_pass http://localhost:5006; } \ No newline at end of file +location / { proxy_pass http://localhost:5010; } diff --git a/conf/includes/EDA Viewer.conf b/conf/includes/EDA Viewer.conf new file mode 100644 index 0000000..520ad92 --- /dev/null +++ b/conf/includes/EDA Viewer.conf @@ -0,0 +1 @@ +location / { proxy_pass http://localhost:5003; } \ No newline at end of file diff --git a/conf/includes/Gogs.conf b/conf/includes/Gogs.conf new file mode 100644 index 0000000..b1680ef --- /dev/null +++ b/conf/includes/Gogs.conf @@ -0,0 +1,8 @@ +location / { + proxy_hide_header Authorization; + if ($http_Authorization != "Basic asdf") { + return 401; + } + proxy_set_header Authorization "Basic asdf"; + proxy_pass http://localhost:3000; +} \ 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..6eca895 --- /dev/null +++ b/conf/includes/dex.conf @@ -0,0 +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; + # 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; +} \ No newline at end of file diff --git a/conf/includes/ec-server.cer b/conf/includes/ec-server.cer new file mode 100644 index 0000000..44e057e --- /dev/null +++ b/conf/includes/ec-server.cer @@ -0,0 +1,31 @@ +-----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----- diff --git a/conf/includes/ec-server.crt b/conf/includes/ec-server.crt new file mode 100644 index 0000000..645ee29 --- /dev/null +++ b/conf/includes/ec-server.crt @@ -0,0 +1,37 @@ +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----- diff --git a/conf/includes/ec-server.key b/conf/includes/ec-server.key new file mode 100644 index 0000000..cabdce9 --- /dev/null +++ b/conf/includes/ec-server.key @@ -0,0 +1,37 @@ +Bag Attributes + Microsoft Local Key set: + 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----- diff --git a/conf/includes/ec-server.pass b/conf/includes/ec-server.pass new file mode 100644 index 0000000..9956456 --- /dev/null +++ b/conf/includes/ec-server.pass @@ -0,0 +1 @@ +nocert \ No newline at end of file diff --git a/conf/includes/ec-server.pfx b/conf/includes/ec-server.pfx new file mode 100644 index 0000000000000000000000000000000000000000..73c991b8b887cded2f4803835e1444b601f6c302 GIT binary patch literal 4292 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 literal 0 HcmV?d00001 diff --git a/conf/includes/json.conf b/conf/includes/json.conf index d801e61..8dc037f 100644 --- a/conf/includes/json.conf +++ b/conf/includes/json.conf @@ -1,13 +1,18 @@ -# 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; + # 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; # 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"; diff --git a/conf/includes/localhost.conf b/conf/includes/localhost.conf new file mode 100644 index 0000000..b789f73 --- /dev/null +++ b/conf/includes/localhost.conf @@ -0,0 +1,42 @@ +[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 = localhost +organizationalUnitName = organizationalunit +organizationalUnitName_default = Development +commonName = Common Name (e.g. server FQDN or YOUR name) +commonName_default = eaf-staging.mes.infineon.com +commonName_max = 64 + +[req_ext] +subjectAltName = @alt_names + +[v3_ca] +subjectAltName = @alt_names + +[alt_names] +DNS.1 = eaf-staging.mes.infineon.com +DNS.2 = http://mestsa07ec.ec.local/ +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 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..4c9d8e6 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -7,6 +7,32 @@ http { default_type application/octet-stream; sendfile on; keepalive_timeout 65; + server { + listen 80; + listen 443 ssl http2; + listen [::]:443 ssl http2; + server_name *.mes.infineon.com; + # 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.ec.local; + # 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; @@ -35,26 +61,31 @@ http { 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"; - } + 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"; } } -# mklink /J "C:\Users\phares\AppData\Local\IFXApps\nginx-1.20.1\conf" "L:\Git\NGINX-Conf\conf" +# 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