From 935ca7ea598474bc3c20d83ec6ad67464e76a4ee Mon Sep 17 00:00:00 2001
From: meliurwen <meliurwen@gmail.com>
Date: Wed, 26 Aug 2020 16:20:11 +0200
Subject: [PATCH] Removed FUNKWHALE_FRONTEND_PATH env variable and changed
 all.env and share.env filenames

---
 docker-compose.yml                       | 14 +++++++-------
 all.env.example => fw_config.env.example |  0
 paths.env.example                        |  6 ++++++
 shared.env.example                       |  8 --------
 4 files changed, 13 insertions(+), 15 deletions(-)
 rename all.env.example => fw_config.env.example (100%)
 create mode 100644 paths.env.example
 delete mode 100644 shared.env.example

diff --git a/docker-compose.yml b/docker-compose.yml
index 60291bc..13b4fdd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,11 +32,11 @@ services:
       - postgres
       - redis
     volumes:
-      - "${HOST_MUSIC_DIRECTORY_PATH}:/srv/wwww/music:ro"
-      - "${HOST_MEDIA_ROOT}:/srv/wwww/media"
+      - "${HOST_MUSIC_DIRECTORY_PATH}:/data/music:ro"
+      - "${HOST_MEDIA_ROOT}:/data/media"
     env_file:
       - all.env
-      - shared.env
+      - paths.env
     environment:
       - C_FORCE_ROOT=true
       - FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME}
@@ -66,15 +66,15 @@ services:
       - postgres
       - redis
     volumes:
-      - "${HOST_MUSIC_DIRECTORY_PATH}:/srv/wwww/music:ro"
-      - "${HOST_MEDIA_ROOT}:/srv/wwww/media"
-      - "${HOST_STATIC_ROOT}:/srv/wwww/static"
+      - "${HOST_MUSIC_DIRECTORY_PATH}:/data/music:ro"
+      - "${HOST_MEDIA_ROOT}:/data/media"
+      - "${HOST_STATIC_ROOT}:/data/static"
       - "${HOST_FUNKWHALE_FRONTEND_PATH}:/frontend"
     expose:
       - 5000
     env_file:
       - all.env
-      - shared.env
+      - paths.env
     environment:
       - FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME}
 
diff --git a/all.env.example b/fw_config.env.example
similarity index 100%
rename from all.env.example
rename to fw_config.env.example
diff --git a/paths.env.example b/paths.env.example
new file mode 100644
index 0000000..ec46430
--- /dev/null
+++ b/paths.env.example
@@ -0,0 +1,6 @@
+# You shouldn't touch these settings
+# They are here only because Funkwhale needs them declared
+
+MUSIC_DIRECTORY_PATH=/data/music
+MEDIA_ROOT=/data/media
+STATIC_ROOT=/data/static
diff --git a/shared.env.example b/shared.env.example
deleted file mode 100644
index 2520801..0000000
--- a/shared.env.example
+++ /dev/null
@@ -1,8 +0,0 @@
-# You shouldn't touch these settings
-# They are here only because Funkwhale needs them declared
-
-MUSIC_DIRECTORY_PATH=/srv/wwww/music
-MEDIA_ROOT=/srv/wwww/media
-STATIC_ROOT=/srv/wwww/static
-
-FUNKWHALE_FRONTEND_PATH=/srv/wwww/frontend