From 402b2ed721743dc47c440f5e1dafff01cba5c288 Mon Sep 17 00:00:00 2001 From: Yalh Date: Wed, 30 Jan 2019 01:41:05 +0100 Subject: [PATCH] Reorder database removal --- conf/config.sample.yml | 2 +- scripts/remove | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conf/config.sample.yml b/conf/config.sample.yml index c5a85c1..98972d6 100644 --- a/conf/config.sample.yml +++ b/conf/config.sample.yml @@ -30,7 +30,7 @@ bindIP: 0.0.0.0 db: type: mysql # PostgreSQL / MySQL / MariaDB / MS SQL Server only: - host: postgres + host: localhost port: 5432 user: __DB_NAME__ pass: __DB_PWD__ diff --git a/scripts/remove b/scripts/remove index bb78a1b..cf5ae3c 100644 --- a/scripts/remove +++ b/scripts/remove @@ -41,6 +41,13 @@ fi # Remove the dedicated systemd config #ynh_remove_systemd_config +#================================================= +# REMOVE THE POSTGRESQL DATABASE +#================================================= + +# Remove a database if it exists, along with the associated user +ynh_psql_remove_db "$db_name" "$db_name" + #================================================= # REMOVE DEPENDENCIES #================================================= @@ -50,13 +57,6 @@ ynh_remove_app_dependencies ynh_use_nodejs ynh_remove_nodejs -#================================================= -# REMOVE THE POSTGRESQL DATABASE -#================================================= - -# Remove a database if it exists, along with the associated user -ynh_psql_remove_db "$db_name" "$db_name" - #================================================= # REMOVE APP MAIN DIR #=================================================