From ac9237cd9d371c34d3986c377957abd192712681 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
Date: Thu, 12 Apr 2018 23:21:43 +0200
Subject: [PATCH] Prevent weird bug with user/password in URL + fix upgrade

---
 scripts/install |  2 +-
 scripts/upgrade | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index a996ec4..a79637b 100755
--- a/scripts/install
+++ b/scripts/install
@@ -135,7 +135,7 @@ fi
 if [ "$is_public" -eq 1 ]
 then
 	# unprotected_uris allows SSO credentials to be passed anyway.
-	ynh_app_setting_set "$app" unprotected_uris "/"
+	ynh_app_setting_set "$app" skipped_uris "/"
 fi
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index bb2fe65..bf63203 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -84,6 +84,9 @@ path_url=$(ynh_normalize_url_path "$path_url")
 
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source "$final_path"
+mv --force "$final_path"/galette/* "$final_path"/
+ynh_secure_remove "$final_path"/tests
+chown -R root:root "$final_path"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -155,7 +158,7 @@ fi
 if [ $is_public -eq 1 ]
 then
 	# unprotected_uris allows SSO credentials to be passed anyway
-	ynh_app_setting_set "$app" unprotected_uris "/"
+	ynh_app_setting_set "$app" skipped_uris "/"
 fi
 
 #=================================================
@@ -168,6 +171,14 @@ message="Galette need you to finish the update manually.
 
 Please open "$domain/$path_url" and finish the upgrade process.
 
+You may need database information:
+Type: mysql
+Host: localhost
+Port: 3306
+User: "$db_name"
+Password: "$db_pwd"
+Name: "$db_name"
+
 \`chmod -R 500 "$final_path/config"\`
 \`rm -rf "$final_path/install"\`