From 7fe2341520eb694a7fde44f02b3a006aa1989348 Mon Sep 17 00:00:00 2001 From: laur Date: Tue, 22 Oct 2024 17:51:25 +0200 Subject: [PATCH 01/10] recipes.subdomain.conf: remove comment containing dead URL - note our sample already contains the authelia info that's in-line with all other proxy confs; no need for additional instructions --- recipes.subdomain.conf.sample | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipes.subdomain.conf.sample b/recipes.subdomain.conf.sample index 2c772ea..4789c76 100644 --- a/recipes.subdomain.conf.sample +++ b/recipes.subdomain.conf.sample @@ -3,9 +3,6 @@ # make sure that your dns has a cname set for recipes # make sure to mount /media/ in your swag container to point to your Recipes Media directory -# if using Authelia use this one: -# Doc: https://vabene1111.github.io/recipes/install/docker/#using-proxy-authentication - server { listen 443 ssl; listen [::]:443 ssl; From f1d1b33c18645acf67439310700fc976ab321bdc Mon Sep 17 00:00:00 2001 From: pagdot Date: Sun, 27 Oct 2024 18:51:25 +0100 Subject: [PATCH 02/10] Update port in maintainerr.subdomain.conf.sample default port changed in v2.0.0 https://github.com/jorenn92/Maintainerr/releases/tag/v2.0.0 --- maintainerr.subdomain.conf.sample | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainerr.subdomain.conf.sample b/maintainerr.subdomain.conf.sample index b596d18..c89d202 100644 --- a/maintainerr.subdomain.conf.sample +++ b/maintainerr.subdomain.conf.sample @@ -1,4 +1,4 @@ -## Version 2024/07/16 +## Version 2024/10/27 # make sure that your maintainerr container is named maintainerr # make sure that your dns has a cname set for maintainerr @@ -38,7 +38,7 @@ server { include /config/nginx/proxy.conf; include /config/nginx/resolver.conf; set $upstream_app maintainerr; - set $upstream_port 80; + set $upstream_port 6246; set $upstream_proto http; proxy_pass $upstream_proto://$upstream_app:$upstream_port; From dff308b84b84fbc9597c68cba9de821562478e5c Mon Sep 17 00:00:00 2001 From: pagdot Date: Sun, 27 Oct 2024 18:54:08 +0100 Subject: [PATCH 03/10] Update maintainerr.subdomain.conf.sample --- maintainerr.subdomain.conf.sample | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainerr.subdomain.conf.sample b/maintainerr.subdomain.conf.sample index c89d202..c4dad52 100644 --- a/maintainerr.subdomain.conf.sample +++ b/maintainerr.subdomain.conf.sample @@ -1,6 +1,7 @@ ## Version 2024/10/27 # make sure that your maintainerr container is named maintainerr # make sure that your dns has a cname set for maintainerr +# maintainerr v2.0.0+ only server { listen 443 ssl; From 869771c29b07c285eba322c59fb3617d62458aab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Oct 2024 20:34:08 +0000 Subject: [PATCH 04/10] Bump actions/checkout from 4.1.7 to 4.2.2 Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.2. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.7...v4.2.2) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/check_samples.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_samples.yml b/.github/workflows/check_samples.yml index b9fd5b1..429705d 100644 --- a/.github/workflows/check_samples.yml +++ b/.github/workflows/check_samples.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.2 - name: Check Allowed File Names run: | From fcbdb3b168b7243a4754cb2d9e680837179ec6a1 Mon Sep 17 00:00:00 2001 From: Timothy Pillow Date: Sat, 2 Nov 2024 12:23:23 +0100 Subject: [PATCH 05/10] Create dnsdist.subdomain.conf.sample --- dnsdist.subdomain.conf.sample | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 dnsdist.subdomain.conf.sample diff --git a/dnsdist.subdomain.conf.sample b/dnsdist.subdomain.conf.sample new file mode 100644 index 0000000..7be044a --- /dev/null +++ b/dnsdist.subdomain.conf.sample @@ -0,0 +1,31 @@ +# make sure that your container is named dnsdist +# make sure that your dns has a cname set for dnsdist + +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + + server_name dnsdist.*; + + include /config/nginx/ssl.conf; + + server_tokens off; + + location /dns-query { + include /config/nginx/proxy.conf; + include /config/nginx/resolver.conf; + set $upstream_app dnsdist; + set $upstream_port 443; + set $upstream_proto grpc; + grpc_pass grpcs://$upstream_app:$upstream_port; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Protocol $scheme; + proxy_set_header Range $http_range; + proxy_set_header If-Range $http_if_range; + } +} From e0082b39b21c9229e477fa2afdb350ea16fe91d8 Mon Sep 17 00:00:00 2001 From: Timothy Pillow Date: Sat, 2 Nov 2024 12:32:04 +0100 Subject: [PATCH 06/10] Update dnsdist.subdomain.conf.sample --- dnsdist.subdomain.conf.sample | 1 + 1 file changed, 1 insertion(+) diff --git a/dnsdist.subdomain.conf.sample b/dnsdist.subdomain.conf.sample index 7be044a..b14ce81 100644 --- a/dnsdist.subdomain.conf.sample +++ b/dnsdist.subdomain.conf.sample @@ -1,3 +1,4 @@ +## Version 2024/11/02 # make sure that your container is named dnsdist # make sure that your dns has a cname set for dnsdist From 4427db3045bda1166a087a1cc0d2832c73cb4e06 Mon Sep 17 00:00:00 2001 From: pagdot Date: Wed, 6 Nov 2024 12:43:04 +0100 Subject: [PATCH 07/10] Update maintainerr.subdomain.conf.sample add note about previous port --- maintainerr.subdomain.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainerr.subdomain.conf.sample b/maintainerr.subdomain.conf.sample index c4dad52..ef55649 100644 --- a/maintainerr.subdomain.conf.sample +++ b/maintainerr.subdomain.conf.sample @@ -1,7 +1,7 @@ ## Version 2024/10/27 # make sure that your maintainerr container is named maintainerr # make sure that your dns has a cname set for maintainerr -# maintainerr v2.0.0+ only +# maintainerr v2.0.0+ only. for prior versions, set upstream_port to 80 server { listen 443 ssl; From 4ba5874dcfd45689acc6c8b06819ba97783f7c40 Mon Sep 17 00:00:00 2001 From: jlssmt Date: Sat, 16 Nov 2024 17:58:03 +0100 Subject: [PATCH 08/10] added beszel --- beszel.subdomain.conf.sample | 56 ++++++++++++++++++++++++++++++++++++ beszel.subfolder.conf.sample | 41 ++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 beszel.subdomain.conf.sample create mode 100644 beszel.subfolder.conf.sample diff --git a/beszel.subdomain.conf.sample b/beszel.subdomain.conf.sample new file mode 100644 index 0000000..65cbaed --- /dev/null +++ b/beszel.subdomain.conf.sample @@ -0,0 +1,56 @@ +## Version 2024/07/16 +# make sure that your beszel container is named beszel +# make sure that your dns has a cname set for beszel + +server { + listen 443 ssl; + listen [::]:443 ssl; + + server_name beszel.*; + + include /config/nginx/ssl.conf; + + client_max_body_size 0; + + # enable for ldap auth (requires ldap-location.conf in the location block) + #include /config/nginx/ldap-server.conf; + + # enable for Authelia (requires authelia-location.conf in the location block) + #include /config/nginx/authelia-server.conf; + + # enable for Authentik (requires authentik-location.conf in the location block) + #include /config/nginx/authentik-server.conf; + + location / { + # enable the next two lines for http auth + #auth_basic "Restricted"; + #auth_basic_user_file /config/nginx/.htpasswd; + + # enable for ldap auth (requires ldap-server.conf in the server block) + #include /config/nginx/ldap-location.conf; + + # enable for Authelia (requires authelia-server.conf in the server block) + #include /config/nginx/authelia-location.conf; + + # enable for Authentik (requires authentik-server.conf in the server block) + #include /config/nginx/authentik-location.conf; + + include /config/nginx/proxy.conf; + include /config/nginx/resolver.conf; + set $upstream_app beszel; + set $upstream_port 8090; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; + + } + + location ~ (/)?/api { + include /config/nginx/proxy.conf; + include /config/nginx/resolver.conf; + set $upstream_app beszel; + set $upstream_port 8090; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; + + } +} diff --git a/beszel.subfolder.conf.sample b/beszel.subfolder.conf.sample new file mode 100644 index 0000000..050d3e9 --- /dev/null +++ b/beszel.subfolder.conf.sample @@ -0,0 +1,41 @@ +## Version 2023/02/05 +# make sure that your beszel container is named beszel +# make sure that beszel is set to work with the base url /beszel/ + + +location /beszel { + return 301 $scheme://$host/beszel/; +} + +location ^~ /beszel/ { + # enable the next two lines for http auth + #auth_basic "Restricted"; + #auth_basic_user_file /config/nginx/.htpasswd; + + # enable for ldap auth (requires ldap-server.conf in the server block) + #include /config/nginx/ldap-location.conf; + + # enable for Authelia (requires authelia-server.conf in the server block) + #include /config/nginx/authelia-location.conf; + + # enable for Authentik (requires authentik-server.conf in the server block) + #include /config/nginx/authentik-location.conf; + + include /config/nginx/proxy.conf; + include /config/nginx/resolver.conf; + set $upstream_app beszel; + set $upstream_port 8090; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; + +} + +location ^~ /beszel/api { + include /config/nginx/proxy.conf; + include /config/nginx/resolver.conf; + set $upstream_app beszel; + set $upstream_port 8090; + set $upstream_proto http; + proxy_pass $upstream_proto://$upstream_app:$upstream_port; + +} From a769b716f3751b4fde4217a94458ad9598bdb5e4 Mon Sep 17 00:00:00 2001 From: jlssmt <42897917+jlssmt@users.noreply.github.com> Date: Tue, 26 Nov 2024 00:07:03 +0100 Subject: [PATCH 09/10] Update beszel.subdomain.conf.sample --- beszel.subdomain.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beszel.subdomain.conf.sample b/beszel.subdomain.conf.sample index 65cbaed..2c032f9 100644 --- a/beszel.subdomain.conf.sample +++ b/beszel.subdomain.conf.sample @@ -44,7 +44,7 @@ server { } - location ~ (/)?/api { + location ~ (/beszel)?/api { include /config/nginx/proxy.conf; include /config/nginx/resolver.conf; set $upstream_app beszel; From 3755ae01f112ba3b9d8f8dbbad4f69832a5217f3 Mon Sep 17 00:00:00 2001 From: Timothy Pillow Date: Tue, 26 Nov 2024 10:45:27 +0100 Subject: [PATCH 10/10] =?UTF-8?q?remove=20redundant=20directives,=20tested?= =?UTF-8?q?=20ok=20=E2=9C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dnsdist.subdomain.conf.sample | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/dnsdist.subdomain.conf.sample b/dnsdist.subdomain.conf.sample index b14ce81..b2befca 100644 --- a/dnsdist.subdomain.conf.sample +++ b/dnsdist.subdomain.conf.sample @@ -1,4 +1,4 @@ -## Version 2024/11/02 +## Version 2024/11/26 # make sure that your container is named dnsdist # make sure that your dns has a cname set for dnsdist @@ -8,10 +8,6 @@ server { server_name dnsdist.*; - include /config/nginx/ssl.conf; - - server_tokens off; - location /dns-query { include /config/nginx/proxy.conf; include /config/nginx/resolver.conf; @@ -20,12 +16,6 @@ server { set $upstream_proto grpc; grpc_pass grpcs://$upstream_app:$upstream_port; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-Protocol $scheme; proxy_set_header Range $http_range; proxy_set_header If-Range $http_if_range; }