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

master
Meliurwen 4 years ago
parent 4afe39d3f8
commit 935ca7ea59
Signed by: meliurwen
GPG Key ID: 818A8B35E9F1CE10
  1. 14
      docker-compose.yml
  2. 0
      fw_config.env.example
  3. 6
      paths.env.example
  4. 8
      shared.env.example

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

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

@ -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
Loading…
Cancel
Save