From acb8124b7d0003e7939307b4afdb758fb1705f1e Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Mon, 18 Mar 2019 20:31:45 +0100
Subject: [PATCH] Upgrade to 1.2.0

---
 README.md          | 2 +-
 conf/app.src       | 4 ++--
 manifest.json      | 2 +-
 scripts/_common.sh | 2 +-
 scripts/install    | 7 ++++---
 scripts/restore    | 2 +-
 scripts/upgrade    | 9 +++------
 7 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index b57ca08..4d9a355 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ A distributed pastebin. i.e. it is a service where anyone can post things on the
 
 A networked place to store posted web documents. This is meant to allow for distributed social commentary and reaction around these documents using best practices recommended or noted by the W3C Social Web Working Group.
 
-**Shipped version:** 1.0
+**Shipped version:** 1.2.0
 
 ## Screenshots
 
diff --git a/conf/app.src b/conf/app.src
index e4dd89f..5334061 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=url of app's source
-SOURCE_SUM=sha256 checksum
+SOURCE_URL=https://github.com/gobengo/distbin/archive/v1.2.0.tar.gz
+SOURCE_SUM=ae72d386e9c68afa4d6b08f0a9c9b441a04176001beb226b903f924076e5cfcb
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index ec088fa..e2d1084 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Distributed pastebin with ActivityPub.",
         "fr": "Pastebin distribué utilisant le protocole ActivityPub."
     },
-    "version": "1.0~ynh6",
+    "version": "1.2.0~ynh1",
     "url": "https://example.com",
     "license": "Apache-2.0",
     "maintainer": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 035ba43..979013d 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -5,7 +5,7 @@
 #=================================================
 
 # dependencies used by the app
-pkg_dependencies="ca-certificates"
+pkg_dependencies="ca-certificates curl sudo"
 
 #=================================================
 # PERSONAL HELPERS
diff --git a/scripts/install b/scripts/install
index bf1b486..93763f3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -102,7 +102,7 @@ ynh_print_info "Installing dependencies ..."
 ###		- And the section "UPGRADE DEPENDENCIES" in the upgrade script
 
 ynh_install_app_dependencies $pkg_dependencies
-ynh_install_nodejs 8
+ynh_install_nodejs 10
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -115,8 +115,7 @@ ynh_print_info "Setting up source files ..."
 
 ynh_app_setting_set $app final_path $final_path
 # Download, check integrity, uncompress and patch the source from app.src
-#ynh_setup_source "$final_path"
-git clone https://github.com/gobengo/distbin "$final_path"
+ynh_setup_source "$final_path"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -150,6 +149,8 @@ chown -R "$app":"$app" "/var/log/$app"
 #=================================================
 
 mkdir -p "$final_path/distbin-db"
+mkdir -p "$final_path/distbin-db/activities"
+mkdir -p "$final_path/distbin-db/inbox"
 
 #=================================================
 # MAKE SETUP
diff --git a/scripts/restore b/scripts/restore
index e3e21d9..4196bee 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -90,7 +90,7 @@ ynh_print_info "Reinstalling dependencies..."
 
 # Define and install dependencies
 ynh_install_app_dependencies $pkg_dependencies
-ynh_install_nodejs 8
+ynh_install_nodejs 10
 
 #=================================================
 # RESTORE SYSTEMD
diff --git a/scripts/upgrade b/scripts/upgrade
index b5a2756..1ad8b02 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -82,11 +82,7 @@ ynh_systemd_action --action=stop --service_name=$app
 ynh_print_info "Upgrading source files..."
 
 # Download, check integrity, uncompress and patch the source from app.src#
-#ynh_setup_source "$final_path"
-
-git clone --quiet https://github.com/gobengo/distbin "$final_path/upgrade"
-cp -a "$final_path/upgrade/." "$final_path/."
-rm -r "$final_path/upgrade"
+ynh_setup_source "$final_path"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -102,7 +98,8 @@ ynh_add_nginx_config
 ynh_print_info "Upgrading dependencies..."
 
 ynh_install_app_dependencies $pkg_dependencies
-ynh_install_nodejs 8
+ynh_remove_nodejs
+ynh_install_nodejs 10
 
 #=================================================
 # CREATE DEDICATED USER