From 795e2bf49a2fb943d279c8b08cb68c3168e7ecc4 Mon Sep 17 00:00:00 2001
From: Georg Krause <mail@georg-krause.net>
Date: Fri, 16 Jun 2023 16:26:58 +0200
Subject: [PATCH] fix: Mount nginx templates into the right location inside
 docker container

Part-of: <https://dev.funkwhale.audio/funkwhale/funkwhale/-/merge_requests/2491>
---
 changes/changelog.d/2146.bugfix | 1 +
 deploy/docker-compose.yml       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changes/changelog.d/2146.bugfix

diff --git a/changes/changelog.d/2146.bugfix b/changes/changelog.d/2146.bugfix
new file mode 100644
index 000000000..c57fae48a
--- /dev/null
+++ b/changes/changelog.d/2146.bugfix
@@ -0,0 +1 @@
+Fix location of the nginx config template for docker deployments (#2146)
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index 282da092b..534dae393 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -83,7 +83,7 @@ services:
       # Uncomment if you want to use your previous nginx config, please let us
       # know what special configuration you need, so we can support it with out
       # upstream nginx configuration!
-      #- "./nginx/funkwhale.template:/etc/nginx/conf.d/funkwhale.template:ro"
+      #- "./nginx/funkwhale.template:/etc/nginx/templates/default.conf.template:ro"
       #- "./nginx/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro"
 
       - "${MUSIC_DIRECTORY_SERVE_PATH-/srv/funkwhale/data/music}:${MUSIC_DIRECTORY_PATH-/music}:ro"