Merge pull request #74 from YunoHost-Apps/testing

Testing
2024-09-03 20:26:10 +02:00 · 2021-12-02 02:52:12 +01:00 · 2021-12-02 02:52:12 +01:00 · 81e2833dd4
commit 81e2833dd4
parent 183728c378 43d2991fb2
18 changed files with 235 additions and 313 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -6,12 +6,12 @@ about: When creating a bug report, please use the following template to provide

 **How to post a meaningful bug report**
 1. *Read this whole template first.*
-2. *Make sure you are on the right place:*
+2. *Determine if you are on the right place:*
   - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!*
   - *Otherwise, the issue may be due to the app itself. Refer to its documentation or repository for help.*
-   - *In doubt, ask here and we will figure it out together.*
-3. *Delete these italic comments as you write over them below, and remove this guide.*
---
+   - *When in doubt, post here and we will figure it out together.*
+3. *Delete the italic comments as you write over them below, and remove this guide.*
+--- 

 ### Describe the bug

@ -22,7 +22,7 @@ about: When creating a bug report, please use the following template to provide
 - Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...*
 - YunoHost version: x.x.x
 - I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...*
- Are you in a special context or did you perform some particular tweaking on your YunoHost instance ?: *no / yes*
+- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes*
  - If yes, please explain:
 - Using, or trying to install package version/branch:
 - If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`*
@ -31,7 +31,7 @@ about: When creating a bug report, please use the following template to provide

 - *If you performed a command from the CLI, the command itself is enough. For example:*
    ```sh
-    sudo yunohost app install shaarli
+    sudo yunohost app install the_app
    ```
 - *If you used the webadmin, please perform the equivalent command from the CLI first.*
 - *If the error occurs in your browser, explain what you did:*
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -0,0 +1,16 @@
+## Problem
+
+- *Description of why you made this PR*
+
+## Solution
+
+- *And how do you fix that problem*
+
+## PR Status
+
+- [ ] Code finished and ready to be reviewed/tested
+- [ ] The fix/enhancement were manually tested (if applicable)
+
+## Automatic tests
+
+Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization)
--- a/README.md
+++ b/README.md
@ -1,60 +1,56 @@
+<!--
+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.
+-->
+
 # Shaarli for YunoHost

 [![Integration level](https://dash.yunohost.org/integration/shaarli.svg)](https://dash.yunohost.org/appci/app/shaarli) ![](https://ci-apps.yunohost.org/ci/badges/shaarli.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/shaarli.maintain.svg)  
-[![Install Shaarli with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=shaarli)
+[![Install Shaarli with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=shaarli)
+
+*[Lire ce readme en français.](./README_fr.md)*

 > *This package allows you to install Shaarli quickly and simply on a YunoHost server.
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*

 ## Overview
-[Shaarli](https://github.com/shaarli/Shaarli) intends to provide YunoHost's users with a simple but advanced bookmarking service.

-**Shipped version:** 0.12.1
+Shaarli is a minimalist bookmark manager and link sharing service that you can install on your own server. It is designed to be personal (single-user), fast and handy.
+
+### Features
+
+- share, comment and save interesting links
+- bookmark useful/frequent links and share them between computers
+- a minimal blog/microblog/writing platform
+- a read-it-later/todo list
+- a notepad to draft and save articles/posts/ideas
+- a knowledge base to keep notes, documentation and code snippets
+- a shared clipboard/notepad/pastebin between computers
+- playlist manager for online media
+- feed other blogs, aggregators, social networks...
+
+
+**Shipped version:** 0.12.1~ynh2
+
+**Demo:** https://demo.shaarli.org/

 ## Screenshots

-![](https://i.imgur.com/zGF4d6L.jpg)
+![](./doc/screenshots/27wYsbC.png)

-![](https://i.imgur.com/27wYsbC.png)
-
-## Demo
-
-* [Official demo](https://demo.shaarli.org/)
+## Disclaimers / important information

 ## Configuration

 During the installation app will prompt you to install itself as public or private, if you choose public then anyone (not just YunoHost users) would be able to access your Shaarli instance.

 After the installation is complete, go to the domain where the Shaarli is installed and create your account. After the creation of the account the registration will be locked.
+## Documentation and resources

-## Documentation
-
- * Official documentation: https://shaarli.readthedocs.io/en/master/
- * YunoHost documentation: If specific documentation is needed, feel free to contribute.
-
-## Changelog
-
-For Shaarli changelog, see: https://github.com/shaarli/Shaarli/blob/master/CHANGELOG.md
-
-#### Supported architectures
-
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/shaarli%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/shaarli/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/shaarli%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/shaarli/)
-
-## Limitations
-
-* Any known limitations.
-
-## Additional information
-
-## Links
-
- * Report a bug: https://github.com/YunoHost-Apps/shaarli_ynh/issues
- * App website: https://shaarli.readthedocs.io/
- * Upstream app repository: https://github.com/shaarli/Shaarli
- * YunoHost website: https://yunohost.org/
-
---
+* Official admin documentation: https://shaarli.readthedocs.io/en/master/
+* Upstream app code repository: https://github.com/shaarli/Shaarli
+* YunoHost documentation for this app: https://yunohost.org/app_shaarli
+* Report a bug: https://github.com/YunoHost-Apps/shaarli_ynh/issues

 ## Developer info

@ -66,3 +62,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/shaarli_ynh/tree/test
 or
 sudo yunohost app upgrade shaarli -u https://github.com/YunoHost-Apps/shaarli_ynh/tree/testing --debug
 ```
+
+**More info regarding app packaging:** https://yunohost.org/packaging_apps
--- a/README_fr.md
+++ b/README_fr.md
@ -0,0 +1,62 @@
+# Shaarli pour YunoHost
+
+[![Niveau d'intégration](https://dash.yunohost.org/integration/shaarli.svg)](https://dash.yunohost.org/appci/app/shaarli) ![](https://ci-apps.yunohost.org/ci/badges/shaarli.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/shaarli.maintain.svg)  
+[![Installer Shaarli avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=shaarli)
+
+*[Read this readme in english.](./README.md)*
+*[Lire ce readme en français.](./README_fr.md)*
+
+> *Ce package vous permet d'installer Shaarli rapidement et simplement sur un serveur YunoHost.
+Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
+
+## Vue d'ensemble
+
+Shaarli is a minimalist bookmark manager and link sharing service that you can install on your own server. It is designed to be personal (single-user), fast and handy.
+
+### Features
+
+- share, comment and save interesting links
+- bookmark useful/frequent links and share them between computers
+- a minimal blog/microblog/writing platform
+- a read-it-later/todo list
+- a notepad to draft and save articles/posts/ideas
+- a knowledge base to keep notes, documentation and code snippets
+- a shared clipboard/notepad/pastebin between computers
+- playlist manager for online media
+- feed other blogs, aggregators, social networks...
+
+
+**Version incluse :** 0.12.1~ynh2
+
+**Démo :** https://demo.shaarli.org/
+
+## Captures d'écran
+
+![](./doc/screenshots/27wYsbC.png)
+
+## Avertissements / informations importantes
+
+## Configuration
+
+During the installation app will prompt you to install itself as public or private, if you choose public then anyone (not just YunoHost users) would be able to access your Shaarli instance.
+
+After the installation is complete, go to the domain where the Shaarli is installed and create your account. After the creation of the account the registration will be locked.
+## Documentations et ressources
+
+* Documentation officielle de l'admin : https://shaarli.readthedocs.io/en/master/
+* Dépôt de code officiel de l'app : https://github.com/shaarli/Shaarli
+* Documentation YunoHost pour cette app : https://yunohost.org/app_shaarli
+* Signaler un bug : https://github.com/YunoHost-Apps/shaarli_ynh/issues
+
+## Informations pour les développeurs
+
+Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/shaarli_ynh/tree/testing).
+
+Pour essayer la branche testing, procédez comme suit.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/shaarli_ynh/tree/testing --debug
+ou
+sudo yunohost app upgrade shaarli -u https://github.com/YunoHost-Apps/shaarli_ynh/tree/testing --debug
+```
+
+**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
--- a/14
+++ b/14
@ -1,14 +1,9 @@
-# See here for more information
-# https://github.com/YunoHost/package_check#syntax-check_process-file
-
-# Move this file from check_process.default to check_process when you have filled it.
-
 ;; Test complet sans multisite
 	; Manifest
-		domain="domain.tld"	(DOMAIN)
-		path="/path"	(PATH)
-		is_public=1	(PUBLIC|public=1|private=0)
-		admin="john"	(USER)
+		domain="domain.tld"
+		path="/path"
+		is_public=1
+		admin="john"
 		password="pass"
 		title="Shaarli"
 	; Checks
@ -21,7 +16,6 @@
 		upgrade=1
 		backup_restore=1
 		multi_instance=1
-		port_already_use=0
 		change_url=1
 ;;; Options
 Email=
--- a/conf/app.src
+++ b/conf/app.src
@ -3,5 +3,4 @@ SOURCE_SUM=f614e9baddbb5ea72b2158bbfa586b5761d17918be9a97a7bd28d7255276fc0b
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
 SOURCE_EXTRACT=true
--- a/conf/nginx.conf
+++ b/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;

  if (!-f $request_filename) {
--- a/doc/DESCRIPTION.md
+++ b/doc/DESCRIPTION.md
@ -0,0 +1,13 @@
+Shaarli is a minimalist bookmark manager and link sharing service that you can install on your own server. It is designed to be personal (single-user), fast and handy.
+
+### Features
+
+- share, comment and save interesting links
+- bookmark useful/frequent links and share them between computers
+- a minimal blog/microblog/writing platform
+- a read-it-later/todo list
+- a notepad to draft and save articles/posts/ideas
+- a knowledge base to keep notes, documentation and code snippets
+- a shared clipboard/notepad/pastebin between computers
+- playlist manager for online media
+- feed other blogs, aggregators, social networks...
--- a/doc/DISCLAIMER.md
+++ b/doc/DISCLAIMER.md
@ -0,0 +1,5 @@
+## Configuration
+
+During the installation app will prompt you to install itself as public or private, if you choose public then anyone (not just YunoHost users) would be able to access your Shaarli instance.
+
+After the installation is complete, go to the domain where the Shaarli is installed and create your account. After the creation of the account the registration will be locked.
--- a/doc/screenshots/27wYsbC.png
+++ b/doc/screenshots/27wYsbC.png
--- a/manifest.json
+++ b/manifest.json
@ -4,10 +4,16 @@
  "packaging_format": 1,
  "description": {
    "en": "The personal, minimalist, super-fast, no-database delicious clone",
-    "fr": "Clone de delicious, rapide, simple et sans base de données."
+    "fr": "Clone de delicious, rapide, simple et sans base de données"
  },
  "version": "0.12.1~ynh2",
  "url": "https://github.com/shaarli/Shaarli",
+  "upstream": {
+        "license": "MIT",
+        "demo": "https://demo.shaarli.org/",
+        "admindoc": "https://shaarli.readthedocs.io/en/master/",
+        "code": "https://github.com/shaarli/Shaarli"
+    },
  "license": "MIT",
  "maintainer": {
    "name": "lapineige et rafi59",
@ -15,51 +21,32 @@
    "url": ""
  },
  "requirements": {
-    "yunohost": ">= 3.8.1"
+    "yunohost": ">= 4.3.0"
  },
  "multi_instance": true,
  "services": [
        "nginx",
-        "php7.0-fpm"
+        "php7.3-fpm"
  ],
  "arguments": {
    "install" : [
    {
      "name": "domain",
-      "type": "domain",
-      "ask": {
-        "en": "Choose a domain for your Shaarli",
-        "fr": "Choisissez un domaine pour votre Shaarli"
-      },
-      "example": "domain.org"
+      "type": "domain"
    },
    {
      "name": "path",
      "type": "path",
-      "ask": {
-        "en": "Choose a path for your Shaarli",
-        "fr": "Choisissez un chemin pour votre Shaarli"
-      },
      "example": "/shaarli",
      "default": "/shaarli"
    },
    {
      "name": "admin",
-      "type": "user",
-      "ask": {
-        "en": "Choose the admin user",
-        "fr": "Choisissez l’administrateur"
-      },
-      "example": "johndoe"
+      "type": "user"
    },
    {
      "name": "password",
-      "type": "password",
-      "ask": {
-        "en": "Choose the admin password",
-        "fr": "Choisissez le mot de passe de l’administrateur"
-      },
-      "example": "johndoe"
+      "type": "password"
    },
    {
      "name": "title",
@ -74,10 +61,6 @@
    {
      "name": "is_public",
      "type": "boolean",
-      "ask": {
-        "en": "Is it a public Shaarli site?",
-        "fr": "Est-ce un site Shaarli public ?"
-      },
      "help": {
        "en": "If set as public, Shaarli will be visible to anyone, including non-Yunohost users. However only Shaarli users can add bookmarks. Your links will be public by default, but you can change that in Shaarli's configuration page.",
        "fr": "Si configuré en public, Shaarli sera visible par tout le monde, y compris des personnes sans compte sur votre Yunohost. Cependant seules les personnes avec un compte Shaarli pourrons ajouter des marques-pages. Vos nouveaux liens seront publics par défaut, mais vous pourrez changer ça dans la page de configuration de Shaarli."
--- a/pull_request_template.md
+++ b/pull_request_template.md
@ -1,18 +0,0 @@
-## Problem
- *Description of why you made this PR*
-
-## Solution
- *And how do you fix that problem*
-
-## PR Status
- [ ] Code finished.
- [ ] Tested with Package_check.
- [ ] Fix or enhancement tested.
- [ ] Upgrade from last version tested.
- [ ] Can be reviewed and tested.
-
-## Package_check results
---
-*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results*
-
-[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/shaarli_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/shaarli_ynh%20PR-NUM-%20(USERNAME)/)
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -7,7 +7,7 @@
 # dependencies used by the app
 YNH_PHP_VERSION="7.3"

-extra_php_dependencies="php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-gettext php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring"
+pkg_dependencies="php${YNH_PHP_VERSION}-cli php${YNH_PHP_VERSION}-gettext php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring"

 #=================================================
 # PERSONAL HELPERS
@ -54,146 +54,6 @@ ynh_smart_mktemp () {
        echo "$(mktemp --directory --tmpdir="$tmpdir")"
 }

-# Create a dedicated config file from a template
-#
-# examples:
-#    ynh_add_config --template=".env" --destination="$final_path/.env"
-#    ynh_add_config --template="../conf/.env" --destination="$final_path/.env"
-#    ynh_add_config --template="/etc/nginx/sites-available/default" --destination="etc/nginx/sites-available/mydomain.conf"
-#
-# usage: ynh_add_config --template="template" --destination="destination"
-# | arg: -t, --template=     - Template config file to use
-# | arg: -d, --destination=    - Destination of the config file
-#
-# The template can be by default the name of a file in the conf directory
-# of a YunoHost Package, a relative path or an absolute path
-# The helper will use the template $template to generate a config file
-# $destination by replacing the following keywords with global variables
-# that should be defined before calling this helper :
-#   __PATH__             by  $path_url
-#   __NAME__            by $app
-#   __NAMETOCHANGE__    by $app
-#   __USER__            by $app
-#   __FINALPATH__       by $final_path
-#   __PHPVERSION__      by $YNH_PHP_VERSION
-#
-# And any dynamic variables that should be defined before calling this helper like:
-#   __DOMAIN__   by $domain
-#   __APP__      by $app
-#   __VAR_1__    by $var_1
-#   __VAR_2__    by $var_2
-#
-# The helper will verify the checksum and backup the destination file
-# if it's different before applying the new template.
-# And it will calculate and store the destination file checksum
-# into the app settings when configuration is done.
-#
-#
-ynh_add_config () {
-    # Declare an array to define the options of this helper.
-    local legacy_args=tdv
-    local -A args_array=( [t]=template= [d]=destination= )
-    local template
-    local destination
-    # Manage arguments with getopts
-    ynh_handle_getopts_args "$@"
-    local template_path
-
-    if [ -f "../conf/$template" ]; then
-        template_path="../conf/$template"
-    elif [ -f "../settings/conf/$template" ]; then
-        template_path="../settings/conf/$template"
-    elif [ -f "$template" ]; then
-        template_path=$template
-    else
-        ynh_die --message="The provided template $template doesn't exist"
-    fi
-
-    ynh_backup_if_checksum_is_different --file="$destination"
-
-    cp "$template_path" "$destination"
-
-    ynh_replace_vars --file="$destination"
-
-    ynh_store_file_checksum --file="$destination"
-}
-
-# Replace variables in a file
-#
-# usage: ynh_replace_vars --file="file"
-# | arg: -f, --file=     - File where to replace variables
-#
-# The helper will replace the following keywords with global variables
-# that should be defined before calling this helper :
-#   __PATH__             by  $path_url
-#   __NAME__            by $app
-#   __NAMETOCHANGE__    by $app
-#   __USER__            by $app
-#   __FINALPATH__       by $final_path
-#   __PHPVERSION__      by $YNH_PHP_VERSION
-#
-# And any dynamic variables that should be defined before calling this helper like:
-#   __DOMAIN__   by $domain
-#   __APP__      by $app
-#   __VAR_1__    by $var_1
-#   __VAR_2__    by $var_2
-#
-#
-ynh_replace_vars () {
-    # Declare an array to define the options of this helper.
-    local legacy_args=f
-    local -A args_array=( [f]=file= )
-    local file
-    # Manage arguments with getopts
-    ynh_handle_getopts_args "$@"
-
-    # Replace specific YunoHost variables
-    if test -n "${path_url:-}"
-    then
-        # path_url_slash_less is path_url, or a blank value if path_url is only '/'
-        local path_url_slash_less=${path_url%/}
-        ynh_replace_string --match_string="__PATH__/" --replace_string="$path_url_slash_less/" --target_file="$file"
-        ynh_replace_string --match_string="__PATH__" --replace_string="$path_url" --target_file="$file"
-    fi
-    if test -n "${app:-}"; then
-        ynh_replace_string --match_string="__NAME__" --replace_string="$app" --target_file="$file"
-        ynh_replace_string --match_string="__NAMETOCHANGE__" --replace_string="$app" --target_file="$file"
-        ynh_replace_string --match_string="__USER__" --replace_string="$app" --target_file="$file"
-    fi
-    if test -n "${final_path:-}"; then
-        ynh_replace_string --match_string="__FINALPATH__" --replace_string="$final_path" --target_file="$file"
-    fi
-    if test -n "${YNH_PHP_VERSION:-}"; then
-        ynh_replace_string --match_string="__PHPVERSION__" --replace_string="$YNH_PHP_VERSION" --target_file="$file"
-    fi
-    if test -n "${ynh_node_load_PATH:-}"; then
-        ynh_replace_string --match_string="__YNH_NODE_LOAD_PATH__" --replace_string="$ynh_node_load_PATH" --target_file="$file"
-    fi
-
-    # Replace others variables
-
-    # List other unique (__ __) variables in $file
-    local uniques_vars=( $(grep -o '__[A-Z0-9_]*__' $file | sort --unique | sed "s@__\([^.]*\)__@\L\1@g" ))
-
-    # Do the replacement
-    local delimit=@
-    for one_var in "${uniques_vars[@]}"
-    do
-        # Validate that one_var is indeed defined
-        test -n "${!one_var:-}" || ynh_die --message="\$$one_var wasn't initialized when trying to replace __${one_var^^}__ in $file"
-
-        # Escape delimiter in match/replace string
-        match_string="__${one_var^^}__"
-        match_string=${match_string//${delimit}/"\\${delimit}"}
-        replace_string="${!one_var}"
-        replace_string=${replace_string//${delimit}/"\\${delimit}"}
-
-        # Actually replace (sed is used instead of ynh_replace_string to avoid triggering an epic amount of debug logs)
-        sed --in-place "s${delimit}${match_string}${delimit}${replace_string}${delimit}g" "$file"
-    done
-}
-
-
 #=================================================
 # FUTURE OFFICIAL HELPERS
 #=================================================
--- a/scripts/backup
+++ b/scripts/backup
@ -14,9 +14,6 @@ source /usr/share/yunohost/helpers
 # MANAGE SCRIPT FAILURE
 #=================================================

-ynh_clean_setup () {
-	true
-}
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors

--- a/scripts/install
+++ b/scripts/install
@ -13,22 +13,20 @@ source /usr/share/yunohost/helpers
 # MANAGE SCRIPT FAILURE
 #=================================================

-ynh_clean_setup () {
-	### Remove this function if there's nothing to clean before calling the remove script.
-	true
-}
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors

 #=================================================
 # RETRIEVE ARGUMENTS FROM THE MANIFEST
 #=================================================
+
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 admin=$YNH_APP_ARG_ADMIN
 password=$YNH_APP_ARG_PASSWORD
 title=$YNH_APP_ARG_TITLE
 is_public=$YNH_APP_ARG_IS_PUBLIC
+phpversion=$YNH_PHP_VERSION

 app=$YNH_APP_INSTANCE_NAME

@ -48,26 +46,16 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 #=================================================
 ynh_script_progression --message="Storing installation settings..."

-ynh_app_setting_set --app=$app --key=domain    --value=$domain
-ynh_app_setting_set --app=$app --key=path      --value=$path_url
-ynh_app_setting_set --app=$app --key=is_public --value=$is_public
+ynh_app_setting_set --app=$app --key=domain --value=$domain
+ynh_app_setting_set --app=$app --key=path --value=$path_url
+ynh_app_setting_set --app=$app --key=phpversion --value=$phpversion

 #=================================================
-# DOWNLOAD, CHECK AND UNPACK SOURCE
+# INSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Setting up source files..."
+ynh_script_progression --message="Installing dependencies..."

-ynh_app_setting_set --app=$app --key=final_path --value=$final_path
-# Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$final_path"
-
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Configuring NGINX web server..."
-
-# Create a dedicated NGINX config
-ynh_add_nginx_config
+ynh_install_app_dependencies $pkg_dependencies

 #=================================================
 # CREATE DEDICATED USER
@ -77,13 +65,35 @@ ynh_script_progression --message="Configuring system user..."
 # Create a system user
 ynh_system_user_create --username=$app

+#=================================================
+# DOWNLOAD, CHECK AND UNPACK SOURCE
+#=================================================
+ynh_script_progression --message="Setting up source files..."
+
+ynh_app_setting_set --app=$app --key=final_path --value=$final_path
+# Download, check integrity, uncompress and patch the source from app.src
+ynh_setup_source --dest_dir="$final_path"
+
+#chmod 750 "$final_path"
+#chmod -R o-rwx "$final_path"
+#chmod -R g+rwX $final_path/{cache/,data/,pagecache/,tmp/}
+#chown -R $app:www-data "$final_path"
+
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Configuring NGINX web server..."
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
+
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================
 ynh_script_progression --message="Configuring PHP-FPM..."

 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=low --footprint=low

 #=================================================
 # SETUP LOGROTATE
@ -138,19 +148,16 @@ chmod -R g+rwX $final_path/{cache/,data/,pagecache/,tmp/}
 ynh_script_progression --message="Configuring Fail2Ban..."

 # Create a dedicated Fail2Ban config
-
 ynh_add_fail2ban_config --logpath="$final_path/data/log.txt" --failregex="\s-\s<HOST>\s-\sLogin failed for user.*$"

 #=================================================
 # SETUP SSOWAT
 #=================================================
-ynh_script_progression --message="Configuring SSOwat..."
+ynh_script_progression --message="Configuring permissions..."

 # Make app public if necessary
 if [ $is_public -eq 1 ]
 then
-	# Everyone can access the app.
-	# The "main" permission is automatically created before the install script.
 	ynh_permission_update --permission "main" --add "visitors"
 fi

--- a/scripts/remove
+++ b/scripts/remove
@ -47,6 +47,7 @@ ynh_remove_fpm_config
 # REMOVE LOGROTATE CONFIGURATION
 #=================================================
 ynh_script_progression --message="Removing logrotate configuration..."
+
 # Remove the app-specific logrotate config
 ynh_remove_logrotate

--- a/scripts/restore
+++ b/scripts/restore
@ -14,9 +14,6 @@ source /usr/share/yunohost/helpers
 # MANAGE SCRIPT FAILURE
 #=================================================

-ynh_clean_setup () {
-	true
-}
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors

@ -37,8 +34,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..."

-ynh_webpath_available --domain=$domain --path_url=$path_url \
-	|| ynh_die --message="Path not available: ${domain}${path_url}"
 test ! -d $final_path \
 	|| ynh_die --message="There is already a directory: $final_path "

@ -47,16 +42,10 @@ test ! -d $final_path \
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
+ynh_script_progression --message="Restoring the NGINX configuration..."

 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"

-#=================================================
-# RESTORE THE APP MAIN DIR
-#=================================================
-ynh_script_progression --message="Restoring the app main directory..."
-
-ynh_restore_file --origin_path="$final_path"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
@ -65,6 +54,13 @@ ynh_script_progression --message="Recreating the dedicated system user..."
 # Create the dedicated user (if not existing)
 ynh_system_user_create --username=$app

+#=================================================
+# RESTORE THE APP MAIN DIR
+#=================================================
+ynh_script_progression --message="Restoring the app main directory..."
+
+ynh_restore_file --origin_path="$final_path"
+
 #=================================================
 # RESTORE USER RIGHTS
 #=================================================
@ -77,14 +73,24 @@ chmod -R g+rwX $final_path/{cache/,data/,pagecache/,tmp/}
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
+ynh_script_progression --message="Restoring the PHP-FPM configuration..."

 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"

+#=================================================
+# REINSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Reinstalling dependencies..."
+
+# Define and install dependencies
+ynh_install_app_dependencies $pkg_dependencies
+
 #=================================================
 # SPECIFIC RESTORATION
 #=================================================
 # RESTORE THE LOGROTATE CONFIGURATION
 #=================================================
+ynh_script_progression --message="Restoring the logrotate configuration..."

 ynh_restore_file --origin_path="/etc/logrotate.d/$app"

--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -18,7 +18,6 @@ app=$YNH_APP_INSTANCE_NAME

 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
-is_public=$(ynh_app_setting_get --app=$app --key=is_public)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)

 #=================================================
@ -27,26 +26,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)

 upgrade_type=$(ynh_check_app_version_changed)

-#=================================================
-# ENSURE DOWNWARD COMPATIBILITY
-#=================================================
-ynh_script_progression --message="Ensuring downward compatibility..."
-
-# If final_path doesn't exist, create it
-if [ -z "$final_path" ]; then
-	final_path=/var/www/$app
-	ynh_app_setting_set --app=$app --key=final_path --value=$final_path
-fi
-
-if [ -n "$is_public" ]; then
-	# Delete is_public key. It is now handled by the permissions system
-	ynh_app_setting_delete --app=$app --key=is_public
-	# Delete legacy permission settings
-	ynh_app_setting_delete --app=$app --key=unprotected_uris
-	ynh_app_setting_delete --app=$app --key=protected_uris
-	ynh_app_setting_delete --app=$app --key=skipped_uris
-fi
-
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
@ -61,6 +40,32 @@ ynh_clean_setup () {
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors

+#=================================================
+# ENSURE DOWNWARD COMPATIBILITY
+#=================================================
+ynh_script_progression --message="Ensuring downward compatibility..."
+
+# If final_path doesn't exist, create it
+if [ -z "$final_path" ]; then
+	final_path=/var/www/$app
+	ynh_app_setting_set --app=$app --key=final_path --value=$final_path
+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
+
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Making sure dedicated system user exists..."
+
+# Create a dedicated user (if not existing)
+ynh_system_user_create --username=$app
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@ -98,12 +103,11 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..."
 ynh_add_nginx_config

 #=================================================
-# CREATE DEDICATED USER
+# UPGRADE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..."
+ynh_script_progression --message="Upgrading dependencies..."

-# Create a dedicated user (if not existing)
-ynh_system_user_create --username=$app
+ynh_install_app_dependencies $pkg_dependencies

 #=================================================
 # PHP-FPM CONFIGURATION
@ -111,7 +115,7 @@ ynh_system_user_create --username=$app
 ynh_script_progression --message="Upgrading PHP-FPM configuration..."

 # Create a dedicated php-fpm config
-ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies"
+ynh_add_fpm_config --usage=low --footprint=low

 #=================================================
 # SETUP LOGROTATE