From bede3ce50986c32a688d0f510742f8dbe6aaa769 Mon Sep 17 00:00:00 2001 From: hyperdefined Date: Thu, 27 Jul 2023 14:49:25 -0400 Subject: [PATCH] big cleanup --- web-configs/nginx/nginx-no-ssl.conf | 42 +++++++-------------------- web-configs/nginx/nginx-ssl.conf | 44 ++++++++--------------------- 2 files changed, 22 insertions(+), 64 deletions(-) diff --git a/web-configs/nginx/nginx-no-ssl.conf b/web-configs/nginx/nginx-no-ssl.conf index bcd70319..0b195da4 100644 --- a/web-configs/nginx/nginx-no-ssl.conf +++ b/web-configs/nginx/nginx-no-ssl.conf @@ -1,15 +1,3 @@ -# Define the location for where cobalt web runs. Change the port to fit your needs. -upstream cobaltweb { - server 127.0.0.1:9000; - keepalive 64; -} - -# Define the location for where cobalt API runs. Change the port to fit your needs. -upstream cobaltapi { - server 127.0.0.1:9001; - keepalive 64; -} - # Server block definition for cobalt web. server { # Listen for for requests to the domain on port 80. @@ -17,20 +5,15 @@ server { listen [::]:80; server_name co.wukko.sh; - # Set loggging. - access_log /var/log/nginx/co.wukko.sh.access.log; - error_log /var/log/nginx/co.wukko.sh.error.log; + # Set loggging. By default, logging is off for privacy. + # Uncomment these if you want to enable logging. + #access_log /var/log/nginx/co.wukko.sh.access.log; + #error_log /var/log/nginx/co.wukko.sh.error.log; # Pass all requests to cobalt web, as defined above. location / { - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-Server $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://cobaltweb; + proxy_pass http://127.0.0.1:9000; proxy_http_version 1.1; - proxy_pass_request_headers on; - proxy_set_header Connection "keep-alive"; - proxy_store off; } } @@ -41,19 +24,14 @@ server { listen [::]:80; server_name co.wuk.sh; - # Set loggging. - access_log /var/log/nginx/co.wuk.sh.access.log; - error_log /var/log/nginx/co.wuk.sh.error.log; + # Set loggging. By default, logging is off for privacy. + # Uncomment these if you want to enable logging. + #access_log /var/log/nginx/co.wuk.sh.access.log; + #error_log /var/log/nginx/co.wuk.sh.error.log; # Pass all requests to cobalt API, as defined above. location / { - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-Server $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://cobaltapi; + proxy_pass http://127.0.0.1:9001; proxy_http_version 1.1; - proxy_pass_request_headers on; - proxy_set_header Connection "keep-alive"; - proxy_store off; } } \ No newline at end of file diff --git a/web-configs/nginx/nginx-ssl.conf b/web-configs/nginx/nginx-ssl.conf index fd687576..ab38019c 100644 --- a/web-configs/nginx/nginx-ssl.conf +++ b/web-configs/nginx/nginx-ssl.conf @@ -16,18 +16,6 @@ server { } -# Define the location for where cobalt web runs. Change the port to fit your needs. -upstream cobaltweb { - server 127.0.0.1:9000; - keepalive 64; -} - -# Define the location for where cobalt API runs. Change the port to fit your needs. -upstream cobaltapi { - server 127.0.0.1:9001; - keepalive 64; -} - # Server block definition for cobalt web. server { # Listen for for requests to the domain on port 443. @@ -35,24 +23,20 @@ server { listen [::]:443 ssl http2; server_name co.wukko.sh; - # Set loggging. - access_log /var/log/nginx/co.wukko.sh.access.log; - error_log /var/log/nginx/co.wukko.sh.error.log; + # Set loggging. By default, logging is off for privacy. + # Uncomment these if you want to enable logging. + #access_log /var/log/nginx/co.wukko.sh.access.log; + #error_log /var/log/nginx/co.wukko.sh.error.log; # Set your HTTPS certificate. ssl_certificate /etc/letsencrypt/live/co.wukko.sh/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/co.wukko.sh/privkey.pem; # Pass all requests to cobalt web, as defined above. + # If you use a different port for cobalt web, change it here! location / { - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-Server $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://cobaltweb; + proxy_pass http://127.0.0.1:9000; proxy_http_version 1.1; - proxy_pass_request_headers on; - proxy_set_header Connection "keep-alive"; - proxy_store off; } } @@ -63,23 +47,19 @@ server { listen [::]:443 ssl http2; server_name co.wuk.sh; - # Set loggging. - access_log /var/log/nginx/co.wuk.sh.access.log; - error_log /var/log/nginx/co.wuk.sh.error.log; + # Set loggging. By default, logging is off for privacy. + # Uncomment these if you want to enable logging. + #access_log /var/log/nginx/co.wuk.sh.access.log; + #error_log /var/log/nginx/co.wuk.sh.error.log; # Set your HTTPS certificate. ssl_certificate /etc/letsencrypt/live/co.wuk.sh/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/co.wuk.sh/privkey.pem; # Pass all requests to cobalt API, as defined above. + # If you use a different port for cobalt API, change it here! location / { - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-Server $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://cobaltapi; + proxy_pass http://127.0.0.1:9001; proxy_http_version 1.1; - proxy_pass_request_headers on; - proxy_set_header Connection "keep-alive"; - proxy_store off; } } \ No newline at end of file