From b77b1f73bab56586f8519b2b749f16c171d11d59 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 21 Apr 2022 00:14:47 +0200 Subject: [PATCH 1/2] Fix MySQL install --- check_process | 22 +++++++++++++++++++++- scripts/install | 8 ++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index 0bd8ae7..8fa2649 100644 --- a/check_process +++ b/check_process @@ -1,4 +1,4 @@ -;; Test complet +;; Test complet PostgreSQL ; Manifest domain="domain.tld" path="/path" @@ -21,6 +21,26 @@ multi_instance=1 port_already_use=0 change_url=1 +;; Test complet MySQL + ; Manifest + domain="domain.tld" + path="/path" + is_public=1 + admin="john" + password="1Strong-Password" + database="mysql" + ; Checks + pkg_linter=1 + setup_sub_dir=1 + setup_root=1 + setup_nourl=0 + setup_private=1 + setup_public=1 + upgrade=1 + backup_restore=1 + multi_instance=1 + port_already_use=0 + change_url=1 ;;; Options Email= Notification=none diff --git a/scripts/install b/scripts/install index 999f730..6240029 100644 --- a/scripts/install +++ b/scripts/install @@ -147,8 +147,12 @@ ynh_permission_update --permission="main" --add="visitors" # Installation with curl ynh_script_progression --message="Finalizing installation..." ynh_local_curl "/installer.php" "install_permsok=1" -ynh_local_curl "/installer.php" "install_type=i" -ynh_local_curl "/installer.php" "install_dbtype=pgsql" "install_dbhost=localhost" "install_dbport=5432" "install_dbuser=$db_user" "install_dbpass=$db_pwd" "install_dbname=$db_name" "install_dbprefix=galette_" +ynh_local_curl "/installer.php" "install_type=i"if [ $database == "pgsql" ] +then + ynh_local_curl "/installer.php" "install_dbtype=pgsql" "install_dbhost=localhost" "install_dbport=5432" "install_dbuser=$db_user" "install_dbpass=$db_pwd" "install_dbname=$db_name" "install_dbprefix=galette_" +else + ynh_local_curl "/installer.php" "install_dbtype=mysql" "install_dbhost=localhost" "install_dbport=3306" "install_dbuser=$db_user" "install_dbpass=$db_pwd" "install_dbname=$db_name" "install_dbprefix=galette_" +fi ynh_local_curl "/installer.php" "install_dbperms_ok=1" ynh_local_curl "/installer.php" "install_dbwrite_ok=1" ynh_local_curl "/installer.php" "install_adminlogin=$admin" "install_adminpass=$password" "install_adminpass_verif=$password" From 1b366464752681e30273dadc8b1428a386d782df Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 21 Apr 2022 21:31:44 +0200 Subject: [PATCH 2/2] Typo --- scripts/install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 6240029..9c37ecc 100644 --- a/scripts/install +++ b/scripts/install @@ -147,7 +147,8 @@ ynh_permission_update --permission="main" --add="visitors" # Installation with curl ynh_script_progression --message="Finalizing installation..." ynh_local_curl "/installer.php" "install_permsok=1" -ynh_local_curl "/installer.php" "install_type=i"if [ $database == "pgsql" ] +ynh_local_curl "/installer.php" "install_type=i" +if [ $database == "pgsql" ] then ynh_local_curl "/installer.php" "install_dbtype=pgsql" "install_dbhost=localhost" "install_dbport=5432" "install_dbuser=$db_user" "install_dbpass=$db_pwd" "install_dbname=$db_name" "install_dbprefix=galette_" else