Merge branch 'master' into master

This commit is contained in:
Timothy Pillow 2024-11-26 15:14:28 +01:00 committed by GitHub
commit a7a607e8a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 24 additions and 6 deletions

View file

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

View file

@ -1,6 +1,7 @@
## 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
# maintainerr v2.0.0+ only. for prior versions, set upstream_port to 80
server {
listen 443 ssl;
@ -38,7 +39,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;

View file

@ -43,4 +43,14 @@ server {
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
}
location ~ (/paperless)?/api {
include /config/nginx/proxy.conf;
include /config/nginx/resolver.conf;
set $upstream_app paperless;
set $upstream_port 8000;
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
}
}

View file

@ -28,3 +28,13 @@ location ^~ /paperless/ {
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
}
location ~ (/paperless)?/api {
include /config/nginx/proxy.conf;
include /config/nginx/resolver.conf;
set $upstream_app paperless;
set $upstream_port 8000;
set $upstream_proto http;
proxy_pass $upstream_proto://$upstream_app:$upstream_port;
}

View file

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