1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/funkwhale_ynh.git synced 2024-09-03 18:36:24 +02:00

Fix import link

This commit is contained in:
yalh76 2021-04-21 23:35:59 +02:00
parent f61a9c9cf4
commit a18d1a701d
4 changed files with 11 additions and 6 deletions

View file

@ -30,9 +30,9 @@ Installation requires a dedicated domain or subdomain. Installing in a subpath i
The admin uses the login you provided at installation. The password is the same you use for YunoHost.
The admin interface is accessible at the address: `your.domain.fr/api/admin`
To add a collection of music files to a library in your YunoHost installation of Funkwhale, create a symlink to your collection titled "import" in `/var/www/funkwhale`
To add a collection of music files to a library in your YunoHost installation of Funkwhale, create a symlink to your collection titled "music" in `/home/yunohost.app/funkwhale/data`
```console
foo@bar:~$sudo ln -s /your/music/collection /var/www/funkwhale/import
foo@bar:~$sudo ln -s /your/music/collection /home/yunohost.app/funkwhale/data/music
```
The files can then be added to your library from the *uploading* tab in a music library under the heading **Import music from your server**.

View file

@ -137,7 +137,7 @@ RAVEN_DSN=https://44332e9fdd3d42879c7d35bf8562c6a4:0062dc16a22b41679cd5765e5342f
# # MUSIC_DIRECTORY_SERVE_PATH= # stays commented, not needed
MUSIC_DIRECTORY_PATH=__DATADIR__/music
MUSIC_DIRECTORY_SERVE_PATH=__DATADIR__/music
#MUSIC_DIRECTORY_SERVE_PATH=__DATADIR__/import
# LDAP settings
# Use the following options to allow authentication on your Funkwhale instance

View file

@ -24,9 +24,6 @@ location / {
# this is needed if you have file import via upload enabled
client_max_body_size 100M;
proxy_pass http://127.0.0.1:__PORT__/;
# Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc;
}
location /front/ {

View file

@ -125,13 +125,21 @@ if [ -z "$datadir" ]; then
if [ -d "$final_path/media/" ]; then
rsync -a $final_path/media/ $datadir/media/
fi
if [ -d "$final_path/code/data/media/" ]; then
rsync -a $final_path/code/data/media/ $datadir/media/
fi
if [ -d "$final_path/import/" ]; then
rsync -a $final_path/import/ $datadir/music/
fi
if [ -d "$final_path/code/data/music/" ]; then
rsync -a $final_path/code/data/music/ $datadir/music/
fi
ynh_secure_remove --file="$final_path/code"
ynh_secure_remove --file="$final_path/media"
ynh_secure_remove --file="$final_path/code/data/media"
ynh_secure_remove --file="$final_path/import"
ynh_secure_remove --file="$final_path/code/data/music"
ynh_app_setting_set --app=$app --key=datadir --value=$datadir