From ae8f01bb7f4d4d512d93222772309aea460484b4 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Wed, 25 May 2022 21:18:16 +0200
Subject: [PATCH] Update ingress.conf

---
 .../rootfs/etc/nginx/servers/ingress.conf     | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/photoprism/rootfs/etc/nginx/servers/ingress.conf b/photoprism/rootfs/etc/nginx/servers/ingress.conf
index 3f390a95b..8f59ae8ee 100644
--- a/photoprism/rootfs/etc/nginx/servers/ingress.conf
+++ b/photoprism/rootfs/etc/nginx/servers/ingress.conf
@@ -11,37 +11,38 @@ server {
 
     location / {
 
+       # Proxy
        proxy_pass http://127.0.0.1:2341;
+       proxy_buffering off;
+       proxy_read_timeout 300;
 
        # Websockets
        proxy_http_version 1.1;
-       proxy_set_header Connection "upgrade";
+       proxy_set_header Connection "Upgrade";
        proxy_set_header Upgrade $http_upgrade;
        proxy_set_header Host $host;
 
        # Rewrite url
+       sub_filter_once off;
        sub_filter_types *;
        sub_filter "/manifest.json" "%%ingress_entry%%/manifest.json";
        sub_filter "/browse" "%%ingress_entry%%/browse";
        sub_filter "/static" "%%ingress_entry%%/static";
        sub_filter "/auth" "%%ingress_entry%%/auth";
-       sub_filter "/api" "%%ingress_entry%%/api";
+       sub_filter "/api/v1" "%%ingress_entry%%/api/v1";
        sub_filter "/api/v1%%ingress_entry%%" "%%ingress_entry%%/api/v1";
-       sub_filter "/albums" "%%ingress_entry%%/albums";
-       sub_filter "/videos" "%%ingress_entry%%/videos";
-       sub_filter "/people" "%%ingress_entry%%/people";
-       sub_filter "/favorites" "%%ingress_entry%%/favorites";
-       sub_filter "/moments" "%%ingress_entry%%/moments";
-       sub_filter "/calendar" "%%ingress_entry%%/calendar";
-       sub_filter "/places" "%%ingress_entry%%/places";
-       sub_filter "/labels" "%%ingress_entry%%/labels";
-       sub_filter "/folders" "%%ingress_entry%%/folders";
-       sub_filter "/private" "%%ingress_entry%%/private";
-       sub_filter "/library" "%%ingress_entry%%/library";
-       sub_filter "/settings" "%%ingress_entry%%/settings";
-       sub_filter_once off;
-       proxy_buffering off;
-       proxy_read_timeout 300;
+       #sub_filter "/albums" "%%ingress_entry%%/albums";
+       #sub_filter "/videos" "%%ingress_entry%%/videos";
+       #sub_filter "/people" "%%ingress_entry%%/people";
+       #sub_filter "/favorites" "%%ingress_entry%%/favorites";
+       #sub_filter "/moments" "%%ingress_entry%%/moments";
+       #sub_filter "/calendar" "%%ingress_entry%%/calendar";
+       #sub_filter "/places" "%%ingress_entry%%/places";
+       #sub_filter "/labels" "%%ingress_entry%%/labels";
+       #sub_filter "/folders" "%%ingress_entry%%/folders";
+       #sub_filter "/private" "%%ingress_entry%%/private";
+       #sub_filter "/library" "%%ingress_entry%%/library";
+       #sub_filter "/settings" "%%ingress_entry%%/settings";
 
        # Allow frames
        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;