Removed FUNKWHALE_FRONTEND_PATH env variable and changed all.env and share.env filenames

docker-compose.yml

@@ -32,11 +32,11 @@ services:
       - postgres
       - redis
     volumes:
-      - "${HOST_MUSIC_DIRECTORY_PATH}:/srv/wwww/music:ro"
+      - "${HOST_MUSIC_DIRECTORY_PATH}:/data/music:ro"
-      - "${HOST_MEDIA_ROOT}:/srv/wwww/media"
+      - "${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_MUSIC_DIRECTORY_PATH}:/data/music:ro"
-      - "${HOST_MEDIA_ROOT}:/srv/wwww/media"
+      - "${HOST_MEDIA_ROOT}:/data/media"
-      - "${HOST_STATIC_ROOT}:/srv/wwww/static"
+      - "${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}
 

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

shared.env.example

@@ -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