infra
/
docker-funkwhale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some small additional cleaning

Browse Source
master
Meliurwen 4 years ago
parent 6c54424b28
commit 4afe39d3f8
Signed by: meliurwen
GPG Key ID: 818A8B35E9F1CE10
3 changed files with 4 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      .env.example
  2. 6
      docker-compose.yml
  3. 1
      shared.env.example

2
.env.example
Unescape View File

@ -3,7 +3,7 @@ TZ=Etc/UTC
HOST_DB_DIR=/srv/docker/volumes/funkwhale/postgres/data HOST_DB_DIR=/srv/docker/volumes/funkwhale/postgres/data
HOST_CACHE_DIR=/srv/docker/volumes/funkwhale/redis/data HOST_CACHE_DIR=/srv/docker/volumes/funkwhale/redis/data
# In-place import dir # 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 # Where media files (such as album covers or audio tracks) should be stored
HOST_MEDIA_ROOT=/srv/docker/volumes/funkwhale/media/media HOST_MEDIA_ROOT=/srv/docker/volumes/funkwhale/media/media
# Where static files (such as API css or icons) should be compiled # Where static files (such as API css or icons) should be compiled

6
docker-compose.yml
Unescape View File

@ -32,7 +32,7 @@ services:
- postgres - postgres
- redis - redis
volumes: 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_MEDIA_ROOT}:/srv/wwww/media"
env_file: env_file:
- all.env - all.env
@ -66,7 +66,7 @@ services:
- postgres - postgres
- redis - redis
volumes: 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_MEDIA_ROOT}:/srv/wwww/media"
- "${HOST_STATIC_ROOT}:/srv/wwww/static" - "${HOST_STATIC_ROOT}:/srv/wwww/static"
- "${HOST_FUNKWHALE_FRONTEND_PATH}:/frontend" - "${HOST_FUNKWHALE_FRONTEND_PATH}:/frontend"
@ -90,7 +90,7 @@ services:
volumes: volumes:
- "./nginx/funkwhale.template:/etc/nginx/conf.d/funkwhale.template:ro" - "./nginx/funkwhale.template:/etc/nginx/conf.d/funkwhale.template:ro"
- "./nginx/funkwhale_proxy.conf:/etc/nginx/funkwhale_proxy.conf: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_MEDIA_ROOT}:/srv/wwww/media:ro"
- "${HOST_STATIC_ROOT}:/srv/wwww/static:ro" - "${HOST_STATIC_ROOT}:/srv/wwww/static:ro"
- "${HOST_FUNKWHALE_FRONTEND_PATH}:/srv/wwww/frontend:ro" - "${HOST_FUNKWHALE_FRONTEND_PATH}:/srv/wwww/frontend:ro"

1
shared.env.example
Unescape View File

@ -2,7 +2,6 @@
# They are here only because Funkwhale needs them declared # They are here only because Funkwhale needs them declared
MUSIC_DIRECTORY_PATH=/srv/wwww/music MUSIC_DIRECTORY_PATH=/srv/wwww/music
MUSIC_DIRECTORY_SERVE_PATH=/srv/wwww/music
MEDIA_ROOT=/srv/wwww/media MEDIA_ROOT=/srv/wwww/media
STATIC_ROOT=/srv/wwww/static STATIC_ROOT=/srv/wwww/static

Write Preview
Loading…
Cancel
Save