From 53a1a17b661cb8e29dd57136ee7609b44d12c21a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 18 Mar 2023 06:11:56 +0000 Subject: [PATCH 1/5] Upgrade to v1.2.10 --- conf/api.src | 4 ++-- conf/front.src | 4 ++-- manifest.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/api.src b/conf/api.src index 34b569b..c820d00 100644 --- a/conf/api.src +++ b/conf/api.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/1.2.9/download?job=build_api -SOURCE_SUM=abf56effa3e985c21a972cb2797fc5fa10b01ce172b32d096c8cc417bbcfcc82 +SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/-/jobs/artifacts/1.2.10/download?job=build_api +SOURCE_SUM=2544fa01bc64c7481dbd03faaa777ff6d2006e6a36cb79c694e13f6e2761f025 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/conf/front.src b/conf/front.src index 122c8eb..992c5b5 100644 --- a/conf/front.src +++ b/conf/front.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/1.2.9/download?job=build_front -SOURCE_SUM=2faee2b31b5d717e4e5f34f3d4a6de8341a659d93a967bfeccab02d38580a6fd +SOURCE_URL=https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/1.2.10/download?job=build_front +SOURCE_SUM=6471722068ac6586194ee2c28d0691a2acdcb1eae881625fcf15c10a750bb51a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index ffc9fd7..6976250 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Convivial and modern music server", "fr": "Serveur de musique moderne et convivial" }, - "version": "1.2.9~ynh1", + "version": "1.2.10~ynh1", "url": "https://funkwhale.audio", "upstream": { "license": "AGPL-3.0-or-later", From 71b3712eab9f6261b84d9059eb46863a427b17f1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 18 Mar 2023 06:12:02 +0000 Subject: [PATCH 2/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6380372..a0b4e50 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Funkwhale is a community-driven project that lets you listen and share music and audio within a decentralized, open network. -**Shipped version:** 1.2.9~ynh1 +**Shipped version:** 1.2.10~ynh1 **Demo:** https://demo.funkwhale.audio diff --git a/README_fr.md b/README_fr.md index cc2b9c0..40e0db0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Funkwhale est un projet communautaire qui vous permet d'écouter et de partager de la musique et de l'audio au sein d'un réseau ouvert et décentralisé. -**Version incluse :** 1.2.9~ynh1 +**Version incluse :** 1.2.10~ynh1 **Démo :** https://demo.funkwhale.audio From 6decab7661080f96d2093864a5cdbeb1fbe59369 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Sun, 19 Mar 2023 20:49:52 +0100 Subject: [PATCH 3/5] Update nginx.conf to fix security issue --- conf/nginx.conf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 0b1cdf6..920e2c7 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -101,8 +101,12 @@ location /.well-known/ { proxy_pass http://127.0.0.1:__PORT__/.well-known/; } -location /media/ { - alias __DATADIR__/media/; +location /media/__sized__/ { + alias __DATADIR__/media/__sized__/; +} + +location /media/attachments/ { + alias __DATADIR__//media/attachments/; } location /_protected/media/ { From ca03a78ecec8ca10fc1024ccb6d30ffeb9b7685b Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Sun, 19 Mar 2023 20:51:56 +0100 Subject: [PATCH 4/5] Redirect warnings with ynh_exec_warn_less --- scripts/change_url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/change_url b/scripts/change_url index f2e5947..af1d5f7 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -118,7 +118,7 @@ fi ynh_script_progression --message="Modifying a config file..." --weight=1 domain=$new_domain -ynh_add_config --template="../conf/env.prod" --destination="$final_path/config/.env" +ynh_exec_warn_less ynh_add_config --template="../conf/env.prod" --destination="$final_path/config/.env" #================================================= # MODIFY THE FEDERATION From aa625d0ef71c7e9db2ae44ff88791a99013be9e4 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Sun, 19 Mar 2023 22:36:36 +0100 Subject: [PATCH 5/5] fix ynh_exec_warn_less --- scripts/change_url | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index af1d5f7..67769f4 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -118,14 +118,14 @@ fi ynh_script_progression --message="Modifying a config file..." --weight=1 domain=$new_domain -ynh_exec_warn_less ynh_add_config --template="../conf/env.prod" --destination="$final_path/config/.env" +ynh_add_config --template="../conf/env.prod" --destination="$final_path/config/.env" #================================================= # MODIFY THE FEDERATION #================================================= source $final_path/virtualenv/bin/activate -python3 $final_path/api/manage.py fix_federation_ids https://$old_domain https://$new_domain --no-dry-run --no-input +ynh_exec_warn_less python3 $final_path/api/manage.py fix_federation_ids https://$old_domain https://$new_domain --no-dry-run --no-input #================================================= # START SYSTEMD SERVICE