Update Certificate

.gitignore

@@ -0,0 +1,2 @@
+conf/includes/localhost.crt
+conf/includes/localhost.key

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= ""

conf/includes/Gogs.conf

@@ -0,0 +1 @@
+location / { proxy_pass http://localhost:3000; }

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
+}

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 _;
+}

conf/includes/desktop-h6jg91b.conf

@@ -1,6 +1,6 @@
 [req]
 default_bits       = 2048
-default_keyfile    = laundry.phares3757.redirectme.net.key
+default_keyfile    = desktop-h6jg91b.key
 distinguished_name = req_distinguished_name
 req_extensions     = req_ext
 x509_extensions    = v3_ca
@@ -17,7 +17,7 @@ organizationName_default    = Phares
 organizationalUnitName      = organizationalunit
 organizationalUnitName_default = Development
 commonName                  = Common Name (e.g. server FQDN or YOUR name)
-commonName_default          = laundry.phares3757.redirectme.net
+commonName_default          = desktop-h6jg91b
 commonName_max              = 64
 
 [req_ext]
@@ -27,14 +27,10 @@ subjectAltName = @alt_names
 subjectAltName = @alt_names
 
 [alt_names]
-DNS.1   = laundry.phares3757.redirectme.net
-DNS.2   = dashkiosk.laundry.phares3757.redirectme.net
-DNS.3   = gogs.laundry.phares3757.redirectme.net
-DNS.4   = nextcloud.laundry.phares3757.redirectme.net
-DNS.5   = photoprism.laundry.phares3757.redirectme.net
-DNS.6   = pi-hole.laundry.phares3757.redirectme.net
-DNS.7   = syncthing.laundry.phares3757.redirectme.net
-DNS.8   = beelink.server
-DNS.9   = beelink
-DNS.10   = localhost
-DNS.11   = 127.0.0.1
+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\desktop-h6jg91b.key -out L:\Git\NGINX-Conf\conf\includes\desktop-h6jg91b.crt -config L:\Git\NGINX-Conf\conf\includes\desktop-h6jg91b.conf

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-----

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-----

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;
+}

conf/includes/json.conf

@@ -1,24 +1,29 @@
-# 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"
+    # 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:\GitHub\NGINdeX.io"
+    # 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;
+    # 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;
 }

conf/includes/syncthing.conf

@@ -0,0 +1,8 @@
+location / { proxy_pass http://localhost:8384; }
+    # server {
+    #     listen 8011;
+    #     server_name localhost;
+    #     location / {
+    #         proxy_pass http://localhost:8384;
+    #     }
+    # }

conf/includes/wwwroot.conf

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

conf/nginx.conf

@@ -1,129 +1,38 @@
-server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
-    root /var/www/html;
-    index index.html index.htm index.nginx-debian.html;
-    server_name _;
-    location / {
-        try_files $uri $uri/ =404;
-    }
+worker_processes 1;
+events {
+    worker_connections 1024;
 }
-server {
-    ssl_certificate 'laundry.phares3757.redirectme.net.crt';
-    ssl_certificate_key 'laundry.phares3757.redirectme.net.key';
-    listen 443 ssl http2;
-    ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
-    listen [::]:443 ssl http2;
-    server_name laundry.phares3757.redirectme.net;
+http {
+  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_set_header        Host $host;
-        proxy_set_header        X-Real-IP $remote_addr;
-        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header        X-Forwarded-Proto $scheme;
-        proxy_pass              http://localhost:80/;
-        proxy_read_timeout      600s;
-        proxy_send_timeout      600s;
+      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;
     }
+  }
 }
-server {
-    ssl_certificate 'laundry.phares3757.redirectme.net.crt';
-    ssl_certificate_key 'laundry.phares3757.redirectme.net.key';
-    listen 443 ssl http2;
-    ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
-    listen [::]:443 ssl http2;
-    server_name dashkiosk.laundry.phares3757.redirectme.net;
-    location / {
-        proxy_set_header        Host $host;
-        proxy_set_header        X-Real-IP $remote_addr;
-        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header        X-Forwarded-Proto $scheme;
-        proxy_pass              http://localhost:9400/;
-        proxy_read_timeout      600s;
-        proxy_send_timeout      600s;
-    }
-}
-server {
-    ssl_certificate 'laundry.phares3757.redirectme.net.crt';
-    ssl_certificate_key 'laundry.phares3757.redirectme.net.key';
-    listen 443 ssl http2;
-    ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
-    listen [::]:443 ssl http2;
-    server_name gogs.laundry.phares3757.redirectme.net;
-    location / {
-        proxy_set_header        Host $host;
-        proxy_set_header        X-Real-IP $remote_addr;
-        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header        X-Forwarded-Proto $scheme;
-        proxy_pass              http://localhost:3000/;
-        proxy_read_timeout      600s;
-        proxy_send_timeout      600s;
-    }
-}
-server {
-    ssl_certificate 'laundry.phares3757.redirectme.net.crt';
-    ssl_certificate_key 'laundry.phares3757.redirectme.net.key';
-    listen 443 ssl http2;
-    ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
-    listen [::]:443 ssl http2;
-    server_name nextcloud.laundry.phares3757.redirectme.net;
-    location / {
-        proxy_set_header        Host $host;
-        proxy_set_header        X-Real-IP $remote_addr;
-        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header        X-Forwarded-Proto $scheme;
-        proxy_pass              http://localhost:8081/;
-        proxy_read_timeout      600s;
-        proxy_send_timeout      600s;
-    }
-}
-server {
-    ssl_certificate 'laundry.phares3757.redirectme.net.crt';
-    ssl_certificate_key 'laundry.phares3757.redirectme.net.key';
-    listen 443 ssl http2;
-    ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
-    listen [::]:443 ssl http2;
-    server_name photoprism.laundry.phares3757.redirectme.net;
-    location / {
-        proxy_set_header        Host $host;
-        proxy_set_header        X-Real-IP $remote_addr;
-        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header        X-Forwarded-Proto $scheme;
-        proxy_pass              http://localhost:2342/;
-        proxy_read_timeout      600s;
-        proxy_send_timeout      600s;
-    }
-}
-server {
-    ssl_certificate 'laundry.phares3757.redirectme.net.crt';
-    ssl_certificate_key 'laundry.phares3757.redirectme.net.key';
-    listen 443 ssl http2;
-    ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
-    listen [::]:443 ssl http2;
-    server_name ~(pi-hole).laundry.phares3757.redirectme.net;
-    location / {
-        proxy_set_header        Host $host;
-        proxy_set_header        X-Real-IP $remote_addr;
-        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header        X-Forwarded-Proto $scheme;
-        proxy_pass              http://localhost:8005/;
-        proxy_read_timeout      600s;
-        proxy_send_timeout      600s;
-    }
-}
-server {
-    ssl_certificate 'laundry.phares3757.redirectme.net.crt';
-    ssl_certificate_key 'laundry.phares3757.redirectme.net.key';
-    listen 443 ssl http2;
-    ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
-    listen [::]:443 ssl http2;
-    server_name syncthing.laundry.phares3757.redirectme.net;
-    location / {
-        proxy_set_header        Host $host;
-        proxy_set_header        X-Real-IP $remote_addr;
-        proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_set_header        X-Forwarded-Proto $scheme;
-        proxy_pass              http://localhost:8384/;
-        proxy_read_timeout      600s;
-        proxy_send_timeout      600s;
-    }
-}
+# 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