From 648881fb0132d0270ce9f0124ce66757365e6bd0 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Thu, 18 May 2023 15:43:59 -0500
Subject: [PATCH] Update nginx confs for proxy mod (#698)

* Update default.conf.sample

* Update proxy.conf.sample

* Update Dockerfile

* Delete proxy.conf.sample

* Update Dockerfile
---
 Dockerfile                                    |  4 ++-
 root/defaults/nginx/proxy.conf.sample         | 31 -------------------
 .../nginx/site-confs/default.conf.sample      | 10 +++---
 3 files changed, 9 insertions(+), 36 deletions(-)
 delete mode 100644 root/defaults/nginx/proxy.conf.sample

diff --git a/Dockerfile b/Dockerfile
index c2e3216..6fccfd0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,9 +20,11 @@ RUN \
 # copy local files
 COPY root/ root/
 
+ADD https://raw.githubusercontent.com/linuxserver/docker-swag/master/root/defaults/nginx/proxy.conf.sample /root/defaults/nginx/proxy.conf.sample
+
 FROM scratch
 
 LABEL maintainer="Roxedus"
 
 # copy proxy-confs
-COPY --from=grab-stage root/ /
\ No newline at end of file
+COPY --from=grab-stage root/ /
diff --git a/root/defaults/nginx/proxy.conf.sample b/root/defaults/nginx/proxy.conf.sample
deleted file mode 100644
index a5aa6b5..0000000
--- a/root/defaults/nginx/proxy.conf.sample
+++ /dev/null
@@ -1,31 +0,0 @@
-## Version 2022/09/02 - Changelog: https://github.com/linuxserver/docker-mods/blob/nginx-proxy-confs/root/defaults/nginx/proxy.conf.sample
-
-# Timeout if the real server is dead
-proxy_next_upstream error timeout invalid_header http_500 http_502 http_503;
-
-# Proxy Connection Settings
-proxy_buffers 32 4k;
-proxy_connect_timeout 240;
-proxy_headers_hash_bucket_size 128;
-proxy_headers_hash_max_size 1024;
-proxy_http_version 1.1;
-proxy_read_timeout 240;
-proxy_redirect  http://  $scheme://;
-proxy_send_timeout 240;
-
-# Proxy Cache and Cookie Settings
-proxy_cache_bypass $cookie_session;
-#proxy_cookie_path / "/; Secure"; # enable at your own risk, may break certain apps
-proxy_no_cache $cookie_session;
-
-# Proxy Header Settings
-proxy_set_header Connection $connection_upgrade;
-proxy_set_header Early-Data $ssl_early_data;
-proxy_set_header Host $host;
-proxy_set_header Proxy "";
-proxy_set_header Upgrade $http_upgrade;
-proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-proxy_set_header X-Forwarded-Host $host;
-proxy_set_header X-Forwarded-Proto https;
-proxy_set_header X-Forwarded-Ssl on;
-proxy_set_header X-Real-IP $remote_addr;
\ No newline at end of file
diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample
index 507485c..03e13d9 100644
--- a/root/defaults/nginx/site-confs/default.conf.sample
+++ b/root/defaults/nginx/site-confs/default.conf.sample
@@ -1,14 +1,16 @@
-## Version 2022/09/02 - Changelog: https://github.com/linuxserver/docker-mods/blob/nginx-proxy-confs/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2023/05/18 - Changelog: https://github.com/linuxserver/docker-mods/commits/nginx-proxy-confs/root/defaults/nginx/site-confs/default.conf.sample
 
 server {
     listen 80 default_server;
     listen [::]:80 default_server;
 
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
+    listen 443 ssl http2 default_server;
+    listen [::]:443 ssl http2 default_server;
 
     server_name _;
 
+    include /config/nginx/ssl.conf;
+
     set $root /app/www/public;
     if (!-d /app/www/public) {
         set $root /config/www;
@@ -43,4 +45,4 @@ server {
 # enable subdomain method reverse proxy confs
 include /config/nginx/proxy-confs/*.subdomain.conf;
 # enable proxy cache for auth
-proxy_cache_path cache/ keys_zone=auth_cache:10m;
\ No newline at end of file
+proxy_cache_path cache/ keys_zone=auth_cache:10m;