diff --git a/scripts/install b/scripts/install index d32dc12..df52b9d 100644 --- a/scripts/install +++ b/scripts/install @@ -124,16 +124,11 @@ ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name #================================================= # CONFIGURE ROUNDCUBE #================================================= -ynh_script_progression --message="Configuring Roundcube..." +ynh_script_progression --message="Configuring Roundcube..." --weight=2 -rc_conf="$final_path/config/config.inc.php" - -cp ../conf/config.inc.php "$rc_conf" - -ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" -ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" -ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" -ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" +file="__FILE__" +deskey=$(ynh_string_random --length=24) +ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" #================================================= # INSTALL ADDITIONAL PLUGINS @@ -214,9 +209,6 @@ ynh_replace_string --match_string="^\s*// installed plugins" --replace_string="& (cd "$final_path" /usr/bin/php$phpversion -q ./bin/install-jsdeps.sh) -# Store the config file checksum into the app settings -ynh_store_file_checksum --file="$final_path/config/config.inc.php" - chmod 400 "$final_path/config/config.inc.php" chown $app:$app "$final_path/config/config.inc.php" diff --git a/scripts/upgrade b/scripts/upgrade index cd16af4..93a7935 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -152,19 +152,11 @@ ynh_add_fpm_config --package="$extra_php_dependencies" if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Reconfiguring Roundcube..." + ynh_script_progression --message="Reconfiguring Roundcube..." --weight=3 - rc_conf="$final_path/config/config.inc.php" - - # Verify the checksum and backup the file if it's different - ynh_backup_if_checksum_is_different "$rc_conf" - - cp ../conf/config.inc.php "$rc_conf" - - ynh_replace_string --match_string="__DESKEY__" --replace_string="$(ynh_string_random --length=24)" --target_file="$rc_conf" - ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$rc_conf" - ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$rc_conf" - ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$rc_conf" + file="__FILE__" + deskey=$(ynh_string_random --length=24) + ynh_add_config --template="../conf/config.inc.php" --destination="$final_path/config/config.inc.php" #================================================= # UPDATE DEPENDENCIES WITH COMPOSER @@ -262,9 +254,6 @@ then (cd "$final_path" /usr/bin/php$phpversion -q ./bin/install-jsdeps.sh) - # Store the config file checksum into the app settings - ynh_store_file_checksum --file="$final_path/config/config.inc.php" - chmod 400 "$final_path/config/config.inc.php" chown $app:$app "$final_path/config/config.inc.php"