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

Merge pull request #22 from YunoHost-Apps/testing

Upgrade to 1.15
This commit is contained in:
Jean-Baptiste 2018-06-28 22:43:04 +02:00 committed by GitHub
commit 8bb0dded2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 37 additions and 21 deletions

View file

@ -5,7 +5,7 @@ A modern, convivial and free music server on YunoHost
Installation requires a dedicated domain for now. I hope subpath installation will be possible in the future.
**Shipped version:** 0.14.2 (this is an Alpha version!)
**Shipped version:** 0.15 (this is an Alpha version!)
## Admin
@ -20,13 +20,12 @@ The admin interface is accessible with the address: your.domain.fr/api/admin
* [x] install/remove/backup/remove/upgrade with x86_64
* [x] import file with web interface, imports from youtube, interraction with MusicBrainz
* [x] [Subsonic API](https://docs.funkwhale.audio/users/apps.html)
* to be tested:
* [ ] [Federation](https://docs.funkwhale.audio/federation.html) tests
* [ ] [CLI Import](https://docs.funkwhale.audio/importing-music.html#from-music-directory-on-the-server)
* [x] [Federation](https://docs.funkwhale.audio/federation.html) tests
* [x] [CLI Import](https://docs.funkwhale.audio/importing-music.html#from-music-directory-on-the-server) Remember to `source $final_path/venv/bin/activate`, then `source $final_path/load_env` before typinh using manage.py.
* [x] ARM support
* to be added:
* [ ] ARM support
* [ ] Store files in HOME, see https://github.com/YunoHost-Apps/funkwhale_ynh/issues/15
## Links

View file

@ -16,7 +16,7 @@
setup_private=1
setup_public=1
upgrade=1
upgrade=1 from_commit=2d2aedf3dac89e47f4c7083c0b9f55988ab3de54
upgrade=1 from_commit=ddb98f0220b9da59bd41ca354247dd36ec8657dc
backup_restore=1
multi_instance=1
incorrect_path=0
@ -26,8 +26,8 @@
Level 1=auto
Level 2=auto
Level 3=auto
# Level 4:
Level 4=0
# Level 4: https://github.com/YunoHost-Apps/funkwhale_ynh/issues/21
Level 4=1
# Level 5:
Level 5=auto
Level 6=auto
@ -39,6 +39,6 @@
Email=jean-baptiste@holcroft.fr
Notification=all
;;; Upgrade options
; commit=2d2aedf3dac89e47f4c7083c0b9f55988ab3de54
name=Upgrade from 0.14
; commit=ddb98f0220b9da59bd41ca354247dd36ec8657dc
name=Upgrade from 0.14.2
manifest_arg=domain=DOMAIN&path=/&admin=USER&is_public=1

View file

@ -1,5 +1,5 @@
SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/jobs/artifacts/0.14.2/download?job=build_front
SOURCE_SUM=6bf6cd1ac5ffaf7cf4770321d2dbeff5e54e8df4ee5b0dc2813ff898569270bf
SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/jobs/artifacts/0.15/download?job=build_front
SOURCE_SUM=3989a94cdec9ab5ea62d395d0b683ea15e216a6ae9ccef8f48b56de71a57990f
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=zip
SOURCE_IN_SUBDIR=false

View file

@ -1,5 +1,5 @@
SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/archive/0.14.2/funkwhale-0.14.2.tar.bz2
SOURCE_SUM=1e617d549e43a604e9c553fdceef1cebb36a6586f58c0f44f62f2db7407fb83b
SOURCE_URL=https://code.eliotberriot.com/funkwhale/funkwhale/-/archive/0.15/funkwhale-0.15.tar.bz2
SOURCE_SUM=a153ee377c573cc1f9963b72392c19d6a0dd30e32bdacde7e20467ff729722c1
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.bz2
SOURCE_IN_SUBDIR=true

View file

@ -1,5 +1,10 @@
location / {
alias __FINALPATH__/front/dist/;
if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent;
}
try_files $uri $uri/ @rewrites;
}

View file

@ -3,12 +3,12 @@
"id": "funkwhale",
"packaging_format": 1,
"requirements": {
"yunohost": ">= 3.0.0~beta1.2"
"yunohost": ">= 3.0.0"
},
"description": {
"en": "A modern, convivial and free music server"
},
"version": "0.14.2~ynh1",
"version": "0.15~ynh1",
"url": "https://funkwhale.audio",
"license": "BSD-3-Clause",
"maintainer": {

View file

@ -71,12 +71,14 @@ ynh_app_setting_set "$app" port "$port"
#=================================================
# add backports (required to install ffmpeg)
echo "deb http://httpredir.debian.org/debian jessie-backports main" | tee /etc/apt/sources.list.d/jessie-backports.list
echo "deb http://httpredir.debian.org/debian stretch-backports main" | tee /etc/apt/sources.list.d/stretch-backports.list
ynh_package_update
ynh_install_app_dependencies build-essential curl ffmpeg \
libjpeg-dev libmagic-dev libpq-dev postgresql python3-dev python3-venv \
redis-server
redis-server \
`# add arm support` \
zlib1g-dev libffi-dev libssl-dev
#=================================================
# CREATE A PostgreSQL DATABASE

View file

@ -74,7 +74,9 @@ ynh_system_user_create "$app"
ynh_install_app_dependencies build-essential curl ffmpeg \
libjpeg-dev libmagic-dev libpq-dev postgresql python3-dev python3-venv \
redis-server
redis-server \
`# add arm support` \
zlib1g-dev libffi-dev libssl-dev
#=================================================
# RESTORE THE PostgreSQL DATABASE

View file

@ -35,6 +35,12 @@ if [ -z "$redis_db" ]; then
ynh_app_setting_set "$app" redis_db "$redis_db"
fi
# Make sure we use stretch backports and not jessie's
if [ ! -f /etc/apt/sources.list.d/stretch-backports.list ]; then
echo "deb http://httpredir.debian.org/debian stretch-backports main" | tee /etc/apt/sources.list.d/stretch-backports.list
ynh_secure_remove /etc/apt/sources.list.d/jessie-backports.list
fi
#=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#=================================================
@ -108,7 +114,9 @@ ynh_system_user_create "$app"
ynh_install_app_dependencies build-essential curl ffmpeg \
libjpeg-dev libmagic-dev libpq-dev postgresql python3-dev python3-venv \
redis-server
redis-server \
`# add arm support` \
zlib1g-dev libffi-dev libssl-dev
#=================================================
# SPECIFIC UPGRADE