implement mysql

check_process

@@ -4,6 +4,7 @@
 		path="/path"
 		is_public=1
 		password="strong-password"
+		database="pgsql"
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1

conf/config.inc.php.mysql

@@ -0,0 +1,25 @@
+<?php
+/*
+This is an example for your configuration file,
+read comments and replace the "blanks".
+You can then copy the file in GALETTE_CONFIG_PATH/config.inc.php
+
+$Id$
+*/
+
+/* choose your database engine, values : pgsql|mysql */
+define("TYPE_DB", "mysql"); 
+/* hostname for the database */
+define("HOST_DB", "localhost"); 
+/* tcp port for the database */
+define("PORT_DB", "3306"); 
+/* the username for the database */
+define("USER_DB", "__DB_NAME__");
+/* password for the username define above */
+define("PWD_DB", "__DB_PWD__");
+/* the database name */
+define("NAME_DB", "__DB_NAME__");
+/* tables name prefix (default is galette_) */
+define("PREFIX_DB", "galette_");
+/* FIXME will disappear soon */
+define("STOCK_FILES", "tempimages");

manifest.json

@@ -48,6 +48,15 @@
                     "fr": "Si cette case est cochée, Galette sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
             },
                 "default": true
+            },
+            {
+                "name": "database",
+                "type": "string",
+                "ask": {
+                    "en": "Choose SQL databe you want"
+                },
+                "choices": ["pgsql", "mysql"],
+                "default": "pgsql"
             }
         ]
     }

scripts/_common.sh

@@ -7,7 +7,9 @@
 # dependencies used by the app
 YNH_PHP_VERSION="7.3"
 
-pkg_dependencies="postgresql php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl"
+pkg_dependencies="php${YNH_PHP_VERSION}-tidy php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-curl"
+
+pgsql_pkg_dependencies="postgresql php${YNH_PHP_VERSION}-pgsql"
 
 #=================================================
 # EXPERIMENTAL HELPERS

scripts/backup

@@ -26,6 +26,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+database=$(ynh_app_setting_get --app=$app --key=database)
 
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
@@ -50,13 +51,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 THE POSTGRESQL DATABASE
-#=================================================
-ynh_print_info --message="Backing up the PostgreSQL database..."
-
-ynh_psql_dump_db --database="$db_name" > db.sql
-
 #=================================================
 # SPECIFIC BACKUP
 #=================================================
@@ -65,6 +59,18 @@ ynh_psql_dump_db --database="$db_name" > db.sql
 
 ynh_backup --src_path="/etc/logrotate.d/$app"
 
+#=================================================
+# BACKUP THE POSTGRESQL DATABASE
+#=================================================
+ynh_print_info --message="Backing up the PostgreSQL database..."
+
+if [ $database == "pgsql" ]
+then
+	ynh_psql_dump_db --database="$db_name" > db.sql
+else
+	ynh_mysql_dump_db --database="$db_name" > db.sql
+fi
+
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/install

@@ -23,6 +23,7 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
+database=$YNH_APP_ARG_DATABASE
 timezone="$(cat /etc/timezone)"
 
 app=$YNH_APP_INSTANCE_NAME
@@ -45,24 +46,20 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
 
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
+ynh_app_setting_set --app=$app --key=database --value=$database
 
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
 ynh_script_progression --message="Installing dependencies..." --weight=20
 
+if [ $database == "pgsql" ]
+then
+	pkg_dependencies="$pkg_dependencies pgsql_pkg_dependencies"
+fi
+
 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
-#=================================================
-# CREATE A POSTGRESQL DATABASE
-#=================================================
-ynh_script_progression --message="Creating a PostgreSQL database..." --weight=2
-
-db_name=$(ynh_sanitize_dbid --db_name=$app)
-ynh_app_setting_set --app=$app --key=db_name --value=$db_name
-ynh_psql_test_if_first_run
-ynh_psql_setup_db --db_user=$db_name --db_name=$db_name
-
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
@@ -71,6 +68,22 @@ ynh_script_progression --message="Configuring system user..." --weight=1
 # Create a system user
 ynh_system_user_create --username=$app --home_dir="$final_path"
 
+#=================================================
+# CREATE A POSTGRESQL DATABASE
+#=================================================
+ynh_script_progression --message="Creating a PostgreSQL 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
+if [ $database == "pgsql" ]
+then
+	ynh_psql_test_if_first_run
+	ynh_psql_setup_db --db_user=$db_user --db_name=$db_name
+else
+	ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name
+fi
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -105,7 +118,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 ynh_script_progression --message="Configuring Galette..." --weight=1
 
-ynh_add_config --template="../conf/config.inc.php.dist" --destination="$final_path/galette/config/config.inc.php"
+ynh_add_config --template="../conf/config.inc.php.$database" --destination="$final_path/galette/config/config.inc.php"
 
 #=================================================
 # GENERIC FINALIZATION

scripts/remove

@@ -21,14 +21,22 @@ port=$(ynh_app_setting_get --app=$app --key=port)
 db_name=$(ynh_app_setting_get --app=$app --key=db_name)
 db_user=$db_name
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+database=$(ynh_app_setting_get --app=$app --key=database)
 
+#=================================================
+# STANDARD REMOVE
 #=================================================
 # REMOVE THE POSTGRESQL DATABASE
 #=================================================
 ynh_script_progression --message="Removing the PostgreSQL database..." --weight=2
 
 # Remove a database if it exists, along with the associated user
-ynh_psql_remove_db --db_user=$db_user --db_name=$db_name
+if [ $database == "pgsql" ]
+then
+	ynh_psql_remove_db --db_user=$db_user --db_name=$db_name
+else
+	ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
+fi
 
 #=================================================
 # REMOVE DEPENDENCIES

scripts/restore

@@ -29,8 +29,8 @@ 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)
 db_user=$db_name
-db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+database=$(ynh_app_setting_get --app=$app --key=database)
 timezone="$(cat /etc/timezone)"
 
 #=================================================
@@ -90,9 +90,17 @@ ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 #=================================================
 ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=6
 
-ynh_psql_test_if_first_run
+if [ $database == "pgsql" ]
-ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd
+then
-ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name
+	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
+else
+	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
 
 #=================================================
 # RESTORE USER RIGHTS

scripts/upgrade

@@ -21,8 +21,8 @@ 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)
 db_user=$db_name
-db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+database=$(ynh_app_setting_get --app=$app --key=database)
 timezone="$(cat /etc/timezone)"
 
 #=================================================