Merge pull request #83 from YunoHost-Apps/testing

upgrade to latest version

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.15.2
 
 ## Screenshots
 

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/FreshRSS/FreshRSS/archive/1.14.2.tar.gz
+SOURCE_URL=https://github.com/FreshRSS/FreshRSS/archive/1.15.2.tar.gz
-SOURCE_SUM=547ce000c0506df1323629777e7399826002ce084eb4187e4df154ddc16f0a10 
+SOURCE_SUM=4ef0083145778a7ded5387cae8c06f2d48981c50c587918f3bc280944e8511c5
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

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

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

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/

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.15.2~ynh1",
     "url": "http://freshrss.org/",
     "license": "AGPL-3.0-only",
     "maintainer": {

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 php-sqlite3 php-curl php-intl php-xml"
 fi
 
 #=================================================

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_set --app="$app" --key=unprotected_uris --value="/api/,/scripts/api.js"
-ynh_app_setting_delete --app="$app" --key=unprotected_uris
+ynh_app_setting_delete --app="$app" --key=unprotected_regex
+ynh_app_setting_delete --app="$app" --key=skipped_uris
+
 
 #=================================================
 # RELOAD NGINX

scripts/upgrade

@@ -149,12 +149,17 @@ 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"
 
+if [ -f /tmp/FreshRSS.log ]; then
+	ynh_secure_remove /tmp/FreshRSS.log
+fi
+
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
@@ -175,7 +180,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