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: | diff --git a/maintainerr.subdomain.conf.sample b/maintainerr.subdomain.conf.sample index b596d18..ef55649 100644 --- a/maintainerr.subdomain.conf.sample +++ b/maintainerr.subdomain.conf.sample @@ -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; diff --git a/paperless.subdomain.conf.sample b/paperless.subdomain.conf.sample index 7692091..c4f070d 100644 --- a/paperless.subdomain.conf.sample +++ b/paperless.subdomain.conf.sample @@ -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; + + } } diff --git a/paperless.subfolder.conf.sample b/paperless.subfolder.conf.sample index 73f6baf..f51996d 100644 --- a/paperless.subfolder.conf.sample +++ b/paperless.subfolder.conf.sample @@ -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; + +} 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;