From ca206093941edff6210c41c7c5ab00cce2d69ee9 Mon Sep 17 00:00:00 2001 From: Selamanse Date: Wed, 3 Oct 2018 21:37:26 +0200 Subject: [PATCH 1/9] Revert "Address sporadically failing compress" This reverts commit da4f6c8ff7244b6812b85225fba809a8f636d49d. --- scripts/backup | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/backup b/scripts/backup index ef0f093..952fe0e 100644 --- a/scripts/backup +++ b/scripts/backup @@ -25,11 +25,9 @@ domain=$(ynh_app_setting_get $app domain) workdir=$(pwd) cd $final_path -backupfile="rocket.chat.gtar" -touch $backupfile -tar --exclude=$backupfile -czvf $workdir/$backupfile . +tar -czf $workdir/rocket.chat.gtar . cd $workdir -ynh_backup ./$backupfile +ynh_backup ./rocket.chat.gtar #================================================= # BACKUP THE CONFIGURATION From fea24621ce83e8a964986d1be23552ba8ee3c2e8 Mon Sep 17 00:00:00 2001 From: Selamanse Date: Wed, 3 Oct 2018 21:44:14 +0200 Subject: [PATCH 2/9] Add switch for npm installation --- scripts/_common.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 6df11d4..1c73acf 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -33,7 +33,11 @@ waitforservice() { installnode(){ - sudo apt-get install -y nodejs + if [ $DEBIAN_ISSUE == "stretch"]; then + sudo apt-get install -y nodejs + else + sudo apt-get install -y npm + fi # Meteor needs at least this version of node to work. sudo npm install -g n sudo n $NODE_VERSION From f0cae33c9abeeca5af2988382a633894b7182ca6 Mon Sep 17 00:00:00 2001 From: Selamanse Date: Fri, 5 Oct 2018 21:53:49 +0200 Subject: [PATCH 3/9] Fix autodetection --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1c73acf..4f9278c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,7 +3,7 @@ ROCKETCHAT_VERSION=0.65.1 ROCKETCHAT_SHASUM=6484c19ad922520e8ca45b2d09eff3be33f227dd74f737b67c437fb3e6c6fc4b NODE_VERSION=8.9.4 -DEBIAN_ISSUE=$(grep 8 /etc/issue >/dev/null && echo jessie || echo stretch) +DEBIAN_ISSUE=$(grep 9 /etc/debian_version >/dev/null && echo stretch || echo jessie) checkcmd() { curl -m 1 -s localhost:$port$path/api/v1/info | \ From 4f38dd09e486bdeb0555f8da733f2fd411bc1df2 Mon Sep 17 00:00:00 2001 From: Selamanse Date: Tue, 9 Oct 2018 13:00:58 +0200 Subject: [PATCH 4/9] Fix spacing --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 4f9278c..2f7b168 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -33,7 +33,7 @@ waitforservice() { installnode(){ - if [ $DEBIAN_ISSUE == "stretch"]; then + if [ $DEBIAN_ISSUE == "stretch"]; then sudo apt-get install -y nodejs else sudo apt-get install -y npm From 9ee6ac9e532ac7eb66a800d78644016763cf277f Mon Sep 17 00:00:00 2001 From: Selamanse Date: Tue, 9 Oct 2018 13:03:49 +0200 Subject: [PATCH 5/9] Fix spacing --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 2f7b168..13e708c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -33,7 +33,7 @@ waitforservice() { installnode(){ - if [ $DEBIAN_ISSUE == "stretch"]; then + if [ $DEBIAN_ISSUE == "stretch" ]; then sudo apt-get install -y nodejs else sudo apt-get install -y npm From acf655f373c5d3c79562d28dd6973706bd54301f Mon Sep 17 00:00:00 2001 From: Selamanse Date: Fri, 19 Oct 2018 21:07:59 +0200 Subject: [PATCH 6/9] Add ppa way of installing node --- scripts/_common.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 13e708c..200ea0f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -2,7 +2,7 @@ ROCKETCHAT_VERSION=0.65.1 ROCKETCHAT_SHASUM=6484c19ad922520e8ca45b2d09eff3be33f227dd74f737b67c437fb3e6c6fc4b -NODE_VERSION=8.9.4 +NODE_VERSION=8.11.1 DEBIAN_ISSUE=$(grep 9 /etc/debian_version >/dev/null && echo stretch || echo jessie) checkcmd() { @@ -32,15 +32,18 @@ waitforservice() { } installnode(){ - if [ $DEBIAN_ISSUE == "stretch" ]; then + sudo curl -sL https://deb.nodesource.com/setup_8.x -o nodesource_setup.sh + sudo bash nodesource_setup.sh sudo apt-get install -y nodejs else sudo apt-get install -y npm + # Meteor needs at least this version of node to work. + sudo npm install -g n + sudo n $NODE_VERSION fi - # Meteor needs at least this version of node to work. - sudo npm install -g n - sudo n $NODE_VERSION + echo "node version is now: " + node --version } installdeps(){ From 8ebb0f1bea2b199779854bf0e734e816a95afe4d Mon Sep 17 00:00:00 2001 From: Selamanse Date: Fri, 19 Oct 2018 21:37:01 +0200 Subject: [PATCH 7/9] Use node from path --- conf/rocketchat.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/rocketchat.service b/conf/rocketchat.service index 9ab6361..c1783b0 100644 --- a/conf/rocketchat.service +++ b/conf/rocketchat.service @@ -6,7 +6,7 @@ After=network.target Type=simple WorkingDirectory=#DESTDIR# User=#USER# -ExecStart=/usr/local/bin/node main.js +ExecStart=node main.js Restart=always SyslogIdentifier=rocketchat Environment="BIND_IP=127.0.0.1" From 0e1df25d936c508d2c9fd9743e908a3a4495a611 Mon Sep 17 00:00:00 2001 From: Selamanse Date: Fri, 19 Oct 2018 21:46:26 +0200 Subject: [PATCH 8/9] Add node bin absolute path recognition --- conf/rocketchat.service | 2 +- scripts/install | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/conf/rocketchat.service b/conf/rocketchat.service index c1783b0..7afc22b 100644 --- a/conf/rocketchat.service +++ b/conf/rocketchat.service @@ -6,7 +6,7 @@ After=network.target Type=simple WorkingDirectory=#DESTDIR# User=#USER# -ExecStart=node main.js +ExecStart=#NODE# main.js Restart=always SyslogIdentifier=rocketchat Environment="BIND_IP=127.0.0.1" diff --git a/scripts/install b/scripts/install index 420d5a7..c24bd10 100644 --- a/scripts/install +++ b/scripts/install @@ -84,6 +84,9 @@ sed -i "s@#PORT#@$port@g" ../conf/rocketchat.service sed -i "s@#USER#@$serviceuser@g" ../conf/rocketchat.service sed -i "s@#DESTDIR#@$final_path@g" ../conf/rocketchat.service sed -i "s@#DBNAME#@$dbname@g" ../conf/rocketchat.service +# absolute node path needed +NODE_BIN=$(which node) +sed -i "s@#NODE#@$NODE_BIN@g" ../conf/rocketchat.service sudo cp ../conf/rocketchat.service /etc/systemd/system/$app.service sudo systemctl daemon-reload From 6faa633b1e14b4be36648ba936f26f1daa702e6d Mon Sep 17 00:00:00 2001 From: Selamanse Date: Fri, 19 Oct 2018 23:00:58 +0200 Subject: [PATCH 9/9] 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() {