diff --git a/conf/rocketchat.service b/conf/rocketchat.service index 9ab6361..7afc22b 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" diff --git a/scripts/_common.sh b/scripts/_common.sh index 6df11d4..2416f4c 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,9 +1,9 @@ # common.sh -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) +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() { curl -m 1 -s localhost:$port$path/api/v1/info | \ @@ -32,11 +32,18 @@ waitforservice() { } installnode(){ - - sudo apt-get install -y nodejs - # Meteor needs at least this version of node to work. - sudo npm install -g n - sudo n $NODE_VERSION + 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 + echo "node version is now: " + node --version } installdeps(){ 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 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