From 8e6bff313b2affbccf5afe03b01fe9d0853b2145 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 18 Jan 2024 05:15:27 +0100 Subject: [PATCH 1/6] Upgrade to v0.7.2 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 2cc9fbf..51ca305 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "BookWyrm" description.en = "Platform for social reading" description.fr = "Plateforme de lecture sociale" -version = "0.7.1~ynh1" +version = "0.7.2~ynh1" maintainers = ["oufmilo"] @@ -49,8 +49,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/bookwyrm-social/bookwyrm/archive/refs/tags/v0.7.1.tar.gz" - sha256 = "a5a1422bf26728b6d73c267f57946717c6d26513e48dc25687ab633a673ebf4e" + url = "https://github.com/bookwyrm-social/bookwyrm/archive/refs/tags/v0.7.2.tar.gz" + sha256 = "258831fa54c15fd8ea9a3ba06bb9afab016d754a0850118e65fdb70dfa022df7" autoupdate.strategy = "latest_github_tag" From fcecbf54378f07a8fb25d5b29005aa027a898f89 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 18 Jan 2024 04:15:29 +0000 Subject: [PATCH 2/6] 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 749c139..05d4027 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in BookWyrm is a social network for tracking your reading, talking about books, writing reviews, and discovering what to read next. -**Shipped version:** 0.7.1~ynh1 +**Shipped version:** 0.7.2~ynh1 **Demo:** https://joinbookwyrm.com/fr/ diff --git a/README_fr.md b/README_fr.md index d188675..1640bfc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po BookWyrm est un réseau social pour garder la trace de vos lectures, parler de livres, écrire des critiques et découvrir quoi lire ensuite. -**Version incluse :** 0.7.1~ynh1 +**Version incluse :** 0.7.2~ynh1 **Démo :** https://joinbookwyrm.com/fr/ From dcb385da82a24af6a546d0dda9d2957d7384a65e Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Fri, 19 Jan 2024 13:38:18 +0100 Subject: [PATCH 3/6] Update nginx v0.7.2 --- conf/nginx.conf | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 4f85de8..69555ca 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,12 +1,26 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - proxy_pass http://127.0.0.1:__PORT__/; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $host; proxy_redirect off; } +# directly serve images and static files from the +# bookwyrm filesystem using sendfile. +# make the logs quieter by not reporting these requests +location ~ \.(bmp|ico|jpg|jpeg|png|tif|tiff|webp|css|js)$ { + root __INSTALL_DIR__; + try_files $uri =404; + add_header X-Cache-Status STATIC; + access_log off; +} + +# block access to any non-image files from images or static +location ~ ^/images/ { + return 403; +} + location /images/ { alias __INSTALL_DIR__/images/; } From 8b72d3ae7fb8f7d185dffca8e37418655ad506c6 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Fri, 19 Jan 2024 13:41:23 +0100 Subject: [PATCH 4/6] Fix nginx --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 69555ca..9e36ce7 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -12,7 +12,7 @@ location __PATH__/ { location ~ \.(bmp|ico|jpg|jpeg|png|tif|tiff|webp|css|js)$ { root __INSTALL_DIR__; try_files $uri =404; - add_header X-Cache-Status STATIC; + more_set_headers X-Cache-Status STATIC; access_log off; } From d29923c869fa2a6aad02b3ac978c234b27f617db Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Fri, 19 Jan 2024 13:44:52 +0100 Subject: [PATCH 5/6] Fix nginx --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 9e36ce7..4a84389 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -12,7 +12,7 @@ location __PATH__/ { location ~ \.(bmp|ico|jpg|jpeg|png|tif|tiff|webp|css|js)$ { root __INSTALL_DIR__; try_files $uri =404; - more_set_headers X-Cache-Status STATIC; + more_set_headers "X-Cache-Status: STATIC"; access_log off; } From 7eb2965347d4a463827487190a072e07fd4f7dcc Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Fri, 19 Jan 2024 14:27:34 +0100 Subject: [PATCH 6/6] Update test.toml to v0.7.1 --> v0.7.2 --- tests.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index 2f1968a..73f347a 100644 --- a/tests.toml +++ b/tests.toml @@ -17,6 +17,6 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.7600f04.name = "0.5.4" test_upgrade_from.d291f0e.name = "0.6.4" test_upgrade_from.749f46f.name = "0.6.6" + test_upgrade_from.4ad5a01.name = "0.7.1"