Merge branch 'master' into renovate/linters

docs/general/administration/hardware-selection.md

@@ -13,12 +13,18 @@ For a Jellyfin server, the following is recommended:
 
 ### Normal Server
 
-- CPU (With dGPU): Intel Core i5-2300, AMD Ryzen 3 1200 or better. (Geekbench 6 Multicore 1500 or better)
-- CPU (Without dGPU): Intel Pentium G4560, Intel Core i3-7100 or better. (Intel 7th gen or newer Pentium or better)
+- CPU (With dGPU): Intel Core i5-2300, AMD Ryzen 3 1200 or better. (Geekbench 6 Multicore 1500 or better). *CPU vendor will not have a meaningful impact on quality and/or speed of transcoding.*
+- CPU (Without dGPU): Intel Pentium G4560, Intel Core i3-7100 or better. (Intel 7th gen or newer Pentium or better, excluding J and N series)
 - RAM: 8GB or more
 - Storage: 60GB SSD storage for Jellyfin files and transcoding cache.
 - Graphics: Intel HD 6xx (7th gen integrated graphics) or newer, Nvidia GTX 16 / RTX 20 series or newer (excluding GTX 1650). Intel is recommended over Nvidia. AMD and Apple Silicon are not recommended.
 
+:::note Intel "Atom" CPUs
+
+Atom CPUs in this guide refer to any Intel Atom CPUs, as well as other low powered Intel CPUs such as J/M/N/Y series from other product lines. (eg. Pentium N5105, Pentium N6000, Core i3 N305). While these CPUs are branded as products from other product lines, they use the same microarchitecture as Intel's low powered chipsets and may be significantly less powerful and have less features than their names might otherwise suggest.
+
+:::
+
 :::note These are Recommended Specs
 
 These specs are the **recommended** specs to run Jellyfin. They are not minimum requirements, and it is certainly possible to run Jellyfin on lower end hardware.

docs/general/networking/nginx.md

@@ -49,7 +49,7 @@ server {
     # in this example we are using a hostname which is resolved via DNS
     # (if you aren't using DNS remove the resolver line and change the variable to point to an IP address e.g `set $jellyfin 127.0.0.1`)
     set $jellyfin jellyfin;
-    resolver 127.0.0.1 valid=30;
+    resolver 127.0.0.1 valid=30s;
 
     #ssl_certificate /etc/letsencrypt/live/DOMAIN_NAME/fullchain.pem;
     #ssl_certificate_key /etc/letsencrypt/live/DOMAIN_NAME/privkey.pem;
@@ -162,7 +162,7 @@ server {
     # in this example we are using a hostname which is resolved via DNS
     # (if you aren't using DNS remove the resolver line and change the variable to point to an IP address e.g `set $jellyfin 127.0.0.1`)
     set $jellyfin jellyfin;
-    resolver 127.0.0.1 valid=30;
+    resolver 127.0.0.1 valid=30s;
 
     # Uncomment and create directory to also host static content
     #root /srv/http/media;
@@ -177,13 +177,12 @@ server {
         return 302 $scheme://$host/jellyfin/;
     }
 
+    # The / at the end is significant.
+    # https://www.acunetix.com/blog/articles/a-fresh-look-on-reverse-proxy-related-attacks/
     location /jellyfin/ {
         # Proxy main Jellyfin traffic
 
-        # The / at the end is significant.
-        # https://www.acunetix.com/blog/articles/a-fresh-look-on-reverse-proxy-related-attacks/
-
-        proxy_pass http://$jellyfin:8096/jellyfin/;
+        proxy_pass http://$jellyfin:8096;
 
         proxy_pass_request_headers on;
 
@@ -238,19 +237,18 @@ server {
     # in this example we are using a hostname which is resolved via DNS
     # (if you aren't using DNS remove the resolver line and change the variable to point to an IP address e.g `set $jellyfin 127.0.0.1`)
     set $jellyfin jellyfin;
-    resolver 127.0.0.1 valid=30;
+    resolver 127.0.0.1 valid=30s;
 
     # Jellyfin
     location /jellyfin {
         return 302 $scheme://$host/jellyfin/;
     }
 
+    # The / at the end is significant.
+    # https://www.acunetix.com/blog/articles/a-fresh-look-on-reverse-proxy-related-attacks/
     location /jellyfin/ {
         # Proxy main Jellyfin traffic
 
-        # The / at the end is significant.
-        # https://www.acunetix.com/blog/articles/a-fresh-look-on-reverse-proxy-related-attacks/
-
         proxy_pass http://$jellyfin:8096;
 
         proxy_pass_request_headers on;
@@ -344,7 +342,7 @@ proxy_cache_path /var/cache/nginx/jellyfin levels=1:2 keys_zone=jellyfin:100m ma
 
 # Cache images (inside server block)
 location ~ /Items/(.*)/Images {
-  proxy_pass http://127.0.0.1:8096;
+  proxy_pass http://$jellyfin:8096;
   proxy_set_header Host $host;
   proxy_set_header X-Real-IP $remote_addr;
   proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -369,7 +367,7 @@ limit_conn_zone $binary_remote_addr zone=addr:10m;
 
 # Downloads limit (inside server block)
 location ~ /Items/(.*)/Download$ {
-   proxy_pass http://127.0.0.1:8096;
+   proxy_pass http://$jellyfin:8096;
    proxy_set_header Host $host;
    proxy_set_header X-Real-IP $remote_addr;
    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;