From cb41c9fdf49147ea7b06acee18d11484e1c062df Mon Sep 17 00:00:00 2001
From: Renon <renon@disroot.org>
Date: Mon, 23 Jul 2018 11:13:44 +0200
Subject: [PATCH] fix apache media block

---
 changes/changelog.d/389.bugfix | 19 +++++++++++++++++++
 deploy/apache.conf             |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 changes/changelog.d/389.bugfix

diff --git a/changes/changelog.d/389.bugfix b/changes/changelog.d/389.bugfix
new file mode 100644
index 00000000..6cfb3ca3
--- /dev/null
+++ b/changes/changelog.d/389.bugfix
@@ -0,0 +1,19 @@
+Fix Apache2 permission issue preventing `/media` folder from being served correctly (#389)
+
+
+Fix Apache2 configuration file for media block [Manual action required]
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The permission scope on the current Apache2 configuration file is too narrow, preventing thumbnails from being served.
+
+On Apache2 setups, you have to replace the following line::
+
+    <Directory /srv/funkwhale/data/media/albums>
+
+with::
+
+    <Directory /srv/funkwhale/data/media>
+
+You can now restart your server::
+
+    sudo systemctl restart apache2
diff --git a/deploy/apache.conf b/deploy/apache.conf
index b74e04b3..e3a570db 100644
--- a/deploy/apache.conf
+++ b/deploy/apache.conf
@@ -111,7 +111,7 @@ Define MUSIC_DIRECTORY_PATH /srv/funkwhale/data/music
       Require all granted
    </Directory>
 
-   <Directory /srv/funkwhale/data/media/albums>
+   <Directory /srv/funkwhale/data/media>
       Options FollowSymLinks
       AllowOverride None
       Require all granted
-- 
GitLab