Testing (#109)

README.md

@@ -1,3 +1,8 @@
+<!--
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+It shall NOT be edited by hand.
+-->
+
 # Tiny Tiny RSS for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/ttrss.svg)](https://dash.yunohost.org/appci/app/ttrss) ![](https://ci-apps.yunohost.org/ci/badges/ttrss.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/ttrss.maintain.svg)  
@@ -5,55 +10,48 @@
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allow you to install Tiny Tiny RSS quickly and simply on a YunoHost server.  
+> *This package allows you to install Tiny Tiny RSS 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.*
+If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview
 
 Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader and aggregator.
 
-**Shipped version:** 2020.09.16
+## Features
+
+- feed aggregation / syndication,
+- OPML import/export,
+- multiple ways to share stuff: export RSS feeds, plugins for various social sites, sharing by URL, etc,
+- sharing arbitrary content through tt-rss,
+- Plugins and themes,
+- podcasts,
+- flexible article filtering
+
+**Shipped version:** 20220222~ynh1
+
+**Demo:** https://demo.yunohost.org/ttrss/
 
 ## Screenshots
 
-![](https://tt-rss.org/images/ttrss/18.12/1812-shot1.png)
+![](./doc/screenshots/screenshot.png)
 
-## Demo
+## Disclaimers / important information
 
-* [YunoHost demo](https://demo.yunohost.org/ttrss/)
+### Default login credentials
 
-## Configuration
+- Username: `admin`
+- password: `password`
+## Documentation and resources
 
-## Documentation
+* Official app website: http://tt-rss.org
+* Official admin documentation: https://git.tt-rss.org/git/tt-rss/wiki
+* Upstream app code repository: https://git.tt-rss.org/git/tt-rss
+* YunoHost documentation for this app: https://yunohost.org/app_ttrss
+* Report a bug: https://github.com/YunoHost-Apps/ttrss_ynh/issues
 
- * Official documentation: https://git.tt-rss.org/git/tt-rss/wiki
+## Developer info
- * YunoHost documentation: https://yunohost.org/en/app_ttrss
 
-## YunoHost specific features
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/ttrss_ynh/tree/testing).
-
-#### Multi-users support
-
-#### Supported architectures
-
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/ttrss.svg)](https://ci-apps.yunohost.org/ci/apps/ttrss/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/ttrss.svg)](https://ci-apps-arm.yunohost.org/ci/apps/ttrss/)
-
-## Limitations
-
-## Additionnal informations
-
-## Links
-
- * Report a bug: https://github.com/YunoHost-Apps/ttrss_ynh/issues
- * Tiny Tiny RSS website: https://tt-rss.org/
- * Tiny Tiny RSS repository: https://git.tt-rss.org/git/tt-rss
- * YunoHost website: https://yunohost.org/
-
----
-
-## Developers infos
-
-Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/ttrss_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.
 ```
@@ -61,3 +59,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/ttrss_ynh/tree/testin
 or
 sudo yunohost app upgrade ttrss -u https://github.com/YunoHost-Apps/ttrss_ynh/tree/testing --debug
 ```
+
+**More info regarding app packaging:** https://yunohost.org/packaging_apps

README_fr.md

@@ -1,62 +1,44 @@
 # Tiny Tiny RSS pour YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/ttrss.svg)](https://dash.yunohost.org/appci/app/ttrss) ![](https://ci-apps.yunohost.org/ci/badges/ttrss.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/ttrss.maintain.svg)  
+[![Niveau d'intégration](https://dash.yunohost.org/integration/ttrss.svg)](https://dash.yunohost.org/appci/app/ttrss) ![](https://ci-apps.yunohost.org/ci/badges/ttrss.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/ttrss.maintain.svg)  
 [![Installer Tiny Tiny RSS avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=ttrss)
 
 *[Read this readme in english.](./README.md)*
+*[Lire ce readme en français.](./README_fr.md)*
 
-> *Ce package vous permet d’installer Tiny Tiny RSS rapidement et simplement sur un serveur YunoHost.  
+> *Ce package vous permet d'installer Tiny Tiny RSS rapidement et simplement sur un serveur YunoHost.
-Si vous n’avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l’installer.*
+Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
 
-## Vue d’ensemble
+## Vue d'ensemble
 
 Tiny Tiny RSS est un lecteur et agrégateur de flux d'actualités (RSS/Atom) en ligne gratuit et open source.
 
-**Version incluse :** 2020.09.16
 
-## Captures d’écran
+**Version incluse :** 20220222~ynh1
 
-![](https://tt-rss.org/images/ttrss/18.12/1812-shot1.png)
+**Démo :** https://demo.yunohost.org/ttrss/
 
-## Démo
+## Captures d'écran
 
-* [YunoHost demo](https://demo.yunohost.org/ttrss/)
+![](./doc/screenshots/screenshot.png)
 
-## Configuration
+## Avertissements / informations importantes
 
-## Documentation
+### Default login credentials
 
-* Documentation officielle : https://git.tt-rss.org/git/tt-rss/wiki
+- Username: `admin`
-* Documentation YunoHost : https://yunohost.org/fr/app_ttrss
+- password: `password`
+## Documentations et ressources
 
-## Caractéristiques spécifiques YunoHost
+* Site officiel de l'app : http://tt-rss.org
+* Documentation officielle de l'admin : https://git.tt-rss.org/git/tt-rss/wiki
+* Dépôt de code officiel de l'app : https://git.tt-rss.org/git/tt-rss
+* Documentation YunoHost pour cette app : https://yunohost.org/app_ttrss
+* Signaler un bug : https://github.com/YunoHost-Apps/ttrss_ynh/issues
 
-#### Support multi-utilisateurs
+## Informations pour les développeurs
 
-* L’authentification LDAP est-elle prise en charge ? **Oui**
+Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/ttrss_ynh/tree/testing).
-* L’application peut-elle être utilisée par plusieurs utilisateurs ? **Oui**
-
-#### Architectures supportées
-
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/ttrss.svg)](https://ci-apps.yunohost.org/ci/apps/ttrss/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/ttrss.svg)](https://ci-apps-arm.yunohost.org/ci/apps/ttrss/)
-
-## Limitations
-
-## Informations additionnelles
-
-## Liens
-
-* Signaler un bug : https://github.com/YunoHost-Apps/ttrss_ynh/issues
-* Site web de Tiny Tiny RSS : https://tt-rss.org/
-* Dépôt de l’application principale : https://git.tt-rss.org/git/tt-rss
-* Site web YunoHost : https://yunohost.org/
-
----
-
-## Developers infos
-
-Merci de faire vos pull request sur la [testing branch](https://github.com/YunoHost-Apps/ttrss_ynh/tree/testing).
 
 Pour essayer la branche testing, procédez comme suit.
 ```
@@ -64,3 +46,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/ttrss_ynh/tree/testin
 ou
 sudo yunohost app upgrade ttrss -u https://github.com/YunoHost-Apps/ttrss_ynh/tree/testing --debug
 ```
+
+**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps

check_process

@@ -2,14 +2,16 @@
 	; Manifest
 		domain="domain.tld"
 		path="/path"
+		is_public=1
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
 		setup_root=1
 		setup_nourl=0
-		setup_private=0
+		setup_private=1
-		setup_public=0
+		setup_public=1
 		upgrade=1
+		upgrade=1	from_commit=be16ff54ae531329590ef6576d6f928315ebe0cf
 		backup_restore=1
 		multi_instance=1
 		change_url=1
@@ -17,3 +19,7 @@
 Email=
 Notification=none
 ;;; Upgrade options
+	; commit=be16ff54ae531329590ef6576d6f928315ebe0cf
+		name=Create cron
+		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&
+

conf/app.src

@@ -1,7 +1,6 @@
-SOURCE_URL=https://git.tt-rss.org/fox/tt-rss/archive/9d3c79498368fa99cfde684c759a1c40825aaaa9.tar.gz
+SOURCE_URL=https://git.tt-rss.org/fox/tt-rss/archive/9a5c21630b5b7e2e3adb2e0334defbd9515aa833.tar.gz
-SOURCE_SUM=cb5a39a61f6319734606f06fafbb0eb60aa488cdc911ec84ee6738da533124cb
+SOURCE_SUM=12e0930daa54d2fad3ce39c934c455de3b75adde33e406420e40650e755438bf
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
 SOURCE_EXTRACT=true

conf/config.php

@@ -1,16 +1,17 @@
 <?php
+
 	// *******************************************
 	// *** Database configuration (important!) ***
 	// *******************************************
 
-	define('DB_TYPE', "mysql"); // or mysql
+	putenv('TTRSS_DB_TYPE=mysql'); // or mysql
-	define('DB_HOST', "localhost");
+	putenv('TTRSS_DB_HOST=localhost');
-	define('DB_USER', "__DB_NAME__");
+	putenv('TTRSS_DB_USER=__DB_USER__');
-	define('DB_NAME', "__DB_NAME__");
+	putenv('TTRSS_DB_NAME=__DB_NAME__');
-	define('DB_PASS', "__DB_PWD__");
+	putenv('TTRSS_DB_PASS=__DB_PWD__');
-	define('DB_PORT', '3306'); // usually 5432 for PostgreSQL, 3306 for MySQL
+	putenv('TTRSS_DB_PORT=3306'); // usually 5432 for PostgreSQL, 3306 for MySQL
 
-	define('MYSQL_CHARSET', 'UTF8');
+	putenv('TTRSS_MYSQL_CHARSET=UTF8');
 	// Connection charset for MySQL. If you have a legacy database and/or experience
 	// garbage unicode characters with this option, try setting it to a blank string.
 
@@ -18,30 +19,18 @@
 	// *** Basic settings (important!) ***
 	// ***********************************
 
-	define('SELF_URL_PATH', '__DOMAIN_PATH__');
+	putenv('TTRSS_SELF_URL_PATH=__DOMAIN_PATH__');
 	// Full URL of your tt-rss installation. This should be set to the
 	// location of tt-rss directory, e.g. http://example.org/tt-rss/
 	// You need to set this option correctly otherwise several features
 	// including PUSH, bookmarklets and browser integration will not work properly.
 
-	define('FEED_CRYPT_KEY', '');
+	putenv('TTRSS_SINGLE_USER_MODE=false');
-	// WARNING: mcrypt is deprecated in php 7.1. This directive exists for backwards
-	// compatibility with existing installs, new passwords are NOT going to be encrypted.
-	// Use update.php --decrypt-feeds to decrypt existing passwords in the database while
-	// mcrypt is still available.
-
-	// Key used for encryption of passwords for password-protected feeds
-	// in the database. A string of 24 random characters. If left blank, encryption
-	// is not used. Requires mcrypt functions.
-	// Warning: changing this key will make your stored feed passwords impossible
-	// to decrypt.
-	
-	define('SINGLE_USER_MODE', false);
 	// Operate in single user mode, disables all functionality related to
 	// multiple users and authentication. Enabling this assumes you have
 	// your tt-rss directory protected by other means (e.g. http auth).
 
-	define('SIMPLE_UPDATE_MODE', false);
+	putenv('TTRSS_SIMPLE_UPDATE_MODE=false');
 	// Enables fallback update mode where tt-rss tries to update feeds in
 	// background while tt-rss is open in your browser. 
 	// If you don't have a lot of feeds and don't want to or can't run 
@@ -54,37 +43,39 @@
 	// *** Files and directories ***
 	// *****************************
 
-	define('PHP_EXECUTABLE', '/usr/bin/php');
+	putenv('TTRSS_PHP_EXECUTABLE=/usr/bin/php');
 	// Path to PHP *COMMAND LINE* executable, used for various command-line tt-rss 
 	// programs and update daemon. Do not try to use CGI binary here, it won't work. 
 	// If you see HTTP headers being displayed while running tt-rss scripts, 
 	// then most probably you are using the CGI binary. If you are unsure what to 
 	// put in here, ask your hosting provider.
 
-	define('LOCK_DIRECTORY', 'lock');
+	putenv('TTRSS_LOCK_DIRECTORY=lock');
 	// Directory for lockfiles, must be writable to the user you run
 	// daemon process or cronjobs under.
 
-	define('CACHE_DIR', 'cache');
+	putenv('TTRSS_CACHE_DIR=cache');
 	// Local cache directory for RSS feed content.
 
-	define('ICONS_DIR', "feed-icons");
+	putenv('TTRSS_ICONS_DIR=feed-icons');
-	define('ICONS_URL', "feed-icons");
+	putenv('TTRSS_ICONS_URL=feed-icons');
 	// Local and URL path to the directory, where feed favicons are stored.
 	// Unless you really know what you're doing, please keep those relative
 	// to tt-rss main directory.
 
+	//putenv('TTRSS_SIMPLE_UPDATE_MODE=true');
+
 	// **********************
 	// *** Authentication ***
 	// **********************
 
 	// Please see PLUGINS below to configure various authentication modules.
 
-	define('AUTH_AUTO_CREATE', true);
+	putenv('TTRSS_AUTH_AUTO_CREATE=true');
 	// Allow authentication modules to auto-create users in tt-rss internal
 	// database when authenticated successfully.
 
-	define('AUTH_AUTO_LOGIN', true);
+	putenv('TTRSS_AUTH_AUTO_LOGIN=true');
 	// Automatically login user on remote or other kind of externally supplied
 	// authentication, otherwise redirect to login form as normal.
 	// If set to true, users won't be able to set application language
@@ -94,18 +85,14 @@
 	// *** Feed settings ***
 	// *********************
 
-	define('FORCE_ARTICLE_PURGE', 0);
+	putenv('TTRSS_FORCE_ARTICLE_PURGE=0');
 	// When this option is not 0, users ability to control feed purging
 	// intervals is disabled and all articles (which are not starred) 
 	// older than this amount of days are purged.
 
 	// *** PubSubHubbub settings ***
 
-	define('PUBSUBHUBBUB_HUB', '');
+	putenv('TTRSS_PUBSUBHUBBUB_ENABLED=false');
-	// URL to a PubSubHubbub-compatible hub server. If defined, "Published
-	// articles" generated feed would automatically become PUSH-enabled.
-
-	define('PUBSUBHUBBUB_ENABLED', false);
 	// Enable client PubSubHubbub support in tt-rss. When disabled, tt-rss
 	// won't try to subscribe to PUSH feed updates.
 
@@ -113,10 +100,10 @@
 	// *** Sphinx search plugin ***
 	// ****************************
 
-	define('SPHINX_SERVER', 'localhost:9312');
+	putenv('TTRSS_SPHINX_SERVER=localhost:9312');
 	// Hostname:port combination for the Sphinx server.
 
-	define('SPHINX_INDEX', 'ttrss, delta');
+	putenv('TTRSS_SPHINX_INDEX=ttrss, delta');
 	// Index name in Sphinx configuration. You can specify multiple indexes
 	// as a comma-separated string.
 	// Example configuration files are available on tt-rss wiki.
@@ -125,16 +112,16 @@
 	// *** Self-registrations by users ***
 	// ***********************************
 
-	define('ENABLE_REGISTRATION', false);
+	putenv('TTRSS_ENABLE_REGISTRATION=false');
 	// Allow users to register themselves. Please be aware that allowing
 	// random people to access your tt-rss installation is a security risk
 	// and potentially might lead to data loss or server exploit. Disabled
 	// by default.
 
-	define('REG_NOTIFY_ADDRESS', 'user@your.domain.dom');
+	putenv('TTRSS_REG_NOTIFY_ADDRESS=user@__DOMAIN__');
 	// Email address to send new user notifications to.
 
-	define('REG_MAX_USERS', 10);
+	putenv('TTRSS_REG_MAX_USERS=10');
 	// Maximum amount of users which will be allowed to register on this
 	// system. 0 - no limit.
 
@@ -142,7 +129,7 @@
 	// *** Cookies and login sessions ***
 	// **********************************
 	
-	define('SESSION_COOKIE_LIFETIME', 86400);
+	putenv('TTRSS_SESSION_COOKIE_LIFETIME='.(86400*30));
 	// Default lifetime of a session (e.g. login) cookie. In seconds, 
 	// 0 means cookie will be deleted when browser closes.
 
@@ -150,24 +137,24 @@
 	// *** Email and digest settings ***
 	// *********************************
 
-	define('SMTP_FROM_NAME', 'Tiny Tiny RSS');
+	putenv('TTRSS_SMTP_FROM_NAME=Tiny Tiny RSS');
-	define('SMTP_FROM_ADDRESS', 'noreply@your.domain.dom');
+	putenv('TTRSS_SMTP_FROM_ADDRESS=noreply@your.domain.dom');
 	// Name, address and subject for sending outgoing mail. This applies
 	// to password reset notifications, digest emails and any other mail.
 
-	define('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours');
+	putenv('TTRSS_DIGEST_SUBJECT=[tt-rss] New headlines for last 24 hours');
 	// Subject line for email digests
 
-	define('SMTP_SERVER', '');
+	putenv('TTRSS_SMTP_SERVER=localhost:25');
 	// Hostname:port combination to send outgoing mail (i.e. localhost:25). 
 	// Blank - use system MTA.
 	
-	define('SMTP_LOGIN', '');
+	putenv('TTRSS_SMTP_LOGIN=');
-	define('SMTP_PASSWORD', '');
+	putenv('TTRSS_SMTP_PASSWORD=');
 	// These two options enable SMTP authentication when sending
 	// outgoing mail. Only used with SMTP_SERVER.
 
-	define('SMTP_SECURE', '');
+	putenv('TTRSS_SMTP_SECURE=');
 	// Used to select a secure SMTP connection. Allowed values: ssl, tls,
 	// or empty.
 
@@ -175,17 +162,17 @@
 	// *** Other settings (less important) ***
 	// ***************************************
 
-	define('CHECK_FOR_UPDATES', true);
+	putenv('TTRSS_CHECK_FOR_UPDATES=true');
 	// Check for updates automatically if running Git version
  
-	define('ENABLE_GZIP_OUTPUT', false);
+	putenv('TTRSS_ENABLE_GZIP_OUTPUT=false');
 	// Selectively gzip output to improve wire performance. This requires
 	// PHP Zlib extension on the server.
 	// Enabling this can break tt-rss in several httpd/php configurations,
 	// if you experience weird errors and tt-rss failing to start, blank pages
 	// after login, or content encoding errors, disable it.
 
-	define('PLUGINS', 'auth_remote, auth_internal, note');
+	putenv('TTRSS_PLUGINS=auth_internal, note');
 	// Comma-separated list of plugins to load automatically for all users.
 	// System plugins have to be specified here. Please enable at least one
 	// authentication plugin here (auth_*).
@@ -194,13 +181,13 @@
 	// Disabling auth_internal in this list would automatically disable
 	// reset password link on the login form.
 	
-	define('LOG_DESTINATION', 'sql');
+	putenv('TTRSS_LOG_DESTINATION=sql');
 	// Log destination to use. Possible values: sql (uses internal logging
 	// you can read in Preferences -> System), syslog - logs to system log.
 	// Setting this to blank uses PHP logging (usually to http server 
 	// error.log).
 
-	define('CONFIG_VERSION', 26);
+	putenv('TTRSS_CONFIG_VERSION=26');
 	// Expected config version. Please update this option in config.php
 	// if necessary (after migrating all new options from this file).
 

conf/nginx.conf

@@ -4,11 +4,6 @@ location __PATH__/ {
   # Path to source
   alias __FINALPATH__/ ;
 
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
-
   index index.php;
 
   # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file

doc/DESCRIPTION.md

@@ -0,0 +1,11 @@
+Tiny Tiny RSS is a free and open source web-based news feed (RSS/Atom) reader and aggregator.
+
+## Features
+
+- feed aggregation / syndication,
+- OPML import/export,
+- multiple ways to share stuff: export RSS feeds, plugins for various social sites, sharing by URL, etc,
+- sharing arbitrary content through tt-rss,
+- Plugins and themes,
+- podcasts,
+- flexible article filtering

doc/DESCRIPTION_fr.md

@@ -0,0 +1 @@
+Tiny Tiny RSS est un lecteur et agrégateur de flux d'actualités (RSS/Atom) en ligne gratuit et open source.

doc/DISCLAIMER.md

@@ -0,0 +1,4 @@
+### Default login credentials
+
+- Username: `admin`
+- password: `password`

manifest.json

@@ -3,18 +3,25 @@
   "id": "ttrss",
   "packaging_format": 1,
   "description": {
-    "en": "News feed (RSS/Atom) reader and aggregator.",
+    "en": "News feed (RSS/Atom) reader and aggregator",
-    "fr": "Lecteur de flux d’actualité utilisant les protocoles RSS et Atom."
+    "fr": "Lecteur de flux d’actualité utilisant les protocoles RSS et Atom"
   },
-  "version": "20200916~ynh5",
+  "version": "20220222~ynh1",
   "url": "http://tt-rss.org",
+  "upstream": {
+        "license": "GPL-3.0-only",
+        "website": "http://tt-rss.org",
+        "demo": "https://demo.yunohost.org/ttrss/",
+        "admindoc": "https://git.tt-rss.org/git/tt-rss/wiki",
+        "code": "https://git.tt-rss.org/git/tt-rss"
+    },
   "license": "GPL-3.0-only",
   "maintainer": {
     "name": "",
     "email": ""
   },
   "requirements": {
-    "yunohost": ">= 4.1.7"
+    "yunohost": ">= 4.3.0"
   },
   "multi_instance": true,
   "services": [
@@ -26,14 +33,18 @@
     "install" : [
       {
         "name": "domain",
-      "type": "domain",
+        "type": "domain"
-      "example": "domain.org"
       },
       {
         "name": "path",
         "type": "path",
         "example": "/ttrss",
         "default": "/ttrss"
+        },
+      {
+        "name": "is_public",
+        "type": "boolean",
+        "default": true
       }
     ]
   }

scripts/_common.sh

@@ -6,46 +6,10 @@
 
 YNH_PHP_VERSION="7.3"
 
-extra_php_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-opcache \
+pkg_dependencies="php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-opcache \
     php${YNH_PHP_VERSION}-fileinfo php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml"
 
 #=================================================
 # EXPERIMENTAL HELPERS
 #=================================================
 
-# Check available space before creating a temp directory.
-#
-# usage: ynh_smart_mktemp --min_size="Min size"
-#
-# | arg: -s, --min_size= - Minimal size needed for the temporary directory, in Mb
-ynh_smart_mktemp () {
-        # Declare an array to define the options of this helper.
-        declare -Ar args_array=( [s]=min_size= )
-        local min_size
-        # Manage arguments with getopts
-        ynh_handle_getopts_args "$@"
-
-        min_size="${min_size:-300}"
-        # Transform the minimum size from megabytes to kilobytes
-        min_size=$(( $min_size * 1024 ))
-
-        # Check if there's enough free space in a directory
-        is_there_enough_space () {
-                local free_space=$(df --output=avail "$1" | sed 1d)
-                test $free_space -ge $min_size
-        }
-
-        if is_there_enough_space /tmp; then
-                local tmpdir=/tmp
-        elif is_there_enough_space /var; then
-                local tmpdir=/var
-        elif is_there_enough_space /; then
-                local tmpdir=/   
-        elif is_there_enough_space /home; then
-                local tmpdir=/home
-        else
-                ynh_die "Insufficient free space to continue..."
-        fi
-
-        echo "$(mktemp --directory --tmpdir="$tmpdir")"
-}

scripts/backup

@@ -58,6 +58,12 @@ ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
 ynh_backup --src_path="/etc/systemd/system/$app.service"
 
+#=================================================
+# BACKUP VARIOUS FILES
+#=================================================
+
+ynh_backup --src_path="/etc/cron.d/$app"
+
 #=================================================
 # BACKUP THE MYSQL DATABASE
 #=================================================

scripts/change_url

@@ -28,12 +28,13 @@ ynh_script_progression --message="Loading installation settings..."  --weight=1
 
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+db_user=$db_name
 db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
-ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --time --weight=1
+ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1
 
 # Backup the current version of the app
 ynh_backup_before_upgrade
@@ -99,20 +100,12 @@ fi
 #=================================================
 ynh_script_progression --message="Configuring $app..." --weight=1
 
+domain_path="https://${new_domain}${new_path}"
 domain="$new_domain"
-path_url="$new_path"
+ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php"
 
-ynh_backup_if_checksum_is_different --file="$final_path/config.php"
+chmod 400 "$final_path/config.php"
-
+chown $app "$final_path/config.php"
-cp ../conf/config.php "$final_path/config.php"
-
-# Change domain name in config.php
-ynh_replace_string --match_string="__DB_NAME__"     --replace_string="$db_name"                 --target_file="$final_path/config.php"
-ynh_replace_string --match_string="__DB_PWD__"      --replace_string="$db_pwd"                  --target_file="$final_path/config.php"
-ynh_replace_string --match_string="__DOMAIN_PATH__" --replace_string="https://$domain$path_url" --target_file="$final_path/config.php"
-
-# Recalculate and store the config file checksum into the app settings
-ynh_store_file_checksum --file="$final_path/config.php"
 
 #=================================================
 # GENERIC FINALIZATION

scripts/install

@@ -22,6 +22,7 @@ ynh_abort_if_errors
 
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
+is_public=$YNH_APP_ARG_IS_PUBLIC
 
 app=$YNH_APP_INSTANCE_NAME
 
@@ -44,6 +45,13 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
 
+#=================================================
+# INSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Installing dependencies..." --weight=1
+
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
@@ -63,7 +71,6 @@ db_name=$(ynh_sanitize_dbid --db_name=$app)
 db_user=$db_name
 ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name
-db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -92,7 +99,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --package="$extra_php_dependencies"
+ynh_add_fpm_config
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
@@ -107,7 +114,7 @@ domain_path=https://$domain$path_url
 ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php"
 
 chmod 400 "$final_path/config.php"
-chown $app:$app "$final_path/config.php"
+chown $app "$final_path/config.php"
 
 #=================================================
 # SETUP SYSTEMD
@@ -125,7 +132,7 @@ ynh_script_progression --message="Initializing database..." --weight=6
 ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" \
     < "$final_path/schema/ttrss_schema_mysql.sql"
 
-ynh_exec_as $app php${phpversion} ${final_path}/update.php --update-schema
+sudo -u $app php${phpversion} ${final_path}/update.php --update-schema=force-yes
 
 #=================================================
 # GENERIC FINALIZATION
@@ -144,12 +151,24 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1
 # Start a systemd service
 ynh_systemd_action --service_name=$app --action="start"
 
+#=================================================
+# SETUP A CRON
+#=================================================
+ynh_script_progression --message="Setuping a cron..." --weight=1
+
+ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app"
+chown root: "/etc/cron.d/$app"
+chmod 644 "/etc/cron.d/$app"
+
 #=================================================
 # SETUP SSOWAT
 #=================================================
 ynh_script_progression --message="Configuring permissions..." --weight=1
 
-ynh_app_setting_set --app=$app --key=skipped_uris --value="/public.php,/api,/opml.php?op=publish"
+if [ $is_public -eq 1 ]
+then
+	ynh_permission_update --permission="main" --add="visitors"
+fi
 
 #=================================================
 # RELOAD NGINX

scripts/remove

@@ -74,6 +74,22 @@ ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=3
 # Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config
 
+#=================================================
+# REMOVE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Removing dependencies..." --weight=1
+
+# Remove metapackage and its dependencies
+ynh_remove_app_dependencies
+
+#=================================================
+# REMOVE VARIOUS FILES
+#=================================================
+ynh_script_progression --message="Removing various files..." --weight=1
+
+# Remove a cron file
+ynh_secure_remove --file="/etc/cron.d/$app"
+
 #=================================================
 # GENERIC FINALIZATION
 #=================================================

scripts/restore

@@ -36,10 +36,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=2
 
-ynh_webpath_available --domain=$domain --path_url=$path_url \
+test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
-	|| ynh_die --message="Path not available: ${domain}${path_url}"
-test ! -d $final_path \
-	|| ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS
@@ -76,7 +73,15 @@ ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weig
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
-ynh_add_fpm_config --package="$extra_php_dependencies"
+ynh_add_fpm_config
+
+#=================================================
+# REINSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Reinstalling dependencies..." --weight=1
+
+# Define and install dependencies
+ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # RESTORE THE MYSQL DATABASE
@@ -87,6 +92,13 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
 ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
 
+#=================================================
+# RESTORE VARIOUS FILES
+#=================================================
+ynh_script_progression --message="Restoring various files..." --weight=1
+
+ynh_restore_file --origin_path="/etc/cron.d/$app"
+
 #=================================================
 # RESTORE SYSTEMD
 #=================================================

scripts/upgrade

@@ -27,7 +27,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 # CHECK VERSION
 #=================================================
-ynh_script_progression --message="Checking version..."
 
 upgrade_type=$(ynh_check_app_version_changed)
 
@@ -71,6 +70,13 @@ if [ -z "$db_name" ]; then
 	ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 fi
 
+# Cleaning legacy permissions
+if ynh_legacy_permissions_exists; then
+	ynh_legacy_permissions_delete_all
+
+	ynh_app_setting_delete --app=$app --key=is_public
+fi
+
 # Do not remove the file before the backup, to not fail the backup.
 # Remove old cron job
 ynh_secure_remove --file="/etc/cron.d/$app"
@@ -89,21 +95,10 @@ ynh_system_user_create --username=$app --home_dir=$final_path
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-	ynh_script_progression --message="Upgrading source files..." --weight=7
+	ynh_script_progression --message="Upgrading source files..." --weight=1
-
-	# Create a temporary directory
-	tmpdir="$(ynh_smart_mktemp --min_size=10)"
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$tmpdir"
+	ynh_setup_source --dest_dir="$final_path"
-
-	# Backup the config file in the temp dir
-	cp -a "$final_path/config.php" "$tmpdir/config.php"
-
-	# Replace the old ttrss by the new one
-	ynh_secure_remove --file="$final_path"
-	mv "$tmpdir" "$final_path"
-	ynh_secure_remove --file="$tmpdir"
 fi
 
 chmod 750 "$final_path"
@@ -118,13 +113,20 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
+#=================================================
+# UPGRADE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Upgrading dependencies..." --weight=1
+
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --package="$extra_php_dependencies"
+ynh_add_fpm_config
 
 #=================================================
 # SPECIFIC UPGRADE
@@ -138,20 +140,14 @@ then
 
 	domain_path=https://$domain$path_url
 	ynh_add_config --template="../conf/config.php" --destination="$final_path/config.php"
+
+	ynh_script_progression --message="Upgrading ttrss database..." --weight=2
+	sudo -u $app php${phpversion} ${final_path}/update.php --update-schema=force-yes
 fi
+
 chmod 400 "$final_path/config.php"
 chown $app:$app "$final_path/config.php"
 
-#=================================================
-# UPGRADE DATABASE
-#=================================================
-
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-	ynh_script_progression --message="Upgrading ttrss database..." --weight=2
-	ynh_exec_as $app php"${phpversion}" ${final_path}/update.php --update-schema
-fi
-
 #=================================================
 # SETUP SYSTEMD
 #=================================================

sources/patches/app-init.patch

@@ -1,21 +0,0 @@
-*** /plugins/auth_remote/init.php	2015-01-22 17:56:31.641845090 +0100
---- /plugins/auth_remote/init.php.1	2015-02-20 09:23:16.515269911 +0100
-***************
-*** 69,74 ****
---- 69,84 ----
-  						db_query("UPDATE ttrss_users SET email = '$email' WHERE id = " .
-  							$user_id);
-  					}
-+ 					// update user password to allow api access
-+ 					if (isset($_SERVER['PHP_AUTH_PW'])){
-+ 						$currentpassword = $_SERVER['PHP_AUTH_PW'];
-+ 						$new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
-+ 						$new_password_hash = encrypt_password($currentpassword, $new_salt, true);
-+ 
-+ 						db_query("UPDATE ttrss_users SET
-+ 							pwd_hash = '$new_password_hash', salt = '$new_salt', otp_enabled = false
-+ 							WHERE login = '$try_login'");
-+ 					}
-  				}
-  
-  				return $user_id;

sources/patches/app-login_remote_user.patch

@@ -1,21 +0,0 @@
---- /include/functions.php
-+++ /include/functions.php
-@@ -825,6 +825,18 @@
- 				}
- 
- 			} else {
-+				/* We need to check that the "REMOTE_USER" and "uid" are same.
-+				 * If it has changed it's probably that the user logged out and
-+				 * was authenticated with a other username.
-+				 * In this case we need to reauthenticate the user
-+				 */
-+				if (AUTH_AUTO_LOGIN && $_SERVER["REMOTE_USER"] != $_SESSION["uid"]) {
-+					if (authenticate_user(null, null)) {
-+						$_SESSION["ref_schema_version"] = get_schema_version(true);
-+					} else {
-+						authenticate_user(null, null, true);
-+					}
-+				}
- 				/* bump login timestamp */
- 				$sth = $pdo->prepare("UPDATE ttrss_users SET last_login = NOW() WHERE id = ?");
- 				$sth->execute([$_SESSION['uid']]);

sources/patches/app-update.patch

@@ -1,21 +0,0 @@
-*** /update.php	2015-02-20 09:41:40.231462387 +0100
---- /update.php.1	2015-02-20 09:42:07.911466665 +0100
-***************
-*** 311,318 ****
-  			_debug("WARNING: please backup your database before continuing.");
-  			_debug("Type 'yes' to continue.");
-  
-! 			if (read_stdin() != 'yes')
-! 				exit;
-  
-  			for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
-  				_debug("performing update up to version $i...");
---- 311,318 ----
-  			_debug("WARNING: please backup your database before continuing.");
-  			_debug("Type 'yes' to continue.");
-  
-! 			//if (read_stdin() != 'yes')
-! 			//	exit;
-  
-  			for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
-  				_debug("performing update up to version $i...");