From 0616e143e79ba5586f6564e8ab8ce3ff601b847a Mon Sep 17 00:00:00 2001
From: Alexis Gavoty <kload@kload.fr>
Date: Thu, 5 Dec 2013 17:21:57 +0100
Subject: [PATCH 1/3] Update manifest.json

---
 manifest.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifest.json b/manifest.json
index bffe2f9..104ff4d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,11 +3,11 @@
     "id": "wordpress",
     "description": {
         "en": "WordPress is web software you can use to create a beautiful website or blog",
-        "fr": "Outils de création de Blog ou de site web"
+        "fr": "Logiciel de création de blog ou de site Web"
     },
     "developer": {
         "name": "beudbeud",
-        "email": "beudbeud@beudibox.Fr",
+        "email": "beudbeud@beudibox.fr",
         "url": "http://wordpress.org/"
     },
     "multi_instance": "true",
@@ -31,15 +31,15 @@
                 "name": "admin_passwd",
                 "ask": {
                     "en": "Choose a password for Wordpress administrator"
-                },
-                "example": ""
+                }
             },
             {
                 "name": "public_site",
                 "ask": {
-                    "en": "Is it a public Wordpress site ? (Y/n)"
+                    "en": "Is it a public Wordpress site ?"
                 },
-                "example": "Y"
+                "example": "Y/n",
+                "default": "Y"
             }
 
 

From 002dd6ce65306b91427c3efe768d9f35a8f7e68e Mon Sep 17 00:00:00 2001
From: Alexis Gavoty <kload@kload.fr>
Date: Thu, 5 Dec 2013 17:25:09 +0100
Subject: [PATCH 2/3] Update install

---
 scripts/install | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index 31c5784..f409486 100755
--- a/scripts/install
+++ b/scripts/install
@@ -4,7 +4,6 @@
 domain=$1
 path=$2
 admin_passwd=$3
-root_pwd=$(sudo cat /etc/yunohost/mysql)
 
 # Check domain/path availability
 sudo yunohost app checkurl $domain$path -a wordpress
@@ -55,8 +54,8 @@ if [ $4 = "n" ];
 then
 	sudo yunohost app setting wordpress skipped_uris -d
 	sudo yunohost app ssowatconf
-	mysql -u root -p$root_pwd wordpress < ../conf/private.sql
+	mysql -u $db_user -p$db_pwd $db_user < ../conf/private.sql
 else
-	mysql -u root -p$root_pwd wordpress < ../conf/public.sql
+	mysql -u $db_user -p$db_pwd $db_user < ../conf/public.sql
 fi
 sudo sed -i '/wordpress/d' /etc/hosts

From b139ddbab6f2218f46f1f455910d41e9d8b4214c Mon Sep 17 00:00:00 2001
From: Alexis Gavoty <kload@kload.fr>
Date: Thu, 5 Dec 2013 17:31:41 +0100
Subject: [PATCH 3/3] Update manifest.json

---
 manifest.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 104ff4d..4dfb0ee 100644
--- a/manifest.json
+++ b/manifest.json
@@ -25,7 +25,8 @@
                 "ask": {
                     "en": "Choose a path for Wordpress"
                 },
-                "example": "/blog"
+                "example": "/blog",
+                "default": "/blog"
             },
             {
                 "name": "admin_passwd",