From 29b86dd15acbc94e89797e8309b0791d8e4d9c1d Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 15 Jan 2022 18:36:04 -0800
Subject: [PATCH] fix(docker): rewrite trailing slashes with
 AURWEB_FASTAPI_PREFIX

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 docker-compose.aur-dev.yml | 2 ++
 docker-compose.yml         | 2 +-
 docker/config/nginx.conf   | 4 +++-
 docker/nginx-entrypoint.sh | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/docker-compose.aur-dev.yml b/docker-compose.aur-dev.yml
index 0b91dd93..c06e9e56 100644
--- a/docker-compose.aur-dev.yml
+++ b/docker-compose.aur-dev.yml
@@ -69,6 +69,8 @@ services:
       - data:/data
 
   nginx:
+    environment:
+      - AURWEB_FASTAPI_PREFIX=${AURWEB_FASTAPI_PREFIX}
     restart: always
     volumes:
       - data:/data
diff --git a/docker-compose.yml b/docker-compose.yml
index ebc760d4..7f58803f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -244,7 +244,7 @@ services:
     image: aurweb:latest
     init: true
     environment:
-      - AUR_CONFIG=conf/config
+      - AURWEB_FASTAPI_PREFIX=${AURWEB_FASTAPI_PREFIX}
     entrypoint: /docker/nginx-entrypoint.sh
     command: /docker/scripts/run-nginx.sh
     ports:
diff --git a/docker/config/nginx.conf b/docker/config/nginx.conf
index b5c09d08..1ffe3e7a 100644
--- a/docker/config/nginx.conf
+++ b/docker/config/nginx.conf
@@ -94,7 +94,9 @@ http {
         ssl_certificate /etc/ssl/certs/web.cert.pem;
         ssl_certificate_key /etc/ssl/private/web.key.pem;
 
-        rewrite ^/(.*)/$ /$1 permanent;
+        # Rewrite trailing slashes; AURWEB_FASTAPI_PREFIX should
+        # be replaced with the desired FastAPI base url.
+        rewrite ^/(.*)/$ AURWEB_FASTAPI_PREFIX/$1 permanent;
 
         location ~ ^/[^\/]+\.gz$ {
             # Override mime type to text/plain.
diff --git a/docker/nginx-entrypoint.sh b/docker/nginx-entrypoint.sh
index 1527cda7..c0c0c848 100755
--- a/docker/nginx-entrypoint.sh
+++ b/docker/nginx-entrypoint.sh
@@ -20,5 +20,6 @@ else
 fi
 
 cp -vf /docker/config/nginx.conf /etc/nginx/nginx.conf
+sed -i "s|AURWEB_FASTAPI_PREFIX|${AURWEB_FASTAPI_PREFIX}|g" /etc/nginx/nginx.conf
 
 exec "$@"