From 4afe39d3f883610a6edb78b2958f191fe073ecb2 Mon Sep 17 00:00:00 2001
From: meliurwen <meliurwen@gmail.com>
Date: Wed, 26 Aug 2020 13:54:04 +0200
Subject: [PATCH] Some small additional cleaning

---
 .env.example       | 2 +-
 docker-compose.yml | 6 +++---
 shared.env.example | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.env.example b/.env.example
index c7f0dde..f90a25a 100644
--- a/.env.example
+++ b/.env.example
@@ -3,7 +3,7 @@ TZ=Etc/UTC
 HOST_DB_DIR=/srv/docker/volumes/funkwhale/postgres/data
 HOST_CACHE_DIR=/srv/docker/volumes/funkwhale/redis/data
 # In-place import dir
-HOST_MUSIC_DIRECTORY_SERVE_PATH=/srv/docker/volumes/funkwhale/media/music
+HOST_MUSIC_DIRECTORY_PATH=/srv/docker/volumes/funkwhale/media/music
 # Where media files (such as album covers or audio tracks) should be stored
 HOST_MEDIA_ROOT=/srv/docker/volumes/funkwhale/media/media
 # Where static files (such as API css or icons) should be compiled
diff --git a/docker-compose.yml b/docker-compose.yml
index 4538aa4..60291bc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       - postgres
       - redis
     volumes:
-      - "${HOST_MUSIC_DIRECTORY_SERVE_PATH}:/srv/wwww/music:ro"
+      - "${HOST_MUSIC_DIRECTORY_PATH}:/srv/wwww/music:ro"
       - "${HOST_MEDIA_ROOT}:/srv/wwww/media"
     env_file:
       - all.env
@@ -66,7 +66,7 @@ services:
       - postgres
       - redis
     volumes:
-      - "${HOST_MUSIC_DIRECTORY_SERVE_PATH}:/srv/wwww/music:ro"
+      - "${HOST_MUSIC_DIRECTORY_PATH}:/srv/wwww/music:ro"
       - "${HOST_MEDIA_ROOT}:/srv/wwww/media"
       - "${HOST_STATIC_ROOT}:/srv/wwww/static"
       - "${HOST_FUNKWHALE_FRONTEND_PATH}:/frontend"
@@ -90,7 +90,7 @@ services:
     volumes:
       - "./nginx/funkwhale.template:/etc/nginx/conf.d/funkwhale.template:ro"
       - "./nginx/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf:ro"
-      - "${HOST_MUSIC_DIRECTORY_SERVE_PATH}:/srv/wwww/music:ro"
+      - "${HOST_MUSIC_DIRECTORY_PATH}:/srv/wwww/music:ro"
       - "${HOST_MEDIA_ROOT}:/srv/wwww/media:ro"
       - "${HOST_STATIC_ROOT}:/srv/wwww/static:ro"
       - "${HOST_FUNKWHALE_FRONTEND_PATH}:/srv/wwww/frontend:ro"
diff --git a/shared.env.example b/shared.env.example
index 853e293..2520801 100644
--- a/shared.env.example
+++ b/shared.env.example
@@ -2,7 +2,6 @@
 # They are here only because Funkwhale needs them declared
 
 MUSIC_DIRECTORY_PATH=/srv/wwww/music
-MUSIC_DIRECTORY_SERVE_PATH=/srv/wwww/music
 MEDIA_ROOT=/srv/wwww/media
 STATIC_ROOT=/srv/wwww/static