From ab207f2dd83b8cec48048ffd1ed8dbb11715fab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 12 Jan 2024 23:24:31 +0100 Subject: [PATCH] remove mysql --- conf/htconfig.sample.php | 2 +- manifest.toml | 17 +---------------- scripts/backup | 11 ++--------- scripts/install | 29 +---------------------------- scripts/remove | 12 ------------ scripts/restore | 14 ++------------ 6 files changed, 7 insertions(+), 78 deletions(-) diff --git a/conf/htconfig.sample.php b/conf/htconfig.sample.php index bcbf4551..ee13b529 100644 --- a/conf/htconfig.sample.php +++ b/conf/htconfig.sample.php @@ -17,7 +17,7 @@ $db_port = 0; // leave 0 for default or set your port $db_user = '__DB_USER__'; $db_pass = '__DB_PWD__'; $db_data = '__DB_NAME__'; -$db_type = __DB_TYPE__; // use 1 for postgres, 0 for mysql +$db_type = 1; // use 1 for postgres, 0 for mysql /* * Notice: Many of the following settings will be available in the admin panel diff --git a/manifest.toml b/manifest.toml index c7150752..50652b31 100644 --- a/manifest.toml +++ b/manifest.toml @@ -38,13 +38,6 @@ ram.runtime = "50M" [install.admin] type = "user" - [install.database] - ask.en = "Choose Hubzilla database" - ask.fr = "Choisissez la database de Hubzilla" - type = "select" - choices = ["mysql", "postgresql"] - default = "mysql" - [resources] [resources.sources] [resources.sources.main] @@ -63,12 +56,4 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php8.2-curl, php8.2-gd, php8.2-mysql, php8.2-pgsql, php8.2-mbstring, php8.2-xml, php8.2-zip, php8.2-cli, php8.2-imagick, php8.2-gmp" - - packages_from_raw_bash = """ - if [[ "$database" == "mysql" ]]; then - echo "mariadb-server" - elif [[ "$database" == "postgresql" ]]; then - echo "postgresql postgresql-contrib" - fi - """ + packages = "pgloader, postgresql, postgresql-contrib, php8.2-curl, php8.2-gd, php8.2-mysql, php8.2-pgsql, php8.2-mbstring, php8.2-xml, php8.2-zip, php8.2-cli, php8.2-imagick, php8.2-gmp" diff --git a/scripts/backup b/scripts/backup index 7b28f279..447cb34a 100644 --- a/scripts/backup +++ b/scripts/backup @@ -57,16 +57,9 @@ ynh_backup --src_path="/etc/cron.d/$app" #================================================= # BACKUP THE DATABASE #================================================= +ynh_print_info --message="Backup of the PostgreSQL database..." -if [ $database = "mysql" ]; then - # Backup MySQL database - ynh_print_info --message="Backup of the MySQL database..." - ynh_mysql_dump_db --database="$db_name" > db.sql -elif [ $database = "postgresql" ]; then - # Backup PostgreSQL database - ynh_print_info --message="Backup of the PostgreSQL database..." - ynh_psql_dump_db --database="$db_name" > db.sql -fi +ynh_psql_dump_db --database="$db_name" > db.sql #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index 6c1beb70..11ccdb59 100755 --- a/scripts/install +++ b/scripts/install @@ -33,29 +33,6 @@ ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage -#================================================= -# CREATE A DATABASE -#================================================= -ynh_script_progression --message="Creating a database..." --weight=2 - -db_name=$(ynh_sanitize_dbid --db_name=$app) -db_user=$db_name -db_pwd=$(ynh_string_random --length=30) -ynh_app_setting_set --app=$app --key=db_name --value=$db_name -ynh_app_setting_set --app=$app --key=db_user --value=$db_user -ynh_app_setting_set --app=$app --key=db_pwd --value=$db_pwd - -if [ $database == "mysql" ]; then - ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name - ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \ - <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;" - db_type=0 -elif [ $database == "postgresql" ]; then - ynh_psql_test_if_first_run - ynh_psql_setup_db --db_user=$db_user --db_name=$db_name - db_type=1 -fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -101,11 +78,7 @@ chmod 644 "/etc/cron.d/$app" #================================================= ynh_script_progression --message="Provisionning database..." --weight=1 -if [ $database = "mysql" ]; then - ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $install_dir/install/schema_mysql.sql -elif [ $database = "postgresql" ]; then - ynh_psql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $install_dir/install/schema_postgres.sql -fi +ynh_psql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $install_dir/install/schema_postgres.sql #================================================= # ADD A CONFIGURATION diff --git a/scripts/remove b/scripts/remove index 0a5ec9eb..e7cbbaea 100755 --- a/scripts/remove +++ b/scripts/remove @@ -9,18 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# REMOVE THE DATABASE -#================================================= - -if [ $database = "mysql" ]; then - ynh_script_progression --message="Removing MySQL database..." --weight=1 - ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name -elif [ $database = "postgresql" ]; then - ynh_script_progression --message="Removing PostgreSQL database..." --weight=1 - ynh_psql_remove_db --db_user=$db_user --db_name=$db_name -fi - #================================================= # REMOVE SYSTEM CONFIGURATIONS #================================================= diff --git a/scripts/restore b/scripts/restore index 7f1bab2e..4792c42d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -22,19 +22,9 @@ chown -R $app:www-data "$install_dir" #================================================= # RESTORE THE DATABASE #================================================= +ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=1 -if [ $database = "mysql" ]; then - ynh_script_progression --message="Restoring MySQL database..." --weight=1 - 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 -elif [ $database = "postgresql" ]; then - ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=1 - db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) - ynh_psql_test_if_first_run - ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd - ynh_psql_execute_file_as_root --file="./db.sql" --database="$db_name" -fi +ynh_psql_execute_file_as_root --file="./db.sql" --database="$db_name" #================================================= # RESTORE SYSTEM CONFIGURATIONS