Compare commits

..

1 Commits

Author SHA1 Message Date
fa619af527 desktop-vp94spb 2023-12-28 14:40:13 -07:00
13 changed files with 140 additions and 63 deletions

1
.gitignore vendored
View File

@ -1 +0,0 @@
nginx-1.20.1

1
conf/includes/Gogs.conf Normal file
View File

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

View File

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

View File

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

View File

@ -1,23 +0,0 @@
-----BEGIN CERTIFICATE-----
MIIDvTCCAqWgAwIBAgIUCy4C1wKPnhGgZoOX5Cmu1FT5jKMwDQYJKoZIhvcNAQEL
BQAwbjELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB0FyaXpvbmExDzANBgNVBAcMBkFu
dGhlbTEPMA0GA1UECgwGUGhhcmVzMRQwEgYDVQQLDAtEZXZlbG9wbWVudDEVMBMG
A1UEAwwMbWlrZS5kZXNrdG9wMB4XDTI0MDEwMjAwMDM0OVoXDTI1MDEwMTAwMDM0
OVowbjELMAkGA1UEBhMCVVMxEDAOBgNVBAgMB0FyaXpvbmExDzANBgNVBAcMBkFu
dGhlbTEPMA0GA1UECgwGUGhhcmVzMRQwEgYDVQQLDAtEZXZlbG9wbWVudDEVMBMG
A1UEAwwMbWlrZS5kZXNrdG9wMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
AQEAkEP08Go4NBmHmKi9jS3JPPY3iA3apX0PXV37YmN1IMLW6BEX/X90o4FSadQK
iyuA0BMXQM/oiM0TfIOtR6ung1aSg/dTgAp6B2SfB6/J08ELb7Mt1tZ9r0L6289X
66pWIWBKCCN4jGP69KnF/k95wHoHE99YMgaMGtAQo8r+pSeJRNeIZQ8pS96Cg3k5
aynBIxkQAEIGI5DufrpZsRzJJK367KCpz/pyb0jC37iLaCCTVPDfKag9ZvgaZjzw
fTX6T17EVfvfLeal/7L7FlC4gRaw5qWAJB+h1DYPHuy4A0lCUhG3aR06RABQADeE
7oxWMEwQJeX9YgzGTIFkOC9nLwIDAQABo1MwUTAwBgNVHREEKTAngg9kZXNrdG9w
LWJtdjR2NjaCCWxvY2FsaG9zdIIJMTI3LjAuMC4xMB0GA1UdDgQWBBRYO/dy7DEp
xS5YJ/0zkF3MmZra8TANBgkqhkiG9w0BAQsFAAOCAQEAgNLGYSES1aQWaE6nKfol
ZY7vhTTHK3GI1RrnvzKsOpZiTHjz+mlYH4csrPTBYn++6kX4xDElqxyaWdVLOt/7
16KjoXTCJGUBK8kIkpmhGWk0AAPddW2tXCEq9BDHXuqsOUrsQVXJaXeKoJFsRD7F
apQAFHvurM+P6L9XdoOHJvlx0cWcAQscWw3tRBfmmBfaNceBoWdK5Aq9jAD48p94
tz8P+ALZSdtVAInfZ75KdmY77E4rXNmdasUfv4dO2mzyWUZPNVK1ZFo6jarFN4Tp
VcjYG8idl/Mq/nMFSAp2fNCah1LorfOBzVsGAA7o3SLHbwJ7u9Guq+kYY2CFvwWf
mA==
-----END CERTIFICATE-----

View File

@ -1,28 +0,0 @@
-----BEGIN PRIVATE KEY-----
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCQQ/Twajg0GYeY
qL2NLck89jeIDdqlfQ9dXftiY3UgwtboERf9f3SjgVJp1AqLK4DQExdAz+iIzRN8
g61Hq6eDVpKD91OACnoHZJ8Hr8nTwQtvsy3W1n2vQvrbz1frqlYhYEoII3iMY/r0
qcX+T3nAegcT31gyBowa0BCjyv6lJ4lE14hlDylL3oKDeTlrKcEjGRAAQgYjkO5+
ulmxHMkkrfrsoKnP+nJvSMLfuItoIJNU8N8pqD1m+BpmPPB9NfpPXsRV+98t5qX/
svsWULiBFrDmpYAkH6HUNg8e7LgDSUJSEbdpHTpEAFAAN4TujFYwTBAl5f1iDMZM
gWQ4L2cvAgMBAAECggEADLxLD7w4yPSmAUaIMUHk/YI45cRfVHOlWxc0XXutN96r
bSIxLXpGeDau6VPEOIP3I6dDyr9v5j/AZCIVtnmDWLdYSNkZIHkMS8HIvjt5BD4K
/enh9pDJ2KJ/lc8Ikm/fmaOv9Wb4OeCLo3SnW2t1spWzMUBqv0PPs4BBr8v4Tej9
IQoiNHMnUv724kHvSGH1yQ7Pdv2oX1eWjZEYjpyZrwN6pne4uizpB5tqYGiu95iE
QryRVtBCjmk6iHz3xwXGgTn9Ek8dwg2H1o1wKEv4u5/4Hxq4iI4IMEg+u3rlaVz6
3uBRDBFRZhpXoYKbzo7BNj0kCHwijc2UFDQHp2ovOQKBgQDI1720vsFoC4cqH9Dj
a0WaJtfgukn/hG6pgt2WmHlx791DgYGojMXWPPnnKGFfZVQExopOsojVybyz1uTZ
Dcn2hQabWo6JLnDh36dvaNBAxuyzmfmSXROD0uWeX9qJBPrjY8ao7AvSe7w0cWjY
DhgkFlifD3akRc5+EmhFnkCKeQKBgQC34owLJ96oIjef10PS1TPnIkgyciVGq+ES
6OUvm0wMHImrDabW4IDGYwGI3lfMAFgOiLM+Y7cd3czZHB7uyxpDr2tfdggR9VB4
KzpOmrZtb2Wrew0SBurPNOk1ONwHM9ReAgq4+7xFzYsHGXMWwZZ59hgRSLGhdZ6Y
JkUb4ekU5wKBgQCE+YpJ5E5rU86fDkegewKvSG6ABPc/bPBT3ShXMAagcD6gFlvB
O8s0yFRxPuQRZCZXrxgdeMluOs5sh6gnKaEBThwMuc1LeGsWsZzK/6t6Z/qKAzUh
OezUx8ptrGslcx2ldgcvCnHdXz1Bv6C6A8LqCb2NOpDDvNA12nwdM+TpiQKBgGkO
6xoYjlKbMhKFh392RfAhGwSPSJLG8pG+M+ruHBWzXEg5RX/wxkISILdU6O5pp+Wt
3lKf3+gVZ8sHEPk3Wuse1wa0RcoU0QPHFsoABIgjo//EDuSkxRTbUv4QXU1UJFoN
apjjYl6zH2JP/PwcYF+P5ZJCaRIpRBIDk2ppuKQzAoGBAKmlwZesnk6R4ZBSQkJ9
I+2515sv4iyllPkkw43U8IHUZD8iENCtmYpMqqIGf8RYnkxOUR3N56Zx/XEW4foG
5bz20mQUq8v4q9iqtNMGzJgMxC9VK3E4nGYdvkRa+Pizu8Lot54ZrzgaishnXFCE
pdwvuc9GTJ/bvyCK7jfLu64F
-----END PRIVATE KEY-----

View File

@ -1,6 +1,6 @@
[req] [req]
default_bits = 2048 default_bits = 2048
default_keyfile = desktop-bmv4v66.key default_keyfile = desktop-vp94spb.key
distinguished_name = req_distinguished_name distinguished_name = req_distinguished_name
req_extensions = req_ext req_extensions = req_ext
x509_extensions = v3_ca x509_extensions = v3_ca
@ -17,7 +17,7 @@ organizationName_default = Phares
organizationalUnitName = organizationalunit organizationalUnitName = organizationalunit
organizationalUnitName_default = Development organizationalUnitName_default = Development
commonName = Common Name (e.g. server FQDN or YOUR name) commonName = Common Name (e.g. server FQDN or YOUR name)
commonName_default = mike.desktop commonName_default = chelsea.nextcloud
commonName_max = 64 commonName_max = 64
[req_ext] [req_ext]
@ -27,11 +27,11 @@ subjectAltName = @alt_names
subjectAltName = @alt_names subjectAltName = @alt_names
[alt_names] [alt_names]
DNS.1 = mike.desktop DNS.1 = chelsea.nextcloud
DNS.1 = desktop-bmv4v66 DNS.2 = desktop-vp94spb
DNS.2 = localhost DNS.3 = localhost
DNS.3 = 127.0.0.1 DNS.4 = 127.0.0.1
# https://webscoot.io/blog/create-self-signed-certificate-ubuntu-windows-nginx/ # https://webscoot.io/blog/create-self-signed-certificate-ubuntu-windows-nginx/
# cd "C:\Program Files\Git\usr\bin" # cd "C:\Program Files\Git\usr\bin"
# openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout L:\Git\NGINX-Conf\conf\includes\desktop-bmv4v66.key -out L:\Git\NGINX-Conf\conf\includes\desktop-bmv4v66.crt -config L:\Git\NGINX-Conf\conf\includes\desktop-bmv4v66.conf # 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

View File

@ -0,0 +1,23 @@
-----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-----

View File

@ -0,0 +1,28 @@
-----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-----

29
conf/includes/dex.conf Normal file
View File

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

View File

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

View File

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

View File

@ -11,12 +11,22 @@ http {
listen 443 ssl http2; listen 443 ssl http2;
listen [::]:443 ssl http2; listen [::]:443 ssl http2;
server_name localhost; server_name localhost;
ssl_certificate "includes/desktop-bmv4v66.crt"; ssl_certificate "includes/desktop-vp94spb.crt";
ssl_certificate_key "includes/desktop-bmv4v66.key"; ssl_certificate_key "includes/desktop-vp94spb.key";
ssl_protocols TLSv1.2 TLSv1.1 TLSv1; ssl_protocols TLSv1.2 TLSv1.1 TLSv1;
# include "includes/html.conf"; # include "includes/html.conf";
location / { proxy_pass http://localhost:8384; } include "includes/Nextcloud.conf";
error_page 500 502 503 504 /50x.html; error_page 500 502 503 504 /50x.html;
include "includes/html-error.conf"; include "includes/html-error.conf";
} }
} server {
listen 80;
listen [::]:80;
server_name localhost;
location / {
root html;
index index.html index.htm;
}
}
}