From 4fea9699713bfb1786f58c6f5253b5ff82a0ce7d Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniack_crudelis@yahoo.fr>
Date: Sun, 15 May 2016 11:34:18 +0200
Subject: [PATCH] Corrections mineures

---
 README.md       | 5 +++++
 manifest.json   | 6 ++++++
 scripts/install | 2 +-
 scripts/remove  | 2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index be016ed..83a9b2b 100644
--- a/README.md
+++ b/README.md
@@ -6,3 +6,8 @@ Leed for YunoHost
 Leed est un agrégateur de flux RSS/ATOM dit KISS : minimaliste, simple, léger et rapide.
 
 http://leed.idleman.fr/
+
+Mise à jour du package:  
+sudo yunohost app upgrade -u https://github.com/YunoHost-Apps/leed_ynh
+
+**Multi-utilisateur**: Non, une instance par utilisateur.
diff --git a/manifest.json b/manifest.json
index 722e3a4..3bd7897 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,7 @@
 {
     "name": "Leed",
     "id": "leed",
+    "packaging_format": 1,
     "description": {
         "en": "Leed is a minimalistic RSS feed aggregator which allows quick and non-intrusive reading of feeds.",
 	"fr": "Leed est un agrégateur RSS minimaliste qui permet la consultation de flux RSS de manière rapide et non intrusive."
@@ -13,6 +14,11 @@
         "email": "maniackc_dev@crudelis.fr"
     },
     "multi_instance": "true",
+    "services": [
+        "nginx",
+        "php5-fpm",
+        "mysql"
+    ],
     "arguments": {
         "install" : [
             {
diff --git a/scripts/install b/scripts/install
index 30c6f54..f60f8c6 100644
--- a/scripts/install
+++ b/scripts/install
@@ -49,7 +49,7 @@ sudo yunohost app setting $app language -v $language
 sudo yunohost app setting $app domain -v $domain
 
 # Génère un mot de passe aléatoire.
-db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d 'A-Za-z0-9' | sed -n 's/\(.\{24\}\).*/\1/p')
+db_pwd=$(cat /dev/urandom | head -n20 | tr -c -d 'A-Za-z0-9' | head -c20)
 # Utilise '$app' comme nom d'utilisateur et de base de donnée
 db_user=$app
 # Initialise la base de donnée et stocke le mot de passe mysql.
diff --git a/scripts/remove b/scripts/remove
index 0a4aca3..208cebc 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -25,6 +25,6 @@ sudo rm -f /etc/php5/fpm/conf.d/20-$app.ini
 
 # Recharge la configuration Nginx et php5-fpm
 sudo service nginx reload
-# sudo service php5-fpm reload
+sudo service php5-fpm reload
 # Régénère la configuration de SSOwat
 sudo yunohost app ssowatconf