From 9ab4030a1e3e9253df59233480cccd4545388727 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 6 Apr 2022 08:51:01 +0200 Subject: [PATCH] Fix --- scripts/backup | 28 ++++++++++++++-------------- scripts/install | 3 ++- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/scripts/backup b/scripts/backup index 524c6ccb..901a7c91 100644 --- a/scripts/backup +++ b/scripts/backup @@ -56,20 +56,6 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# BACKUP OF THE DATABASE -#================================================= - -if [ $database -eq 1 ]; then - # Backup MySQL database - ynh_print_info --message="Backup of the MySQL database..." - ynh_mysql_dump_db --database="$db_name" > db.sql -elif [ $database -eq 2 ]; then - # Backup PostgreSQL database - ynh_print_info --message="Backup of the PostgreSQL database..." - ynh_psql_dump_db --database="$db_name" > db.sql -fi - #================================================= # SPECIFIC BACKUP #================================================= @@ -91,6 +77,20 @@ ynh_backup --src_path="/etc/cron.d/$app" ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf" ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" +#================================================= +# BACKUP OF THE DATABASE +#================================================= + +if [ $database -eq 1 ]; then + # Backup MySQL database + ynh_print_info --message="Backup of the MySQL database..." + ynh_mysql_dump_db --database="$db_name" > db.sql +elif [ $database -eq 2 ]; then + # Backup PostgreSQL database + ynh_print_info --message="Backup of the PostgreSQL database..." + ynh_psql_dump_db --database="$db_name" > db.sql +fi + #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/install b/scripts/install index 699e0a09..9877ff64 100755 --- a/scripts/install +++ b/scripts/install @@ -31,6 +31,7 @@ email=$(ynh_user_get_info --username=$admin --key=mail) upload="256M" random_string="$(ynh_string_random)$(ynh_string_random)$(ynh_string_random)" database=`expr $YNH_APP_ARG_DATABASE` +phpversion=$YNH_PHP_VERSION app=$YNH_APP_INSTANCE_NAME @@ -163,7 +164,7 @@ if [ $database -eq 1 ]; then elif [ $database -eq 2 ]; then # Create postgresql database ynh_script_progression --message="Creating a PostgreSQL database..." - ynh_replace_string --match_string="db_type = 0;" --replace_string="db_type = 1;" --target_file="$config" + ynh_replace_string --match_string="db_type = 0;" --replace_string="db_type = 1;" --target_file="$final_path/.htconfig.php" db_name=$(ynh_sanitize_dbid --db_name=$app) db_user=$db_name ynh_psql_test_if_first_run