From f9fac0f4e0fc79023975771e2b8b4982a98518b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 8 May 2024 20:31:55 +0200
Subject: [PATCH] fix

---
 scripts/install |  7 ++++++-
 scripts/upgrade | 21 ++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/scripts/install b/scripts/install
index 8523085..b868502 100755
--- a/scripts/install
+++ b/scripts/install
@@ -66,11 +66,16 @@ ynh_install_composer --install_args="--ignore-platform-reqs"
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/hm3.sample.ini" --destination="$install_dir/hm3.ini"
+ynh_add_config --template="hm3.sample.ini" --destination="$install_dir/hm3.ini"
 
 chmod 400 "$install_dir/hm3.ini"
 chown $app:$app "$install_dir/hm3.ini"
 
+ynh_add_config --template="ldap.php" --destination="$install_dir/conf/ldap.php"
+
+chmod 400 "$install_dir/conf/ldap.php"
+chown $app:$app "$install_dir/conf/ldap.php"
+
 #=================================================
 # ADD AN ADMIN USER
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 7f9f261..4a13119 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -15,12 +15,6 @@ source /usr/share/yunohost/helpers
 
 timezone=$(cat /etc/timezone)
 
-#=================================================
-# CHECK VERSION
-#=================================================
-
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -49,14 +43,10 @@ fi
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=4
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-	ynh_script_progression --message="Upgrading source files..." --weight=4
-
-	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir" --keep="hm3.ini"
-fi
+# Download, check integrity, uncompress and patch the source from app.src
+ynh_setup_source --dest_dir="$install_dir" --keep="hm3.ini"
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
@@ -84,6 +74,11 @@ ynh_add_nginx_config
 #chmod 400 "$install_dir/hm3.ini"
 #chown $app:$app "$install_dir/hm3.ini"
 
+ynh_add_config --template="ldap.php" --destination="$install_dir/conf/ldap.php"
+
+chmod 400 "$install_dir/conf/ldap.php"
+chown $app:$app "$install_dir/conf/ldap.php"
+
 #=================================================
 # END OF SCRIPT
 #=================================================