From 6faa633b1e14b4be36648ba936f26f1daa702e6d Mon Sep 17 00:00:00 2001 From: Selamanse Date: Fri, 19 Oct 2018 23:00:58 +0200 Subject: [PATCH 1/3] Add new version 0.70.4 --- scripts/_common.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 200ea0f..2416f4c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,8 +1,8 @@ # common.sh -ROCKETCHAT_VERSION=0.65.1 -ROCKETCHAT_SHASUM=6484c19ad922520e8ca45b2d09eff3be33f227dd74f737b67c437fb3e6c6fc4b -NODE_VERSION=8.11.1 +ROCKETCHAT_VERSION=0.70.4 +ROCKETCHAT_SHASUM=62be1d3be0c12f37c69b24c7b898030a43550afcb9d4fac24c8f301b939b7dc1 +NODE_VERSION=8.11.3 DEBIAN_ISSUE=$(grep 9 /etc/debian_version >/dev/null && echo stretch || echo jessie) checkcmd() { From c13da5e9e0e5ef40ea1ef9627c58c35a6a24c5f2 Mon Sep 17 00:00:00 2001 From: Selamanse Date: Sat, 20 Oct 2018 00:35:40 +0200 Subject: [PATCH 2/3] Use ynh helpers --- scripts/backup | 6 +----- scripts/restore | 13 +++++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/scripts/backup b/scripts/backup index 952fe0e..1980e58 100644 --- a/scripts/backup +++ b/scripts/backup @@ -23,11 +23,7 @@ domain=$(ynh_app_setting_get $app domain) # BACKUP THE APP MAIN DIR #================================================= -workdir=$(pwd) -cd $final_path -tar -czf $workdir/rocket.chat.gtar . -cd $workdir -ynh_backup ./rocket.chat.gtar +ynh_backup "$final_path" #================================================= # BACKUP THE CONFIGURATION diff --git a/scripts/restore b/scripts/restore index b3abc2e..4ac6360 100644 --- a/scripts/restore +++ b/scripts/restore @@ -53,24 +53,25 @@ id -u $serviceuser || sudo useradd -d "$final_path" -M $serviceuser #================================================= # STANDARD RESTORATION STEPS #================================================= -# RESTORE THE NGINX CONFIGURATION + +ynh_restore + +#================================================= +# RELOAD THE NGINX CONFIGURATION #================================================= -sudo cp -a "conf/nginx" "/etc/nginx/conf.d/$domain.d/$app.conf" sudo systemctl reload nginx #================================================= -# RESTORE THE SYSTEMD CONFIGURATION +# RELOAD AND ENABLE THE SYSTEMD CONFIGURATION #================================================= -sudo cp -a "conf/service" "/etc/systemd/system/rocketchat.service" sudo systemctl daemon-reload sudo systemctl enable rocketchat #================================================= -# RESTORE THE APP MAIN DIR +# RESTORE PERMISSIONS IN THE APP MAIN DIR #================================================= -sudo tar -xzf ./rocket.chat.gtar -C $final_path sudo chown -R $serviceuser: $final_path #================================================= From 50a3efd186cb0caf6f47ac4288966a37d02b5ad5 Mon Sep 17 00:00:00 2001 From: Selamanse Date: Sat, 20 Oct 2018 00:44:47 +0200 Subject: [PATCH 3/3] Revert version change here --- scripts/_common.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 2416f4c..200ea0f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,8 +1,8 @@ # common.sh -ROCKETCHAT_VERSION=0.70.4 -ROCKETCHAT_SHASUM=62be1d3be0c12f37c69b24c7b898030a43550afcb9d4fac24c8f301b939b7dc1 -NODE_VERSION=8.11.3 +ROCKETCHAT_VERSION=0.65.1 +ROCKETCHAT_SHASUM=6484c19ad922520e8ca45b2d09eff3be33f227dd74f737b67c437fb3e6c6fc4b +NODE_VERSION=8.11.1 DEBIAN_ISSUE=$(grep 9 /etc/debian_version >/dev/null && echo stretch || echo jessie) checkcmd() {