From ebb38edc3f3d368f8fab981c45340833aff422ea Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Sat, 23 Jun 2018 22:30:47 +0200 Subject: [PATCH 1/6] Redirect to https by default --- conf/nginx.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index 064826f..b8547bd 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,5 +1,10 @@ location / { alias __FINALPATH__/front/dist/; + + if ($scheme = http) { + rewrite ^ https://$server_name$request_uri? permanent; + } + try_files $uri $uri/ @rewrites; } From 227c72ffa13f315e07043381bc0dc098f3736367 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Sat, 23 Jun 2018 22:31:18 +0200 Subject: [PATCH 2/6] Add ARM dependencies --- scripts/install | 4 +++- scripts/restore | 4 +++- scripts/upgrade | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 21f76a4..ed3ea90 100644 --- a/scripts/install +++ b/scripts/install @@ -76,7 +76,9 @@ 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 diff --git a/scripts/restore b/scripts/restore index 556748e..82c2252 100644 --- a/scripts/restore +++ b/scripts/restore @@ -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 diff --git a/scripts/upgrade b/scripts/upgrade index 36e1923..fa60bb3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -108,7 +108,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 From 3d10632f6c4240811e96ab6744bef403c6319e73 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Sat, 23 Jun 2018 23:13:56 +0200 Subject: [PATCH 3/6] Use stretch backports instead of jessie's --- scripts/install | 2 +- scripts/upgrade | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index ed3ea90..e2ce56b 100644 --- a/scripts/install +++ b/scripts/install @@ -71,7 +71,7 @@ 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 \ diff --git a/scripts/upgrade b/scripts/upgrade index fa60bb3..14e0117 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -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 #================================================= From 33ddcba0256462cc5d1798eb921466669d13547e Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Sat, 23 Jun 2018 23:15:04 +0200 Subject: [PATCH 4/6] Update status --- README.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0cb7b1c..72fadb3 100644 --- a/README.md +++ b/README.md @@ -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 From 9a15e97ee58c56721b9ed5fe4c50f60bbc36a337 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Sat, 23 Jun 2018 23:38:20 +0200 Subject: [PATCH 5/6] Upgrade version number and tests --- check_process | 6 +++--- manifest.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/check_process b/check_process index 60ef34f..38ada3d 100644 --- a/check_process +++ b/check_process @@ -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 @@ -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 \ No newline at end of file diff --git a/manifest.json b/manifest.json index e90a056..34ca215 100644 --- a/manifest.json +++ b/manifest.json @@ -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.14.2~ynh2", "url": "https://funkwhale.audio", "license": "BSD-3-Clause", "maintainer": { From 0b26703bdd904274f3a1ad0311cb471ef04ffce5 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Holcroft Date: Sun, 24 Jun 2018 22:01:57 +0200 Subject: [PATCH 6/6] Upgrade to 0.15, force lvl 4=1 --- README.md | 2 +- check_process | 4 ++-- conf/app-frontend.src | 4 ++-- conf/app.src | 4 ++-- manifest.json | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 72fadb3..2f7b12c 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/check_process b/check_process index 38ada3d..7b3f835 100644 --- a/check_process +++ b/check_process @@ -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 diff --git a/conf/app-frontend.src b/conf/app-frontend.src index cee835f..cc7792a 100644 --- a/conf/app-frontend.src +++ b/conf/app-frontend.src @@ -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 diff --git a/conf/app.src b/conf/app.src index f6ad716..9eb234b 100644 --- a/conf/app.src +++ b/conf/app.src @@ -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 diff --git a/manifest.json b/manifest.json index 34ca215..84f3688 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ "description": { "en": "A modern, convivial and free music server" }, - "version": "0.14.2~ynh2", + "version": "0.15~ynh1", "url": "https://funkwhale.audio", "license": "BSD-3-Clause", "maintainer": {