From 570b8a27d2075b6d5263d3a0a262b6a2df5851f5 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Tue, 26 Feb 2019 19:37:32 +0100
Subject: [PATCH] Fix upgrade

---
 scripts/install |  3 ++-
 scripts/remove  |  3 ++-
 scripts/upgrade | 18 ++++++++++++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index 670195b..2a29de9 100644
--- a/scripts/install
+++ b/scripts/install
@@ -103,6 +103,7 @@ ynh_install_app_dependencies postgresql libstdc++6 redis-server rabbitmq-server
 #=================================================
 # INSTALL NODEJS
 #=================================================
+ynh_print_info "Installing nodejs..."
 
 curl -sL https://deb.nodesource.com/setup_8.x | sudo bash -
 
@@ -181,7 +182,7 @@ ynh_package_update
 #=================================================
 ynh_print_info "Install OnlyOffice..."
 
-ynh_install_app_dependencies postgresql libstdc++6 redis-server rabbitmq-server onlyoffice-documentserver
+ynh_package_install onlyoffice-documentserver
 
 #=================================================
 # MODIFY A CONFIG FILE
diff --git a/scripts/remove b/scripts/remove
index 4ae53fe..d479203 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -39,8 +39,9 @@ ynh_psql_remove_db $db_name $db_name
 ynh_print_info "Removing dependencies"
 
 # Remove metapackage and its dependencies
-ynh_remove_app_dependencies
+ynh_package_remove onlyoffice-documentserver
 ynh_package_remove nodejs
+ynh_remove_app_dependencies
 
 #=================================================
 # REMOVE APP MAIN DIR
diff --git a/scripts/upgrade b/scripts/upgrade
index 094104a..383d979 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -77,14 +77,28 @@ path_url=$(ynh_normalize_url_path $path_url)
 ynh_print_info "Upgrading nginx web server configuration..."
 
 # Create a dedicated nginx config
-ynh_add_nginx_config
+ynh_add_nginx_config "nextclouddomain"
 
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
 ynh_print_info "Upgrading dependencies..."
 
-ynh_install_app_dependencies deb1 deb2
+ynh_install_app_dependencies  postgresql libstdc++6 redis-server rabbitmq-server
+
+#=================================================
+# UPGRADE NODEJS
+#=================================================
+ynh_print_info "Upgrading nodejs..."
+
+curl -sL https://deb.nodesource.com/setup_8.x | sudo bash -
+
+#=================================================
+# UPGRADE ONLYOFFICE
+#=================================================
+ynh_print_info "Upgrading OnlyOffice..."
+
+ynh_package_install onlyoffice-documentserver
 
 #=================================================
 # CREATE DEDICATED USER