diff --git a/manifest.json b/manifest.json index 45ca80e..2425c3c 100644 --- a/manifest.json +++ b/manifest.json @@ -44,19 +44,6 @@ "name": "is_public", "type": "boolean", "default": true - }, - { - "name": "with_mysql", - "type": "boolean", - "help": { - "en": "SQLite database is used by default. Choose MySQL if you have a large number of active users.", - "fr": "SQLite est utilisée par défaut. Choisissez MySQL si vous avez un grand nombre d'utilisateurs actifs." - }, - "ask": { - "en": "Do you need a MySQL database?", - "fr": "Avez-vous besoin d'une base de données MySQL ?" - }, - "default": false } ] } diff --git a/scripts/install b/scripts/install index affc132..80318b8 100755 --- a/scripts/install +++ b/scripts/install @@ -28,7 +28,6 @@ domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC timezone="$(date +%:::z)" -with_mysql=$YNH_APP_ARG_WITH_MYSQL phpversion=$YNH_PHP_VERSION app=$YNH_APP_INSTANCE_NAME @@ -71,16 +70,12 @@ ynh_system_user_create --username=$app --home_dir="$final_path" #================================================= # CREATE A MYSQL DATABASE #================================================= +ynh_script_progression --message="Creating a MySQL database..." --weight=2 -if [ $with_mysql -eq 1 ] -then - ynh_script_progression --message="Creating a MySQL database..." --weight=2 - - db_name=$(ynh_sanitize_dbid --db_name=$app) - db_user=$db_name - ynh_app_setting_set --app=$app --key=db_name --value=$db_name - ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name -fi +db_name=$(ynh_sanitize_dbid --db_name=$app) +db_user=$db_name +ynh_app_setting_set --app=$app --key=db_name --value=$db_name +ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE diff --git a/scripts/remove b/scripts/remove index 153b21b..8ed1600 100755 --- a/scripts/remove +++ b/scripts/remove @@ -18,7 +18,6 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -with_mysql=$(ynh_app_setting_get --app=$app --key=with_mysql) #================================================= # REMOVE LOGROTATE CONFIGURATION @@ -31,13 +30,10 @@ ynh_remove_logrotate #================================================= # REMOVE THE MYSQL DATABASE #================================================= +ynh_script_progression --message="Removing the MySQL database..." --weight=2 -if [ $with_mysql -eq 1 ]; then - ynh_script_progression --message="Removing the MySQL database..." --weight=2 - - # Remove a database if it exists, along with the associated user - ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name -fi +# Remove a database if it exists, along with the associated user +ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name #================================================= # REMOVE APP MAIN DIR diff --git a/scripts/restore b/scripts/restore index 4a7cb1f..5bdf657 100755 --- a/scripts/restore +++ b/scripts/restore @@ -32,7 +32,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) -with_mysql=$(ynh_app_setting_get --app=$app --key=with_mysql) fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) @@ -86,14 +85,11 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE MYSQL DATABASE #================================================= +ynh_script_progression --message="Restoring the MySQL database..." --weight=2 -if [ $with_mysql -eq 1 ]; then - ynh_script_progression --message="Restoring the MySQL database..." --weight=2 - - db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) - ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd - ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql -fi +db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd) +ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd +ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 2c18783..09eb758 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,7 +20,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -with_mysql=$(ynh_app_setting_get --app=$app --key=with_mysql) fpm_footprint=$(ynh_app_setting_get --app=$app --key=fpm_footprint) fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage)