From 16a5a0ad612a8d8a4dece3f6523043cb2c1cd606 Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Fri, 4 Mar 2016 02:37:09 +0100
Subject: [PATCH 1/4] [enh] reload Nginx conf after removing Ampache conf.

---
 scripts/remove | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/remove b/scripts/remove
index fae0af8..8a80161 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -8,3 +8,6 @@ domain=$(sudo yunohost app setting ampache domain)
 mysql -u root -p$root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localhost ;"
 sudo rm -rf /var/www/ampache
 sudo rm -f /etc/nginx/conf.d/$domain.d/ampache.conf
+
+# Reload Nginx configuration
+sudo service nginx reload

From b5787f119dbe98e398d9dd112a519223f4232cc5 Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Fri, 4 Mar 2016 02:38:35 +0100
Subject: [PATCH 2/4] [enh] add comments in remove script.

---
 scripts/remove | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/remove b/scripts/remove
index 8a80161..dd02d9b 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -5,9 +5,12 @@ db_name=ampache
 root_pwd=$(sudo cat /etc/yunohost/mysql)
 domain=$(sudo yunohost app setting ampache domain)
 
+# Drop MySQL database
 mysql -u root -p$root_pwd -e "DROP DATABASE $db_name ; DROP USER $db_user@localhost ;"
-sudo rm -rf /var/www/ampache
-sudo rm -f /etc/nginx/conf.d/$domain.d/ampache.conf
 
-# Reload Nginx configuration
+# Remove sources
+sudo rm -rf /var/www/ampache
+
+# Remove Nginx configuration and reload Nginx conf
+sudo rm -f /etc/nginx/conf.d/$domain.d/ampache.conf
 sudo service nginx reload

From 9cd325c88fe601080fc781300fd69c7613a78f0a Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Fri, 4 Mar 2016 02:41:05 +0100
Subject: [PATCH 3/4] [enh] add readme file with projects links.

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..ad1a18f
--- /dev/null
+++ b/README.md
@@ -0,0 +1,4 @@
+# Ampache package for YunoHost
+
+* [Ampache website](http://ampache.org/)
+* [YunoHost website](https://yunohost.org)

From 296b95f29e8251eddd8c69a15d641c6ccb8b2f6a Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Fri, 4 Mar 2016 02:48:45 +0100
Subject: [PATCH 4/4] [enh] manifest: add url, license, services, types. Rename
 dev -> maintainer.

---
 manifest.json | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/manifest.json b/manifest.json
index c7a8427..771ff99 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,24 +5,32 @@
         "en": "A web based audio/video streaming application",
         "fr": "Une application de streaming audio et vidéo"
     },
-    "developer": {
+    "url": "http://ampache.org",
+    "license": "free",
+    "maintainer": {
         "name": "beudbeud",
-        "email": "beudbeud@beudibox.fr",
-        "url": "http://ampache.org"
+        "email": "beudbeud@beudibox.fr"
     },
     "multi_instance": "true",
+    "services" : [
+        "nginx",
+	"php5-fpm",
+	"mysql"
+    ],
     "arguments": {
         "install" : [
             {
                 "name": "domain",
+                "type": "domain",
                 "ask": {
-                    "en": "Choose a domain for Ampache",
-                    "fr": "Choisissez un domaine pour Ampache"
+                    "en": "Choose a domain name for Ampache",
+                    "fr": "Choisissez un nom de domaine pour Ampache"
                 },
                 "example": "domain.org"
             },
             {
                 "name": "path",
+                "type": "path",
                 "ask": {
                     "en": "Choose a path for Ampache",
                     "fr": "Choisissez un chemin pour Ampache"
@@ -32,6 +40,7 @@
             },
             {   
                 "name": "admin",
+                "type": "user",
                 "ask": {
                     "en": "Choose the Ampache administrator (must be an existing YunoHost user)",
                     "fr": "Administrateur du serveur Ampache (doit etre un utilisateur Yunohost existant)"