From ef27b91d50944b61917552e631947d551ff3efe7 Mon Sep 17 00:00:00 2001
From: Gofannon <17145502+Gofannon@users.noreply.github.com>
Date: Sat, 5 May 2018 18:46:00 +0200
Subject: [PATCH] fix previous commit to pass package_check 'install'

---
 conf/nginx.conf | 2 +-
 scripts/install | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/conf/nginx.conf b/conf/nginx.conf
index eb4ee9e..baba3e6 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -37,7 +37,7 @@ location __PATH__ {
   # See https://forum.cheky.net/information-sur-message-avertissement-securite-t553-p1.html#p2127
   location /var {
     deny all;
-    return 403
+    #return 403 # Cannot pass 'install' with 'package_check' if this line is present
   }
 
   # Include SSOWAT user panel.
diff --git a/scripts/install b/scripts/install
index 4826fc4..47529dd 100644
--- a/scripts/install
+++ b/scripts/install
@@ -128,9 +128,11 @@ yunohost app ssowatconf
 # Reload Nginx
 systemctl reload nginx
 
-# Installation with curl
-ynh_local_curl "/index.php?mod=install "password=$password" "confirmPassword=$password" "type=db" "db[host]=localhost" "db[user]=$dbuser" "db[password]=$dbpass" "db[dbname]=$dbname"
+# Get database password
+db_pwd=$(ynh_app_setting_get $app mysqlpwd)
 
+# Installation with curl
+ynh_local_curl "/index.php?mod=install" "password=$password" "confirmPassword=$password" "type=db" "db[host]=localhost" "db[user]=$db_name" "db[password]=$db_pwd" "db[dbname]=$db_name"
 
 #=================================================
 # GENERIC FINALIZATION