From 6a8550a6d9c9ffe19d6c09da4f9381eca049cdba Mon Sep 17 00:00:00 2001 From: lapineige Date: Tue, 23 May 2023 18:17:42 +0200 Subject: [PATCH 01/16] Create log directory --- scripts/install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install b/scripts/install index 0c63680..7518eea 100755 --- a/scripts/install +++ b/scripts/install @@ -103,6 +103,8 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Configuring a systemd service..." --weight=1 +mkdir /var/log/13ft + # Create a dedicated systemd config ynh_add_systemd_config From e8a4004572d947a86233f7947bd29206e058ce5a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 23 May 2023 16:17:45 +0000 Subject: [PATCH 02/16] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index b937241..e2fd2cc 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # 13ft for YunoHost [![Integration level](https://dash.yunohost.org/integration/13ft.svg)](https://dash.yunohost.org/appci/app/13ft) ![Working status](https://ci-apps.yunohost.org/ci/badges/13ft.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/13ft.maintain.svg) + [![Install 13ft with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=13ft) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index eb91bb3..1bd9891 100644 --- a/README_fr.md +++ b/README_fr.md @@ -6,6 +6,7 @@ It shall NOT be edited by hand. # 13ft pour YunoHost [![Niveau d’intégration](https://dash.yunohost.org/integration/13ft.svg)](https://dash.yunohost.org/appci/app/13ft) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/13ft.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/13ft.maintain.svg) + [![Installer 13ft avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=13ft) *[Read this readme in english.](./README.md)* From 9f8ef0161795d889d0f51c7b1eb160955e5b8947 Mon Sep 17 00:00:00 2001 From: lapineige Date: Tue, 23 May 2023 18:18:04 +0200 Subject: [PATCH 03/16] Create log directory --- scripts/upgrade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index e7e66ea..80ab197 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -156,6 +156,8 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 +mkdir /var/log/13ft + # Create a dedicated systemd config ynh_add_systemd_config From 76e1d5cc824d3167f6de1aa9a2fd088bbc459478 Mon Sep 17 00:00:00 2001 From: lapineige Date: Tue, 23 May 2023 18:19:04 +0200 Subject: [PATCH 04/16] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 1a4dc89..80bf420 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Bypass paywall by acting as GoogleBot", "fr": "Contourner les paywall en vous faisant passer pour GoogleBot" }, - "version": "0.1.1~ynh5", + "version": "0.1.1~ynh6", "url": "https://github.com/wasi-master/13ft", "upstream": { "license": "MIT", From 12a0a99715f53a70495b19e0df502a9597d024ce Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 23 May 2023 16:19:07 +0000 Subject: [PATCH 05/16] 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 e2fd2cc..be788ff 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ https://github.com/wasi-master/13ft - Provide *some* web articles that are normally protected by paywalls. -**Shipped version:** 0.1.1~ynh5 +**Shipped version:** 0.1.1~ynh6 ## Disclaimers / important information diff --git a/README_fr.md b/README_fr.md index 1bd9891..3919558 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,7 @@ https://github.com/wasi-master/13ft - Provide *some* web articles that are normally protected by paywalls. -**Version incluse :** 0.1.1~ynh5 +**Version incluse :** 0.1.1~ynh6 ## Avertissements / informations importantes From ca569ffe21a515bed4e369803790a7d9bc0f78f0 Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 24 May 2023 09:07:13 +0200 Subject: [PATCH 06/16] fix --- scripts/install | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 7518eea..d152dfc 100755 --- a/scripts/install +++ b/scripts/install @@ -103,7 +103,10 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Configuring a systemd service..." --weight=1 -mkdir /var/log/13ft +if [ ! -d directory ]; then + mkdir /var/log/13ft +fi + # Create a dedicated systemd config ynh_add_systemd_config From 286ccb3442e473279482d10925943a46e5abff24 Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 24 May 2023 09:09:39 +0200 Subject: [PATCH 07/16] fix --- scripts/upgrade | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 80ab197..a691cf6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -156,7 +156,9 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 -mkdir /var/log/13ft +if [ ! -d directory ]; then + mkdir /var/log/13ft +fi # Create a dedicated systemd config ynh_add_systemd_config From 57a2204918875555c1a7a7adcdedd42711a1b411 Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 24 May 2023 09:10:23 +0200 Subject: [PATCH 08/16] remove log folder --- scripts/remove | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/remove b/scripts/remove index 65b9935..1b1316f 100755 --- a/scripts/remove +++ b/scripts/remove @@ -49,6 +49,8 @@ ynh_script_progression --message="Removing app main directory..." --weight=1 # Remove the app directory securely ynh_secure_remove --file="$final_path" +ynh_secure_remove --file=/var/log/13ft + #================================================= # REMOVE NGINX CONFIGURATION #================================================= From f01b48bfde49072c79e67d5b40bdace88c0122f1 Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 26 May 2023 19:12:00 +0200 Subject: [PATCH 09/16] implement reverse proxy https://github.com/YunoHost-Apps/13ft_ynh/issues/2#issuecomment-1564634875 --- conf/nginx.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index 9782b91..af84e46 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -3,6 +3,11 @@ location __PATH__/ { # Path to source alias __FINALPATH__/; + + # static files + proxy_pass http://localhost:5000; + proxy_set_header Host $http_host; + more_set_headers "X-Frame-Options: ALLOWALL"; # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; From a4670cd74fee2805c6ff123b015f2533423a3368 Mon Sep 17 00:00:00 2001 From: lapineige Date: Tue, 25 Jul 2023 11:31:15 +0200 Subject: [PATCH 10/16] fix log directory test --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index d152dfc..3d3097c 100755 --- a/scripts/install +++ b/scripts/install @@ -103,8 +103,8 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Configuring a systemd service..." --weight=1 -if [ ! -d directory ]; then - mkdir /var/log/13ft +if [ ! -d /var/log/$app ]; then + mkdir /var/log/$app fi From ea2be436146521c2a6c5608f5b46dbf47b43f9dd Mon Sep 17 00:00:00 2001 From: lapineige Date: Tue, 25 Jul 2023 11:31:51 +0200 Subject: [PATCH 11/16] fix log directory test --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index a691cf6..43d78e6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -156,8 +156,8 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 -if [ ! -d directory ]; then - mkdir /var/log/13ft +if [ ! -d /var/log/$app ]; then + mkdir /var/log/$app fi # Create a dedicated systemd config From 33d66bd2bef06b62817120835c9922baf137f9ef Mon Sep 17 00:00:00 2001 From: lapineige Date: Tue, 25 Jul 2023 11:32:02 +0200 Subject: [PATCH 12/16] fix log directory --- scripts/remove | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index 1b1316f..8b18014 100755 --- a/scripts/remove +++ b/scripts/remove @@ -49,7 +49,7 @@ ynh_script_progression --message="Removing app main directory..." --weight=1 # Remove the app directory securely ynh_secure_remove --file="$final_path" -ynh_secure_remove --file=/var/log/13ft +ynh_secure_remove --file=/var/log/$app #================================================= # REMOVE NGINX CONFIGURATION From 7b88916411873359f9ebef88553719e2014af36c Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 26 Jul 2023 08:50:17 +0200 Subject: [PATCH 13/16] v0.2.0 --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index ff8c567..186aba5 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/wasi-master/13ft/archive/refs/tags/v0.1.1.tar.gz -SOURCE_SUM=166685beb4aa1f924ef9d1b52d478702858b478a9e02cf49c1dab28e79d03601 +SOURCE_URL=https://github.com/wasi-master/13ft/archive/refs/tags/v0.2.0.tar.gz +SOURCE_SUM=727fe845823b400d60a0b98656308773ef2c19898f6b9c249be7682b269d854a SOURCE_SUM_PRG=sha256sum SOURCE_EXTRACT=true SOURCE_IN_SUBDIR=true From 132e020ac2ef2e087e2fac8ba1c24a301070d072 Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 26 Jul 2023 08:50:40 +0200 Subject: [PATCH 14/16] v0.2.0 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 80bf420..20a97ce 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Bypass paywall by acting as GoogleBot", "fr": "Contourner les paywall en vous faisant passer pour GoogleBot" }, - "version": "0.1.1~ynh6", + "version": "0.2.0~ynh1", "url": "https://github.com/wasi-master/13ft", "upstream": { "license": "MIT", From 09e9ab8d6578e33ddceb2064cc46877e071611be Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 26 Jul 2023 06:50:43 +0000 Subject: [PATCH 15/16] 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 be788ff..de25991 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ https://github.com/wasi-master/13ft - Provide *some* web articles that are normally protected by paywalls. -**Shipped version:** 0.1.1~ynh6 +**Shipped version:** 0.2.0~ynh1 ## Disclaimers / important information diff --git a/README_fr.md b/README_fr.md index 3919558..b4644f5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,7 @@ https://github.com/wasi-master/13ft - Provide *some* web articles that are normally protected by paywalls. -**Version incluse :** 0.1.1~ynh6 +**Version incluse :** 0.2.0~ynh1 ## Avertissements / informations importantes From 240ead1e3b8535b5f76212bc2b831631bf80a230 Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 26 Jul 2023 08:53:20 +0200 Subject: [PATCH 16/16] fix double in Nginx --- conf/nginx.conf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index af84e46..2de679f 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,10 +1,7 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { - # Path to source - alias __FINALPATH__/; - - # static files + proxy_pass http://localhost:5000; proxy_set_header Host $http_host; more_set_headers "X-Frame-Options: ALLOWALL";