From 41aaf696c29317b54f040b29bee5bf72fd5a376e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Sat, 27 Jul 2019 16:41:51 +0200 Subject: [PATCH 01/12] upgrade to 1.14.3 --- README.md | 6 +++--- conf/app.src | 4 ++-- manifest.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index eb6bd9c..9862978 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ # FreshRSS package for YunoHost -[![Integration level](https://dash.yunohost.org/integration/freshrss.svg)](https://dash.yunohost.org/appci/app/freshrss) +[![Integration level](https://dash.yunohost.org/integration/freshrss.svg)](https://dash.yunohost.org/appci/app/freshrss) [![Install FreshRSS with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=freshrss) -> *This package allow you to install FreshRSS quickly and simply on a YunoHost server. +> *This package allow you to install FreshRSS quickly and simply on a YunoHost server. If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* ## Overview An efficient but powerful RSS aggregator with a nice and mobile-friendly design, as well as extension and themes support. -**Shipped version:** 1.14.2 +**Shipped version:** 1.14.3 ## Screenshots diff --git a/conf/app.src b/conf/app.src index eb8087e..f9df92f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/FreshRSS/FreshRSS/archive/1.14.2.tar.gz -SOURCE_SUM=547ce000c0506df1323629777e7399826002ce084eb4187e4df154ddc16f0a10 +SOURCE_URL=https://github.com/FreshRSS/FreshRSS/archive/1.14.3.tar.gz +SOURCE_SUM=ab7de7658c01d99649bdf77313a5dc6cd1e196fdc39ff54ba42a8155364fb367 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 7c409a5..34b797e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "FreshRSS is a selfhostable RSS reader", "fr": "FreshRSS est un agrégateur de flux RSS à auto-héberger" }, - "version": "1.14.2~ynh1", + "version": "1.14.3~ynh1", "url": "http://freshrss.org/", "license": "AGPL-3.0-only", "maintainer": { From db12c853b2fc37aed5c1339c88b674909c39c8e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Sat, 27 Jul 2019 16:48:33 +0200 Subject: [PATCH 02/12] remove logs --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 7c59e6c..2f4be9e 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -155,6 +155,7 @@ ynh_replace_string "__APP__" $app ../conf/freshrss.cron cp ../conf/freshrss.cron "$cron_path" chmod 644 "$cron_path" +rm /tmp/FreshRSS.log #================================================= # GENERIC FINALIZATION #================================================= From 06a8d8b56df4652a7e8a4184c25570ee5a6ba157 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Tue, 22 Oct 2019 21:16:46 +0200 Subject: [PATCH 03/12] fix api access --- scripts/install | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 2923ce2..522d365 100755 --- a/scripts/install +++ b/scripts/install @@ -157,8 +157,10 @@ chown -R $app: $final_path/extensions/ ynh_print_info --message="Configuring SSOwat..." #skip api directory -ynh_app_setting_set --app="$app" --key=unprotected_regex --value="^\/api\/.*|\/scripts\/api.js$" -ynh_app_setting_delete --app="$app" --key=unprotected_uris +ynh_app_setting_set --app="$app" --key=unprotected_uris --value="/api/,/scripts/api.js" +ynh_app_setting_delete --app="$app" --key=unprotected_regex +ynh_app_setting_delete --app="$app" --key=skipped_uris + #================================================= # RELOAD NGINX From b159c2a417800b37684b44b239f31df6a9d0d9f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Tue, 22 Oct 2019 21:17:42 +0200 Subject: [PATCH 04/12] fix permission on user data directory --- hooks/post_app_addaccess | 2 +- hooks/post_user_create | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hooks/post_app_addaccess b/hooks/post_app_addaccess index 206d061..d8d976a 100755 --- a/hooks/post_app_addaccess +++ b/hooks/post_app_addaccess @@ -13,6 +13,6 @@ then do user_token=$(ynh_string_random) $app_path/cli/create-user.php --user $myuser --language en --token $user_token - sudo chown -R www-data: $app_path/data/users/$myuser/ + sudo chown -R $app: $app_path/data/users/$myuser/ done fi diff --git a/hooks/post_user_create b/hooks/post_user_create index d499718..de0d472 100755 --- a/hooks/post_user_create +++ b/hooks/post_user_create @@ -9,4 +9,4 @@ myuser=$1 user_token=$(ynh_string_random) sudo $app_path/cli/create-user.php --user $myuser --language en --token $user_token -sudo chown -R www-data: $app_path/data/users/$myuser/ +sudo chown -R $app: $app_path/data/users/$myuser/ From a87fb85e6e16e64333638226d6e27747b065cea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Thu, 24 Oct 2019 20:02:48 +0200 Subject: [PATCH 05/12] fix api access --- scripts/upgrade | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 2f4be9e..f1d2445 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -176,7 +176,9 @@ $final_path/cli/reconfigure.php --default_user $admin --auth_type http_auth --en #================================================= ynh_print_info --message="Upgrading SSOwat configuration..." -ynh_app_setting_set --app="$app" --key=unprotected_regex --value="^\/api\/.*|\/scripts\/api.js$" +ynh_app_setting_set --app="$app" --key=unprotected_uris --value="/api/,/scripts/api.js" +ynh_app_setting_delete --app="$app" --key=unprotected_regex +ynh_app_setting_delete --app="$app" --key=skipped_uris #================================================= # RELOAD NGINX From 8fcacc5e6bf8dc90de5e5540b10256c47662302c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Thu, 24 Oct 2019 20:08:54 +0200 Subject: [PATCH 06/12] add php-gmp dependency --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 12a73ff..4b552bd 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ if [ "$(lsb_release --codename --short)" == "jessie" ]; then pkg_dependencies="php5-gd" else - pkg_dependencies="php-gd php-zip php-dom php-mbstring" + pkg_dependencies="php-gd php-zip php-dom php-mbstring php-gmp" fi #================================================= From 653f682c75b225aa5a671e9cdf684ef1048fe1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Wed, 6 Nov 2019 22:13:59 +0100 Subject: [PATCH 07/12] add sqlite as dependency --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 4b552bd..2fad838 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ if [ "$(lsb_release --codename --short)" == "jessie" ]; then pkg_dependencies="php5-gd" else - pkg_dependencies="php-gd php-zip php-dom php-mbstring php-gmp" + pkg_dependencies="php-gd php-zip php-dom php-mbstring php-gmp php-sqlite3" fi #================================================= From fd7959e7e73e0011f7e1e50ef5648a324171b9b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Wed, 6 Nov 2019 22:14:19 +0100 Subject: [PATCH 08/12] upgrade to 1.15.1 --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index f9df92f..0696652 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/FreshRSS/FreshRSS/archive/1.14.3.tar.gz -SOURCE_SUM=ab7de7658c01d99649bdf77313a5dc6cd1e196fdc39ff54ba42a8155364fb367 +SOURCE_URL=https://github.com/FreshRSS/FreshRSS/archive/1.15.1.tar.gz +SOURCE_SUM=4544ba124e7fb03154ceca52b14825ea76da175dfa816c6e353e97e26d3177c5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From 4f1294ed4e4a0edb4d8d633a4e476d39356be029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Wed, 6 Nov 2019 22:20:54 +0100 Subject: [PATCH 09/12] add more dependencies --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 2fad838..b1610b5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ if [ "$(lsb_release --codename --short)" == "jessie" ]; then pkg_dependencies="php5-gd" else - pkg_dependencies="php-gd php-zip php-dom php-mbstring php-gmp php-sqlite3" + pkg_dependencies="php-gd php-zip php-dom php-mbstring php-gmp php-sqlite3 php-curl php-intl php-xml" fi #================================================= From 574a57f301e94fed86640fa33770e1a319aa535d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 13 Nov 2019 01:03:28 +0100 Subject: [PATCH 10/12] Fix upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index f1d2445..0e8bf00 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -149,13 +149,13 @@ ynh_replace_string "APPNAMETOCHANGE" $app ../hooks/post_user_delete # CRON SETUP #================================================= ynh_print_info --message="Setting up cron..." + cron_path="/etc/cron.d/$app" ynh_replace_string "__FINALPATH__" $final_path ../conf/freshrss.cron ynh_replace_string "__APP__" $app ../conf/freshrss.cron cp ../conf/freshrss.cron "$cron_path" chmod 644 "$cron_path" -rm /tmp/FreshRSS.log #================================================= # GENERIC FINALIZATION #================================================= From 2ca65563e2a9168b3b3a34383c3267fa5242b95e Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 13 Nov 2019 01:38:38 +0100 Subject: [PATCH 11/12] Upgrade to 1.15.2 --- README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9862978..7b7b362 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to An efficient but powerful RSS aggregator with a nice and mobile-friendly design, as well as extension and themes support. -**Shipped version:** 1.14.3 +**Shipped version:** 1.15.2 ## Screenshots diff --git a/conf/app.src b/conf/app.src index 0696652..c738752 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/FreshRSS/FreshRSS/archive/1.15.1.tar.gz -SOURCE_SUM=4544ba124e7fb03154ceca52b14825ea76da175dfa816c6e353e97e26d3177c5 +SOURCE_URL=https://github.com/FreshRSS/FreshRSS/archive/1.15.2.tar.gz +SOURCE_SUM=4ef0083145778a7ded5387cae8c06f2d48981c50c587918f3bc280944e8511c5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 34b797e..b895672 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "FreshRSS is a selfhostable RSS reader", "fr": "FreshRSS est un agrégateur de flux RSS à auto-héberger" }, - "version": "1.14.3~ynh1", + "version": "1.15.2~ynh1", "url": "http://freshrss.org/", "license": "AGPL-3.0-only", "maintainer": { From 8d8ebfd4537994c8b0e544ede7318e37ba9022b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment?= Date: Sun, 17 Nov 2019 11:00:54 +0100 Subject: [PATCH 12/12] remove old cron log and have per app log to fix permission --- conf/freshrss.cron | 2 +- scripts/upgrade | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/conf/freshrss.cron b/conf/freshrss.cron index 0f5321c..659ed47 100644 --- a/conf/freshrss.cron +++ b/conf/freshrss.cron @@ -1 +1 @@ -*/10 * * * * __APP__ /usr/bin/php7.0 __FINALPATH__/app/actualize_script.php >/tmp/FreshRSS.log 2>&1 +*/10 * * * * __APP__ /usr/bin/php7.0 __FINALPATH__/app/actualize_script.php >/tmp/__APP__.log 2>&1 diff --git a/scripts/upgrade b/scripts/upgrade index 0e8bf00..bb0d7ba 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -156,6 +156,10 @@ ynh_replace_string "__APP__" $app ../conf/freshrss.cron cp ../conf/freshrss.cron "$cron_path" chmod 644 "$cron_path" +if [ -f /tmp/FreshRSS.log ]; then + ynh_secure_remove /tmp/FreshRSS.log +fi + #================================================= # GENERIC FINALIZATION #=================================================