From 6d14fd59d747bd53ebfcffa71603e3394999a24b Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 31 Jan 2019 19:40:58 +0100 Subject: [PATCH 1/4] Adding Testing and Unstable build --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 65030f9..fbed5b2 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,8 @@ Can the app be used by multiple users? * x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/REPLACEBYYOURAPP%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/REPLACEBYYOURAPP/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/REPLACEBYYOURAPP%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/REPLACEBYYOURAPP/) * Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/REPLACEBYYOURAPP%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/REPLACEBYYOURAPP/) +* Testing x86-64b - [![Build Status](https://ci-apps-unstable.yunohost.org/ci/logs/REPLACEBYYOURAPP%20%28Community%29%20%28testing%29.svg)](https://ci-apps-unstable.yunohost.org/ci/apps/REPLACEBYYOURAPP/) +* Unstable x86-64b - [![Build Status](https://ci-apps-unstable.yunohost.org/ci/logs/REPLACEBYYOURAPP%20%28Community%29%20%28unstable%29.svg)](https://ci-apps-unstable.yunohost.org/ci/apps/REPLACEBYYOURAPP/) ## Limitations From 29d27f85f9044c25a38eb0bd0f65175295f9f76e Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 7 Feb 2019 17:14:54 +0100 Subject: [PATCH 2/4] Reorder MYSQL DATABASE REMOVE before DEPENDENCIES REMOVE if using other DATABASE system --- scripts/remove | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/remove b/scripts/remove index b011da3..ad8d970 100755 --- a/scripts/remove +++ b/scripts/remove @@ -42,18 +42,18 @@ fi ynh_remove_systemd_config #================================================= -# REMOVE DEPENDENCIES +# REMOVE THE MYSQL DATABASE #================================================= -# Remove metapackage and its dependencies -ynh_remove_app_dependencies +# Remove a database if it exists, along with the associated user +ynh_mysql_remove_db $db_user $db_name #================================================= -# REMOVE THE MYSQL DATABASE +# REMOVE DEPENDENCIES #================================================= -# Remove a database if it exists, along with the associated user -ynh_mysql_remove_db $db_user $db_name +# Remove metapackage and its dependencies +ynh_remove_app_dependencies #================================================= # REMOVE APP MAIN DIR From 2589f39dcf64c23cdf12fe387e237aa9e63d8ef2 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 7 Feb 2019 17:17:26 +0100 Subject: [PATCH 3/4] RESTORE DATABASE after REINSTALL DEPENDENCIES --- scripts/restore | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/restore b/scripts/restore index d629496..b450304 100755 --- a/scripts/restore +++ b/scripts/restore @@ -54,14 +54,6 @@ ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf" ynh_restore_file "$final_path" -#================================================= -# RESTORE THE MYSQL DATABASE -#================================================= - -db_pwd=$(ynh_app_setting_get $app mysqlpwd) -ynh_mysql_setup_db $db_name $db_name $db_pwd -ynh_mysql_connect_as $db_name $db_pwd $db_name < ./db.sql - #================================================= # RECREATE THE DEDICATED USER #================================================= @@ -91,6 +83,14 @@ ynh_restore_file "/etc/php5/fpm/pool.d/$app.conf" # Define and install dependencies ynh_install_app_dependencies deb1 deb2 +#================================================= +# RESTORE THE MYSQL DATABASE +#================================================= + +db_pwd=$(ynh_app_setting_get $app mysqlpwd) +ynh_mysql_setup_db $db_name $db_name $db_pwd +ynh_mysql_connect_as $db_name $db_pwd $db_name < ./db.sql + #================================================= # RESTORE SYSTEMD #================================================= From c42723e646d070143fd3e28c3be3e9a6671b763a Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 7 Feb 2019 17:19:12 +0100 Subject: [PATCH 4/4] Remove testing and unstable links --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index fbed5b2..65030f9 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,6 @@ Can the app be used by multiple users? * x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/REPLACEBYYOURAPP%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/REPLACEBYYOURAPP/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/REPLACEBYYOURAPP%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/REPLACEBYYOURAPP/) * Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/REPLACEBYYOURAPP%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/REPLACEBYYOURAPP/) -* Testing x86-64b - [![Build Status](https://ci-apps-unstable.yunohost.org/ci/logs/REPLACEBYYOURAPP%20%28Community%29%20%28testing%29.svg)](https://ci-apps-unstable.yunohost.org/ci/apps/REPLACEBYYOURAPP/) -* Unstable x86-64b - [![Build Status](https://ci-apps-unstable.yunohost.org/ci/logs/REPLACEBYYOURAPP%20%28Community%29%20%28unstable%29.svg)](https://ci-apps-unstable.yunohost.org/ci/apps/REPLACEBYYOURAPP/) ## Limitations