Fix #350: saner defaults for STATIC_ROOT and MEDIA_ROOT in .env

deploy/env.prod.sample

@@ -10,14 +10,13 @@
 # On non-docker setup **only**, you'll also have to tweak/uncomment those variables:
 # - DATABASE_URL
 # - CACHE_URL
-# - STATIC_ROOT
-# - MEDIA_ROOT
 #
 # You **don't** need to update those variables on pure docker setups.
 #
 # Additional options you may want to check:
 # - MUSIC_DIRECTORY_PATH and MUSIC_DIRECTORY_SERVE_PATH if you plan to use
 #   in-place import
+#
 # Docker only
 # -----------
 
@@ -25,7 +24,6 @@
 # (it will be interpolated in docker-compose file)
 # You can comment or ignore this if you're not using docker
 FUNKWHALE_VERSION=latest
-MUSIC_DIRECTORY_PATH=/music
 
 # End of Docker-only configuration
 
@@ -79,12 +77,12 @@ REVERSE_PROXY_TYPE=nginx
 # Where media files (such as album covers or audio tracks) should be stored
 # on your system?
 # (Ensure this directory actually exists)
-# MEDIA_ROOT=/srv/funkwhale/data/media
+MEDIA_ROOT=/srv/funkwhale/data/media
 
 # Where static files (such as API css or icons) should be compiled
 # on your system?
 # (Ensure this directory actually exists)
-# STATIC_ROOT=/srv/funkwhale/data/static
+STATIC_ROOT=/srv/funkwhale/data/static
 
 # Update it to match the domain that will be used to reach your funkwhale
 # instance
@@ -112,5 +110,9 @@ RAVEN_DSN=https://44332e9fdd3d42879c7d35bf8562c6a4:0062dc16a22b41679cd5765e5342f
 # In-place import settings
 # You can safely leave those settings uncommented if you don't plan to use
 # in place imports.
-# MUSIC_DIRECTORY_PATH=
-# MUSIC_DIRECTORY_SERVE_PATH=  # docker-only
+# Typical docker setup:
+#   MUSIC_DIRECTORY_PATH=/srv/funkwhale/data/music
+#   MUSIC_DIRECTORY_SERVE_PATH=/music  # docker-only
+# Typical non-docker setup:
+#   MUSIC_DIRECTORY_PATH=/srv/funkwhale/data/music
+#   # MUSIC_DIRECTORY_SERVE_PATH= # stays commented, not needed