From 37313b8a221faeeb6af1a7e6cad9e55804b454eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 2 Nov 2023 21:37:28 +0100
Subject: [PATCH] cleaning

---
 conf/.env          | 2 +-
 scripts/_common.sh | 2 +-
 scripts/install    | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/conf/.env b/conf/.env
index bee4a08..7bbd612 100644
--- a/conf/.env
+++ b/conf/.env
@@ -25,7 +25,7 @@ DATABASE_URL=mysql://__DB_USER__:__DB_PWD__@127.0.0.1:3306/__DB_NAME__?charset=u
 # The full documentation can be found at https://www.kimai.org/documentation/emails.html
 #
 # Email will be sent with this address as sender:
-MAILER_FROM=admin@__DOMAIN__
+MAILER_FROM=__APP__@__DOMAIN__
 # Email connection (disabled by default) - see documentation for the format
 MAILER_URL="smtp://__APP__:__MAIL_PWD__@127.0.0.1:25?encryption=&auth_mode="
 
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 36f2a69..7caf6c5 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,7 +6,7 @@
 # PHP APP SPECIFIC
 #=================================================
 
-YNH_COMPOSER_VERSION=2.3.3
+YNH_COMPOSER_VERSION=2.6.5
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index ca01137..ba8ca09 100755
--- a/scripts/install
+++ b/scripts/install
@@ -20,7 +20,6 @@ random_key=$(ynh_string_random --length=32)
 #=================================================
 ynh_script_progression --message="Storing installation settings..." --weight=1
 
-ynh_app_setting_set --app=$app --key=registration --value=$registration
 ynh_app_setting_set --app=$app --key=random_key --value=$random_key
 
 #=================================================
@@ -75,13 +74,13 @@ else
 	registration="false"
 fi
 
-ynh_add_config --template="../conf/local.yaml" --destination="$install_dir/config/packages/local.yaml"
+ynh_add_config --template="local.yaml" --destination="$install_dir/config/packages/local.yaml"
 
 chmod 400 "$install_dir/config/packages/local.yaml"
 chown $app:$app "$install_dir/config/packages/local.yaml"
 
 # Configure environement
-ynh_add_config --template="../conf/.env" --destination="$install_dir/.env"
+ynh_add_config --template=".env" --destination="$install_dir/.env"
 
 chmod 400 "$install_dir/.env"
 chown $app:$app "$install_dir/.env"