From f909887640ec8aa42c5041f39a61c12374c5b93a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 25 Oct 2023 09:08:18 +0200 Subject: [PATCH 1/3] cleaning --- doc/POST_INSTALL.md | 3 ++- doc/POST_INSTALL_fr.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index 04f51ca..1daf6e6 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -1 +1,2 @@ -After post-installation configuration, go to `__DOMAIN__/cp-admin` to connect to the administration panel. \ No newline at end of file +To finish the installation: `__DOMAIN__/cp-install` +To connect to the administration panel: `__DOMAIN__/cp-admin` \ No newline at end of file diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md index 5468339..776e181 100644 --- a/doc/POST_INSTALL_fr.md +++ b/doc/POST_INSTALL_fr.md @@ -1 +1,2 @@ -Après la configuration post-installation, accédez à `__DOMAIN__/cp-admin` pour vous connecter au panneau d'administration. \ No newline at end of file +Pour finir l'installation: `__DOMAIN__/cp-install` +Pour vous connecter au panneau d'administration : `__DOMAIN__/cp-admin` From dfc4999f95d2c59fadc5a7c61dd52cfdaf4d3fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 25 Oct 2023 09:24:01 +0200 Subject: [PATCH 2/3] cleaning --- scripts/install | 4 ++-- scripts/upgrade | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index a5f7561..380c0e9 100755 --- a/scripts/install +++ b/scripts/install @@ -43,7 +43,7 @@ ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint # Create a dedicated NGINX config ynh_add_nginx_config -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" @@ -59,7 +59,7 @@ redis_db=$(ynh_redis_get_free_db) ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db" #redis_number=$(( $YNH_APP_INSTANCE_NUMBER - 1 )) -ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env" +ynh_add_config --template=".env.example" --destination="$install_dir/.env" chmod 600 $install_dir/.env chown $app:www-data "$install_dir/.env" diff --git a/scripts/upgrade b/scripts/upgrade index 59a95a5..4d567e5 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -46,10 +46,8 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then ynh_script_progression --message="Upgrading source files..." --weight=1 - ynh_secure_remove --file="$install_dir/app" - ynh_secure_remove --file="$install_dir/public/assets" # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep=".env" + ynh_setup_source --dest_dir="$install_dir" --keep=".env public/media" fi chmod -R o-rwx "$install_dir" @@ -68,7 +66,7 @@ ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint # Create a dedicated NGINX config ynh_add_nginx_config -ynh_add_config --template="../conf/cron" --destination="/etc/cron.d/$app" +ynh_add_config --template="cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" @@ -77,7 +75,7 @@ chmod 644 "/etc/cron.d/$app" #================================================= ynh_script_progression --message="Configuring $app..." --weight=1 -ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env" +ynh_add_config --template=".env.example" --destination="$install_dir/.env" chmod 600 $install_dir/.env chown $app:www-data "$install_dir/.env" From 409f84a94a588c2e17a6fa12ebbfec922af8fbdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 25 Oct 2023 09:38:21 +0200 Subject: [PATCH 3/3] Update .env.example --- conf/.env.example | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/.env.example b/conf/.env.example index 4e99c76..a05c182 100644 --- a/conf/.env.example +++ b/conf/.env.example @@ -36,6 +36,7 @@ email.SMTPHost="localhost" email.SMTPPort="25" email.SMTPUser="__APP__" email.SMTPPass="__MAIL_PWD__" +email.SMTPCrypto="tls" #-------------------------------------------------------------------- # Cache configuration (advanced)