desktop-ka0lmmj

2024-01-01 19:21:43 -07:00
13 changed files with 63 additions and 140 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+nginx-1.20.1
--- a/conf/includes/Gogs.conf
+++ b/conf/includes/Gogs.conf
@ -1 +0,0 @@
-location / { proxy_pass http://localhost:3000; }
--- a/conf/includes/Nextcloud.conf
+++ b/conf/includes/Nextcloud.conf
@ -1 +0,0 @@
-location / { proxy_pass http://localhost:8081; }
--- 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/desktop-ka0lmmj.conf
+++ b/conf/includes/desktop-ka0lmmj.conf
@ -1,6 +1,6 @@
 [req]
 default_bits       = 2048
-default_keyfile    = desktop-vp94spb.key
+default_keyfile    = desktop-ka0lmmj.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          = chelsea.nextcloud
+commonName_default          = mike.desktop
 commonName_max              = 64

 [req_ext]
@ -27,11 +27,11 @@ subjectAltName = @alt_names
 subjectAltName = @alt_names

 [alt_names]
-DNS.1   = chelsea.nextcloud
-DNS.2   = desktop-vp94spb
-DNS.3   = localhost
-DNS.4   = 127.0.0.1
+DNS.1   = chelsea.desktop
+DNS.1   = desktop-ka0lmmj
+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-vp94spb.key -out L:\Git\NGINX-Conf\conf\includes\desktop-vp94spb.crt -config L:\Git\NGINX-Conf\conf\includes\desktop-vp94spb.conf
+# openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout L:\Git\NGINX-Conf\conf\includes\desktop-ka0lmmj.key -out L:\Git\NGINX-Conf\conf\includes\desktop-ka0lmmj.crt -config L:\Git\NGINX-Conf\conf\includes\desktop-ka0lmmj.conf
--- a/conf/includes/desktop-ka0lmmj.crt
+++ b/conf/includes/desktop-ka0lmmj.crt
@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIIDvTCCAqWgAwIBAgIUOsg4aPDaIFSGEvs6RHMXhJbX3jAwDQYJKoZIhvcNAQEL
+BQAwbjELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB0FyaXpvbmExDzANBgNVBAcMBkFu
+dGhlbTEPMA0GA1UECgwGUGhhcmVzMRQwEgYDVQQLDAtEZXZlbG9wbWVudDEVMBMG
+A1UEAwwMbWlrZS5kZXNrdG9wMB4XDTI0MDEwMjAyMjA0M1oXDTI1MDEwMTAyMjA0
+M1owbjELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB0FyaXpvbmExDzANBgNVBAcMBkFu
+dGhlbTEPMA0GA1UECgwGUGhhcmVzMRQwEgYDVQQLDAtEZXZlbG9wbWVudDEVMBMG
+A1UEAwwMbWlrZS5kZXNrdG9wMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEApRt53Dn5+U1gfLEbpjlG6YhlE2Q3ZGZMPIpyw3YuR6BDiLgm54h3n7AU0hPs
+QziYRV5LolHlQ6kVxdNA0CIiehmNVEQGmkrVDUO0+CM7vE6DgT2+tQdENJrFk2+J
+RVLIgzdop0RWF+kiT+xMn62muygsZYB2cmoHBr1mPnh6DZthF8H4gp397TTxTxpn
+r5RZNcFdKL2OEkquKf7OsGHKL7fGygq0kyCJ8YuYPC330jsocMto3AEKIzgTRHwp
+km3FojVcS1eguksO9Yjn37ypDAYoARV79T4MzPM+XvWbFnVSMVhFLgTzoY3xH01z
+eqKEVEIwNpHw75Bte9ae0Gi08QIDAQABo1MwUTAwBgNVHREEKTAngg9kZXNrdG9w
+LWthMGxtbWqCCWxvY2FsaG9zdIIJMTI3LjAuMC4xMB0GA1UdDgQWBBQZ6BSgYpeU
+anSU2i3jKLNsowe5LDANBgkqhkiG9w0BAQsFAAOCAQEAmnEelJm3JNb3Ymj7Ti0e
+fko097INlTScZvukU1b+zaecHK7vhiT6Tre+MuZTElFBUq8mwCvtoqZmHmSR7cWg
+B82Etj3r0gcemetZqF4IS2SGbU5p+FsOZj5uZ/9RYSczDUbiUuNiZpZzoj/Stqrq
+fKe0kSarnp2XLLRk8IC1/S16aXn6gvdYMEP4/lWKEzm3te5g8M0HlcEbMfPDDNMS
+AlvlDFI8yAx+enQ9rWsD2K8sMKx8JD2WYTkUk1eR2+JOMNDRERPSxBpLA8ZMnM7j
+I38Pa4cexArOCBVaFKFnf055Tgm/cI0EMBCC8P/dqfcNvsjpfQvm9I6ZMk82d+sd
+EA==
+-----END CERTIFICATE-----
--- a/conf/includes/desktop-ka0lmmj.key
+++ b/conf/includes/desktop-ka0lmmj.key
@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQClG3ncOfn5TWB8
+sRumOUbpiGUTZDdkZkw8inLDdi5HoEOIuCbniHefsBTSE+xDOJhFXkuiUeVDqRXF
+00DQIiJ6GY1URAaaStUNQ7T4Izu8ToOBPb61B0Q0msWTb4lFUsiDN2inRFYX6SJP
+7Eyfraa7KCxlgHZyagcGvWY+eHoNm2EXwfiCnf3tNPFPGmevlFk1wV0ovY4SSq4p
+/s6wYcovt8bKCrSTIInxi5g8LffSOyhwy2jcAQojOBNEfCmSbcWiNVxLV6C6Sw71
+iOffvKkMBigBFXv1PgzM8z5e9ZsWdVIxWEUuBPOhjfEfTXN6ooRUQjA2kfDvkG17
+1p7QaLTxAgMBAAECggEABvhPF4aMiJNVRYpJ/SVJmrH291+5jWfao8sh72GxsDUi
+KLdCcC+FAkUiCeDMrmVJG1OQ3JI5vBabHFHv2GF6hF5IBrTE9RY/4nqXXQrKuqcz
+Wr0/K9/5x4E5okDZAgfNvmlURgxm2IVPXSGf9fU0Fs5KOoI27dtPPt/3vR8joueZ
+EMur9yjnN91cxfH9jV73jbM5Q7sSCfKEr5MdxzyXtTz55dmZ77EcFWg4EZ/N6ZVB
+JWg3fU+bWk+L7eN1aR6Vd2ds5S+PTPs11CukuwZlPVv2vkNuHWSK84cNXZ6bx5Gs
+2S3GEowo7/Vaj7sEMVg68Yb2WgWyhbFohVV5RHAeyQKBgQDO5MP6iDL1KeFRWomF
+dSA9YrUeRF+XPjmjCaLan/adIzCN34eU28G5sixoQFm3tVwbAvojhZngJxF21Q5M
+mKRbqoDCVtVgkA5p/qWTRUHno0G0Gc5amB0I8oXlWuPZAz7lg6Td8XRxtmy+bi3H
+PbacgfqeWuCeHBJCUirLnphwSQKBgQDMS7MBf5g8UB4SLh6JwgWiD4PA3kxhoZjP
+P/odaotzktgDTG8Ki7PqvqTgoRoknkLcdwCZRcjfqqm6qhTU7gkpAvg5zfk8YQO4
+aysBWxJ7khZGnIIGvh9Cg4FJXLeJozUXKIB/zwU22lfNJG8VYNG9Hg9eOh3V9BT5
+pceTN5tvaQKBgQCiKD9Kj5GRAiAtiU6cIW8BbeoTLPfXLNgz5wuTWykJhFk7+WTk
+0VEHYJTZqQYorKbiLPUs/jvaqgRQJTEt6712cy60IybepkoF3aacxP2gth57MHbC
+HtMy/hLf7tsCbj7P2NxRcDwaHCcjImwS61XDWUS69PN0OQA+pvQP3+AOsQKBgFiN
+S2cP3nXuKEqrEPOXVQe8/9f+w07iU7EpwwkzIIUVFmq/m7YPfgn3XtI7InDS5JpZ
+ProxJHPGrtFJXcQ59WCAeAXeQPUp/AnY8gghaK6FUQCEYFv51uTmyYh6FtgjFSUX
+mjNMEa+IDtzNuRSkJeV6fSDTwhD2Po1DjXFDfi1ZAoGBAJUrphHp5z7IOe6yw0Ui
+PU8fsA33uaNFy5M97MCygNRt/7elizodVKLZfqyoXKJ1YvCkPax8P+T78OWq0sre
+Zv7dL1zKJlUnvw05Pu+/O0gTc/8yBNotuiU5dFIQd/yVEbFlOFGC9mcZBcMBdbkm
+kjLk2e0xy0iI6NZMLtix6B2
+-----END PRIVATE KEY-----
--- a/conf/includes/desktop-vp94spb.crt
+++ b/conf/includes/desktop-vp94spb.crt
@ -1,23 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIID2jCCAsKgAwIBAgIUMbgmULXEHHQVagEHHT6Als9eDdgwDQYJKoZIhvcNAQEL
-BQAwczELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB0FyaXpvbmExDzANBgNVBAcMBkFu
-dGhlbTEPMA0GA1UECgwGUGhhcmVzMRQwEgYDVQQLDAtEZXZlbG9wbWVudDEaMBgG
-A1UEAwwRY2hlbHNlYS5uZXh0Y2xvdWQwHhcNMjMxMjI4MDIwNTUzWhcNMjQxMjI3
-MDIwNTUzWjBzMQswCQYDVQQGEwJVUzEQMA4GA1UECAwHQXJpem9uYTEPMA0GA1UE
-BwwGQW50aGVtMQ8wDQYDVQQKDAZQaGFyZXMxFDASBgNVBAsMC0RldmVsb3BtZW50
-MRowGAYDVQQDDBFjaGVsc2VhLm5leHRjbG91ZDCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBANnRYvvPR12GXQTal/SyVv0hJ0wpeU7grcG9Q/u3Rx3HxR4S
-C766cBPerlgio1Lk2isa91MGH7RRb71QdLVMozlg5InWLnpqEfLDDA46F8K+THG9
-fldYfivt60nkIfSnj52PgfXtwy3BC4uUI/Fak96E9hyiNYywt9GKo6N6Xj7wn9PE
-uAILVLa26Dj+vnQbubLHrmPIp3cD6YMAyZH8TgktyuhKhI+iMTlHEi32ObQvITeA
-+ZGcKmJirfO3zasF8qyJZ7x/UaC9UsKvJAclBfRB91HFukSzqjCqdsufUugKo3g+
-4wHOzpdisnSL07kUHBUtssmALHoIrFYYXv8zf1MCAwEAAaNmMGQwQwYDVR0RBDww
-OoIRY2hlbHNlYS5uZXh0Y2xvdWSCD2Rlc2t0b3AtdnA5NHNwYoIJbG9jYWxob3N0
-ggkxMjcuMC4wLjEwHQYDVR0OBBYEFHH9qNOoGdhBkS9p+WfH5mwUG7JmMA0GCSqG
-SIb3DQEBCwUAA4IBAQBOzaEiglIP67FhWD95wrfz+qMBDH0JkR5as6p83JZYd8tr
-8Tv8eEKzmbpeX0zBoWNLT9rbVEfWh2DrsFCkZvfAtSwt+2VUTNvLFw7M4l76LPcj
-WwCS7n+8SsdEiWg/29nC0HHDKid8LGO3vfc3HdZk2/2x2JbG0N8A51aPVHOYLvF8
-pJhmFfwRHbEhk0VhsBrDCuFsOZELDZCHJ7QWMAYOw/+DbkVNnG07tztMl723EMKt
-mgMnrGMf6a/czOGmakdTAzsowQlBahr1G9bYgn521v62N4ue2StrWpqxzTzo4KDD
-jKlOMAE4LmzsM3zBBDJoEkPCeTHlDT2YfJqOXDz1
-----END CERTIFICATE-----
--- a/conf/includes/desktop-vp94spb.key
+++ b/conf/includes/desktop-vp94spb.key
@ -1,28 +0,0 @@
-----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDZ0WL7z0ddhl0E
-2pf0slb9ISdMKXlO4K3BvUP7t0cdx8UeEgu+unAT3q5YIqNS5NorGvdTBh+0UW+9
-UHS1TKM5YOSJ1i56ahHywwwOOhfCvkxxvX5XWH4r7etJ5CH0p4+dj4H17cMtwQuL
-lCPxWpPehPYcojWMsLfRiqOjel4+8J/TxLgCC1S2tug4/r50G7myx65jyKd3A+mD
-AMmR/E4JLcroSoSPojE5RxIt9jm0LyE3gPmRnCpiYq3zt82rBfKsiWe8f1GgvVLC
-ryQHJQX0QfdRxbpEs6owqnbLn1LoCqN4PuMBzs6XYrJ0i9O5FBwVLbLJgCx6CKxW
-GF7/M39TAgMBAAECggEASUS6tBN0YQxaa9CP/tqikkE9s8vbp2HCcQIWRSzQej8B
-mmzdkImsO7LTGIiGQdMDZC6M9VuA/KnMGXVf3MBrw1hJZ+go+DqH0Q41FvAJoBNd
-KYFhZ0Y4ItTEKbXYijB3CbwFLlGNLu3Z0VjCgmRCiz5Ufys9MhcbrhuhkdMOssKl
-DpfM5TSvUz61W04WEwCPQeW7BplVX+XqggFB1bW9JMTQrx+1byjHd9kLH+kKjIal
-ni8YPa9evBL3jENAxZCMLWM26wOUBbq94ZanqKGaF4DnXC0dn2hZBaZ4S7qfGS0u
-U0L3I31532MUNh+X6RlNm7eSFxNE1vV9IwCxq1En0QKBgQD6RHMZZmpejz0O03wf
-wF8KMVwt4E5JHNLazBdo2m4Wn9RRJ4vV7KrAXkIqqw3Ll90WVwskgH+EReSDg7T2
-4i2STOWfPgr5vsnpHM97G8Cu3k8LM6PYo61IOhkmnGgP3TwcG/1dOkHbLJlTgUeX
-YgRevADq8XnLQ23h2he8eOPxKQKBgQDezqfZYRgumppegAc+PymM/8na+NS0D/Lm
-7jyhZk6asYW52vA3ECVWlJ4ZJOndYEZzkQKYbahGJrEyKzteaQyRB/u112m0qe8w
-siRYdslldf8yzYAeun3iD9eyqDVn5yoWnrkguKT8F+V3amoIy5dvt8HvbHnzDa2R
-Q2qLsbKQGwKBgFKMm26IYpOYKaqnRWzvtimViHM1Zn0lPcOfyCT0z5U02QJ/ydch
-Pl0/ehG65E0AZZOF2I4MuIL3zt02Z0174047gQ4al+Iy9USoFSPlTpQfjfEC8ot1
-yaVmTH943bZF4hrffJ3wpmJV/qkVnningwuAdckJJ4RNVIRHvMaVFZKpAoGAJlQS
-l9iWGl5KM/t+Q30GHtVZ2it4G8mqlYNiNrmsx/vF72T0ceR7J9vFHro06PpI5FSL
-x8EFc5vwW5sISYN0v/ZJnMyDyKp7FTtv+S/mEWgtEIY9hgu64AqtpnQ9S7R+jwma
-+0AIUb2iodpSh1TOpk9MM23LxL4Tn6ujRoi5GQUCgYAWRsAUNou3cCHoqXlHQkKa
-DxIc7yUj9/KEQDFNW31azqzQmPK3XSi/gWzRsrfpai1LzVyL2GaY0cgvzMvPrI4F
-gCVlT/nL0X7hItYBRPTZ73fTohdUKFgv6O8Gkryh1OZnrmf337sNNx8ucMm9pc3Z
-F6rhl3G5JTpVjWccCBFCig==
-----END PRIVATE KEY-----
--- a/conf/includes/dex.conf
+++ b/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;
-}
--- a/conf/includes/syncthing.conf
+++ b/conf/includes/syncthing.conf
@ -1,8 +0,0 @@
-location / { proxy_pass http://localhost:8384; }
-    # server {
-    #     listen 8011;
-    #     server_name localhost;
-    #     location / {
-    #         proxy_pass http://localhost:8384;
-    #     }
-    # }
--- 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
@ -11,22 +11,12 @@ http {
      listen 443 ssl http2;
      listen [::]:443 ssl http2;
      server_name localhost;
-      ssl_certificate "includes/desktop-vp94spb.crt";
-      ssl_certificate_key "includes/desktop-vp94spb.key";
+      ssl_certificate "includes/desktop-ka0lmmj.crt";
+      ssl_certificate_key "includes/desktop-ka0lmmj.key";
      ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
      # include "includes/html.conf";
-      include "includes/Nextcloud.conf";
+      location / { proxy_pass http://localhost:8384; }
      error_page 500 502 503 504 /50x.html;
      include "includes/html-error.conf";
  }
-  server {
-    listen 80;
-    listen [::]:80;
-    server_name localhost;
-    location / {
-        root html;
-        index index.html index.htm;
-    }
-  }
 }
-
				`@ -1 +0,0 @@`
				`location / { proxy_pass http://localhost:3000; }`