Fix linter

check_process

@@ -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=

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

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) {

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...

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.

manifest.json

@@ -4,10 +4,18 @@
   "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": "free",
+        "website": "https://example.com",
+        "demo": "https://demo.shaarli.org/",
+        "admindoc": "https://yunohost.org/packaging_apps",
+        "userdoc": "https://yunohost.org/apps",
+        "code": "https://github.com/shaarli/Shaarli"
+    },
   "license": "MIT",
   "maintainer": {
     "name": "lapineige et rafi59",
@@ -15,51 +23,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 +63,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."

scripts/restore

@@ -37,8 +37,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 "