From 25f7570cda9d3bc2f008bd9f5d2cdd2e5a49563f Mon Sep 17 00:00:00 2001
From: magikcypress <cyp@rouquin.me>
Date: Thu, 16 Mar 2017 14:13:03 +0100
Subject: [PATCH] =?UTF-8?q?Le=20backup=20se=20passe=20mal,=20suite=20?=
 =?UTF-8?q?=C3=A0=20la=20cr=C3=A9ation=20=C3=A9trange?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/backup  | 7 +++++--
 scripts/install | 8 +-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/scripts/backup b/scripts/backup
index 13d9e32..0ca3670 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -11,6 +11,7 @@ source /usr/share/yunohost/helpers
 
 # Retrieve app settings
 domain=$(ynh_app_setting_get "$app" domain)
+with_mysql=$(ynh_app_setting_get "$app" with_mysql)
 
 # Copy the app files
 final_path="/var/www/${app}"
@@ -23,5 +24,7 @@ ynh_backup "/etc/php5/fpm/pool.d/${app}.conf" "php-fpm.conf"
 ynh_backup "/etc/php5/fpm/conf.d/20-${app}.ini" "php-fpm.ini"
 
 # Backup db
-root_pwd=$(sudo cat /etc/yunohost/mysql)
-sudo su -c "mysqldump -u root -p$root_pwd --no-create-db $app > ./db.sql"
\ No newline at end of file
+if [[ $with_mysql -eq 1 ]]; then
+	root_pwd=$(sudo cat /etc/yunohost/mysql)
+	sudo su -c "mysqldump -u root -p$root_pwd --no-create-db $app > ./db.sql"
+fi
\ No newline at end of file
diff --git a/scripts/install b/scripts/install
index 2128b5d..d8e29dd 100644
--- a/scripts/install
+++ b/scripts/install
@@ -66,13 +66,7 @@ ynh_app_setting_set $app email $email
 # CREATE A SQL BDD
 #=================================================
 
-db_name=$app
-db_user=$app
-db_pwd=$(ynh_string_random)
-ynh_mysql_create_db "$db_name" "$db_user" "$db_pwd"
-ynh_app_setting_set "$app" db_name "$db_name"
-ynh_app_setting_set "$app" db_pwd "$db_pwd"
-ynh_app_setting_set "$app" db_user "$db_user"
+GENERATE_DB $app	# Create a database and a dedicated user in the app name
 
 #=================================================
 # NGINX CONFIGURATION