Merge branch 'linuxserver:master' into discount-bandit

Author: Findarato

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

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;
 

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;
+
+    }
 }

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;
+
+}