From 2283a823c283520c67388711f59da4091b54c747 Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Fri, 18 May 2018 17:43:04 +0200
Subject: [PATCH 01/23] Add doctl test files

---
 .travis.yml        | 38 ++++++++++++++++++++++++++++++++++----
 test/pkgchk-config |  8 ++++++++
 2 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 test/pkgchk-config

diff --git a/.travis.yml b/.travis.yml
index d9f1363..6a01f27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,37 @@
-language: node_js
+dist: trusty
+sudo: false
 
-before_install:
-  - git clone https://github.com/YunoHost/package_linter /tmp/package_linter
+language: python
+
+env:
+  global:
+    - secure: "hqvINLgdxfGqZju03GgBWzZ1pdJkoIzx78FULktXkYGUXYRDSMh/tONjtKDMKJvK9rFflkZNIrTZ5j2ueipd73iXl2pM0+jXl3Z64rBa+XK6Kq78p/qP4XdpFoMmOVvs6YIumXHmtxCfcT6EtvHrDkkoNF7oKpuISObKEMDONOLyuEcO6ZjexzmkUpioxjDTkvaE5+jcXflqPLp5JR9A7E75Tofct/y7i2lWOfR45FCY7DIpuE82Hkic41ZhHWuMguedw7L+cIow449ynZQpGSGjpsOciu9OtneJB7LZakVZsOYb3e34+i0TdjqiLYwQa46vqLW4TEK5MLXQI5FF2TF3pvJXiIrFr/gAhoP5YMrbSGHkOYZtAcYVUoMX38lQctUU9NzaELkayo9RqFodXboBs2hniqFbxHuhYYC9tPsZNyTTf/+OcZXS9Ic1iE4HR2Ok4xOg6QF8iOTXW6nPt2Ct0f5oWAdGlyjmxYFVGs3l44g9HV84RkeHYP/BS43C3blAd0SIjtab/4TSgFcmSfv+M/5yl3ZsidBc9yTMvgOvZXPIhOFJq+XLTL4QB0tN1Sdy1wofs7wnRFjbGrw4kOTBrcCkBioqMiMZzTtmeVejjMr61cSmLG7lzPoYCvc5vpS3xAca5XiOECb50oCwkxxoXDoqdEGLz3RQQfnJWRk="
+    - DROPLET_NAME="ynh26-pkgchk-${TRAVIS_BUILD_ID}"
+    - dropletsshcmd="./doctl compute ssh ${DROPLET_NAME} --ssh-command"
+    - DOCTL=./doctl
+
+install:
+  - ssh-keygen -b 2048 -t rsa -f ~/.ssh/id_rsa -q -N "" # to disable Warning: Identity file...not accessible
+  - echo "Host *" | tee -a ~/.ssh/config # to disable authenticity of host input y/n
+  - echo "   StrictHostKeyChecking=no" | tee -a ~/.ssh/config # to disable authenticity of host input y/n
+  - echo "   UserKnownHostsFile=/dev/null" | tee -a ~/.ssh/config # to disable authenticity of host input y/n
+  - curl -L https://github.com/digitalocean/doctl/releases/download/v1.8.0/doctl-1.8.0-linux-amd64.tar.gz  | tar xz
+  - echo "creating droplet with name ${DROPLET_NAME}"
+  - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute ssh-key create ${DROPLET_NAME} --no-header --public-key "$(cat ~/.ssh/id_rsa.pub)"
+  - sleep 2
+  - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute droplet create ${DROPLET_NAME} --region fra1 --image debian-8-x64 --size 8gb --ssh-keys $(${DOCTL} compute ssh-key list --no-header | grep ${DROPLET_NAME} | awk -F ' ' '{print $1}')
+
+after_script:
+  - ${DOCTL} compute droplet delete ${DROPLET_NAME} -f
+  - ${DOCTL} compute ssh-key delete $(${DOCTL} compute ssh-key list | grep ${DROPLET_NAME} | awk -F ' ' '{print $1}') -f
 
 script:
-  - /tmp/package_linter/package_linter.py ./
+  - sleep 60 #$doctl vm needs a few seconds to boot...60 proved to be safe.
+  - $dropletsshcmd "apt-get update -y"
+  - $dropletsshcmd "apt-get install git -y"
+  - $dropletsshcmd "git clone https://github.com/YunoHost/package_check"
+  - cat test/pkgchk-config | $dropletsshcmd "cat > package_check/config"
+  - $dropletsshcmd "git clone https://github.com/${TRAVIS_REPO_SLUG} package"
+  - $dropletsshcmd "cd package && git checkout ${TRAVIS_COMMIT} && cd .."
+  - $dropletsshcmd "./package_check/package_check.sh --build-lxc --bash-mode package"
+  - $dropletsshcmd "cat ./package_check/Complete.log"
diff --git a/test/pkgchk-config b/test/pkgchk-config
new file mode 100644
index 0000000..9de744d
--- /dev/null
+++ b/test/pkgchk-config
@@ -0,0 +1,8 @@
+iface=eth0
+dns=8.8.8.8
+dnsforce=1
+PLAGE_IP=10.1.4
+DOMAIN=domain.local
+YUNO_PWD=admin
+LXC_NAME=pchecker_lxc
+LXC_BRIDGE=lxc-pchecker

From 2f28aaf8a437f1ec8ffb85f9e9f9398f595d8bc6 Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Wed, 3 Oct 2018 21:07:27 +0200
Subject: [PATCH 02/23] Fix nodejs installation

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 007dc54..72b6803 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -33,7 +33,7 @@ waitforservice() {
 
 installnode(){
 
-  sudo apt-get install -y npm
+  curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash -
   # Meteor needs at least this version of node to work.
   sudo npm install -g n
   sudo n $NODE_VERSION

From f543bfacba2bd82ffccac903a0a24523efa212a5 Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Fri, 19 Oct 2018 23:54:47 +0200
Subject: [PATCH 03/23] Improve droplet create

---
 .travis.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6a01f27..8eec40f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,18 +15,17 @@ install:
   - echo "Host *" | tee -a ~/.ssh/config # to disable authenticity of host input y/n
   - echo "   StrictHostKeyChecking=no" | tee -a ~/.ssh/config # to disable authenticity of host input y/n
   - echo "   UserKnownHostsFile=/dev/null" | tee -a ~/.ssh/config # to disable authenticity of host input y/n
-  - curl -L https://github.com/digitalocean/doctl/releases/download/v1.8.0/doctl-1.8.0-linux-amd64.tar.gz  | tar xz
+  - curl -L https://github.com/digitalocean/doctl/releases/download/v1.11.0/doctl-1.11.0-linux-amd64.tar.gz  | tar xz
   - echo "creating droplet with name ${DROPLET_NAME}"
   - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute ssh-key create ${DROPLET_NAME} --no-header --public-key "$(cat ~/.ssh/id_rsa.pub)"
   - sleep 2
-  - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute droplet create ${DROPLET_NAME} --region fra1 --image debian-8-x64 --size 8gb --ssh-keys $(${DOCTL} compute ssh-key list --no-header | grep ${DROPLET_NAME} | awk -F ' ' '{print $1}')
+  - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute droplet create ${DROPLET_NAME} --wait --region fra1 --image debian-8-x64 --size 8gb --ssh-keys $(${DOCTL} compute ssh-key list --no-header | grep ${DROPLET_NAME} | awk -F ' ' '{print $1}')
 
 after_script:
   - ${DOCTL} compute droplet delete ${DROPLET_NAME} -f
   - ${DOCTL} compute ssh-key delete $(${DOCTL} compute ssh-key list | grep ${DROPLET_NAME} | awk -F ' ' '{print $1}') -f
 
 script:
-  - sleep 60 #$doctl vm needs a few seconds to boot...60 proved to be safe.
   - $dropletsshcmd "apt-get update -y"
   - $dropletsshcmd "apt-get install git -y"
   - $dropletsshcmd "git clone https://github.com/YunoHost/package_check"

From 2b85c068287a8869aaab38545abab2b5ca66f3eb Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Fri, 19 Oct 2018 23:58:25 +0200
Subject: [PATCH 04/23] Improve droplet create

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 8eec40f..40fcdb4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,7 @@ after_script:
   - ${DOCTL} compute ssh-key delete $(${DOCTL} compute ssh-key list | grep ${DROPLET_NAME} | awk -F ' ' '{print $1}') -f
 
 script:
+  - sleep 2
   - $dropletsshcmd "apt-get update -y"
   - $dropletsshcmd "apt-get install git -y"
   - $dropletsshcmd "git clone https://github.com/YunoHost/package_check"

From 866c124723086cc140562e40ea3438c8227fcbc7 Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Sat, 20 Oct 2018 00:03:43 +0200
Subject: [PATCH 05/23] Improve droplet create

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 40fcdb4..74dd570 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ after_script:
   - ${DOCTL} compute ssh-key delete $(${DOCTL} compute ssh-key list | grep ${DROPLET_NAME} | awk -F ' ' '{print $1}') -f
 
 script:
-  - sleep 2
+  - sleep 15
   - $dropletsshcmd "apt-get update -y"
   - $dropletsshcmd "apt-get install git -y"
   - $dropletsshcmd "git clone https://github.com/YunoHost/package_check"

From 64cda30752574f35f748b1b95c5bb8c99877fc7b Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Sat, 20 Oct 2018 00:11:22 +0200
Subject: [PATCH 06/23] Modify pkgchk config

---
 test/pkgchk-config | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/pkgchk-config b/test/pkgchk-config
index 9de744d..e86313b 100644
--- a/test/pkgchk-config
+++ b/test/pkgchk-config
@@ -1,7 +1,3 @@
-iface=eth0
-dns=8.8.8.8
-dnsforce=1
-PLAGE_IP=10.1.4
 DOMAIN=domain.local
 YUNO_PWD=admin
 LXC_NAME=pchecker_lxc

From 8a52fb81a8402f5198f222164f14c9c2d563dda8 Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Sat, 20 Oct 2018 00:19:07 +0200
Subject: [PATCH 07/23] Modify pkgchk config

---
 test/pkgchk-config | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 test/pkgchk-config

diff --git a/test/pkgchk-config b/test/pkgchk-config
deleted file mode 100644
index e86313b..0000000
--- a/test/pkgchk-config
+++ /dev/null
@@ -1,4 +0,0 @@
-DOMAIN=domain.local
-YUNO_PWD=admin
-LXC_NAME=pchecker_lxc
-LXC_BRIDGE=lxc-pchecker

From 29d29fe2f093e32be04a216b6a8fd1e6ca45d18a Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Tue, 23 Oct 2018 14:14:06 +0200
Subject: [PATCH 08/23] Add testconfig again

---
 test/pkgchk-config | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 test/pkgchk-config

diff --git a/test/pkgchk-config b/test/pkgchk-config
new file mode 100644
index 0000000..9de744d
--- /dev/null
+++ b/test/pkgchk-config
@@ -0,0 +1,8 @@
+iface=eth0
+dns=8.8.8.8
+dnsforce=1
+PLAGE_IP=10.1.4
+DOMAIN=domain.local
+YUNO_PWD=admin
+LXC_NAME=pchecker_lxc
+LXC_BRIDGE=lxc-pchecker

From 156a0263be02873ffd15c38e7d222036db553bc3 Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Sat, 2 Feb 2019 22:44:03 +0100
Subject: [PATCH 09/23] Use new helpers and restrict arch

---
 conf/app.src    |  7 +++++++
 scripts/install | 23 ++++++++++++++---------
 2 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 conf/app.src

diff --git a/conf/app.src b/conf/app.src
new file mode 100644
index 0000000..73df31e
--- /dev/null
+++ b/conf/app.src
@@ -0,0 +1,7 @@
+SOURCE_URL=${ROCKETCHAT_DOWNLOAD_URI}
+SOURCE_SUM=${ROCKETCHAT_SHASUM}
+SOURCE_SUM_PRG=sha256sum
+SOURCE_FORMAT=tar.gz
+SOURCE_IN_SUBDIR=true
+SOURCE_FILENAME=rocket.chat-${ROCKETCHAT_VERSION}.tgz
+SOURCE_EXTRACT=true
\ No newline at end of file
diff --git a/scripts/install b/scripts/install
index 11073e0..9296b23 100644
--- a/scripts/install
+++ b/scripts/install
@@ -30,6 +30,16 @@ app=$YNH_APP_INSTANCE_NAME
 dbname=$app
 serviceuser=rocketchat
 
+#=================================================
+# CHECK IF THE APP CAN BE INSTALLED
+#=================================================
+
+# Check for supported architecture
+arch="$(uname -m)"
+if [[ "$arch" != "x86_64" ]]; then
+    script_die "This app requires an x86_64 machine, but this one is '${arch}'."
+fi
+
 workdir=$(pwd)
 
 # find suitable port (default 3000)
@@ -102,16 +112,11 @@ sed -i "s@#DBNAME#@$dbname@g" ../conf/rocketchat_ldap.js
 
 sudo cp ../conf/nginx.conf "$nginx_conf"
 
-# download and extract rocketchat
-echo "Downloading rocket.chat-$ROCKETCHAT_VERSION.gtar from ${ROCKETCHAT_DOWNLOAD_URI}."
-sudo curl -s -L -o $final_path/rocket.chat-$ROCKETCHAT_VERSION.gtar "${ROCKETCHAT_DOWNLOAD_URI}"
-SHA_DOWNLOAD=$(sha256sum $final_path/rocket.chat-$ROCKETCHAT_VERSION.gtar | grep -o "^[a-f0-9]*")
-if [[ ! "$SHA_DOWNLOAD" == "$ROCKETCHAT_SHASUM" ]]; then
-  ynh_die "The sha256sum does not match the configured one"
-fi
+#=================================================
+# DOWNLOAD, CHECK AND UNPACK SOURCE
+#=================================================
 
-sudo tar -xzf $final_path/rocket.chat-$ROCKETCHAT_VERSION.gtar -C $final_path --strip-components=1 bundle
-sudo rm $final_path/rocket.chat-$ROCKETCHAT_VERSION.gtar
+ynh_setup_source "$final_path"
 
 sudo chown -R $serviceuser: $final_path
 

From 0a9d83e261558906ae9c5005caf4ae1469c37896 Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Sat, 2 Feb 2019 22:44:16 +0100
Subject: [PATCH 10/23] Upgrade test setup

---
 .travis.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 74dd570..03a1686 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ language: python
 env:
   global:
     - secure: "hqvINLgdxfGqZju03GgBWzZ1pdJkoIzx78FULktXkYGUXYRDSMh/tONjtKDMKJvK9rFflkZNIrTZ5j2ueipd73iXl2pM0+jXl3Z64rBa+XK6Kq78p/qP4XdpFoMmOVvs6YIumXHmtxCfcT6EtvHrDkkoNF7oKpuISObKEMDONOLyuEcO6ZjexzmkUpioxjDTkvaE5+jcXflqPLp5JR9A7E75Tofct/y7i2lWOfR45FCY7DIpuE82Hkic41ZhHWuMguedw7L+cIow449ynZQpGSGjpsOciu9OtneJB7LZakVZsOYb3e34+i0TdjqiLYwQa46vqLW4TEK5MLXQI5FF2TF3pvJXiIrFr/gAhoP5YMrbSGHkOYZtAcYVUoMX38lQctUU9NzaELkayo9RqFodXboBs2hniqFbxHuhYYC9tPsZNyTTf/+OcZXS9Ic1iE4HR2Ok4xOg6QF8iOTXW6nPt2Ct0f5oWAdGlyjmxYFVGs3l44g9HV84RkeHYP/BS43C3blAd0SIjtab/4TSgFcmSfv+M/5yl3ZsidBc9yTMvgOvZXPIhOFJq+XLTL4QB0tN1Sdy1wofs7wnRFjbGrw4kOTBrcCkBioqMiMZzTtmeVejjMr61cSmLG7lzPoYCvc5vpS3xAca5XiOECb50oCwkxxoXDoqdEGLz3RQQfnJWRk="
+    - DOCTL_CLI_URI="https://github.com/digitalocean/doctl/releases/download/v1.13.0/doctl-1.13.0-linux-amd64.tar.gz"
     - DROPLET_NAME="ynh26-pkgchk-${TRAVIS_BUILD_ID}"
     - dropletsshcmd="./doctl compute ssh ${DROPLET_NAME} --ssh-command"
     - DOCTL=./doctl
@@ -15,15 +16,11 @@ install:
   - echo "Host *" | tee -a ~/.ssh/config # to disable authenticity of host input y/n
   - echo "   StrictHostKeyChecking=no" | tee -a ~/.ssh/config # to disable authenticity of host input y/n
   - echo "   UserKnownHostsFile=/dev/null" | tee -a ~/.ssh/config # to disable authenticity of host input y/n
-  - curl -L https://github.com/digitalocean/doctl/releases/download/v1.11.0/doctl-1.11.0-linux-amd64.tar.gz  | tar xz
+  - curl -L ${DOCTL_CLI_URI} | tar xz
   - echo "creating droplet with name ${DROPLET_NAME}"
   - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute ssh-key create ${DROPLET_NAME} --no-header --public-key "$(cat ~/.ssh/id_rsa.pub)"
   - sleep 2
-  - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute droplet create ${DROPLET_NAME} --wait --region fra1 --image debian-8-x64 --size 8gb --ssh-keys $(${DOCTL} compute ssh-key list --no-header | grep ${DROPLET_NAME} | awk -F ' ' '{print $1}')
-
-after_script:
-  - ${DOCTL} compute droplet delete ${DROPLET_NAME} -f
-  - ${DOCTL} compute ssh-key delete $(${DOCTL} compute ssh-key list | grep ${DROPLET_NAME} | awk -F ' ' '{print $1}') -f
+  - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute droplet create ${DROPLET_NAME} --wait --region fra1 --image debian-9-x64 --size 4gb --ssh-keys $(${DOCTL} compute ssh-key list --no-header | grep ${DROPLET_NAME} | awk -F ' ' '{print $1}')
 
 script:
   - sleep 15
@@ -35,3 +32,7 @@ script:
   - $dropletsshcmd "cd package && git checkout ${TRAVIS_COMMIT} && cd .."
   - $dropletsshcmd "./package_check/package_check.sh --build-lxc --bash-mode package"
   - $dropletsshcmd "cat ./package_check/Complete.log"
+
+after_script:
+  - ${DOCTL} compute droplet delete ${DROPLET_NAME} -f
+  - ${DOCTL} compute ssh-key delete $(${DOCTL} compute ssh-key list | grep ${DROPLET_NAME} | awk -F ' ' '{print $1}') -f

From 16a83bfb632def1677fd1c46a2ea48926cddf393 Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Sat, 2 Feb 2019 23:17:37 +0100
Subject: [PATCH 11/23] Add selamanses key

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 03a1686..e8c8d9f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ install:
   - echo "creating droplet with name ${DROPLET_NAME}"
   - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute ssh-key create ${DROPLET_NAME} --no-header --public-key "$(cat ~/.ssh/id_rsa.pub)"
   - sleep 2
-  - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute droplet create ${DROPLET_NAME} --wait --region fra1 --image debian-9-x64 --size 4gb --ssh-keys $(${DOCTL} compute ssh-key list --no-header | grep ${DROPLET_NAME} | awk -F ' ' '{print $1}')
+  - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute droplet create ${DROPLET_NAME} --wait --region fra1 --image debian-9-x64 --size 4gb --ssh-keys $(${DOCTL} compute ssh-key list --no-header | grep ${DROPLET_NAME} | awk -F ' ' '{print $1}') $(${DOCTL} compute ssh-key list --no-header | grep selamanse | awk -F ' ' '{print $1}')
 
 script:
   - sleep 15

From d1b4ef41cdffd7f971a597c7d33ddadc3fa04f65 Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Sat, 2 Feb 2019 23:40:33 +0100
Subject: [PATCH 12/23] Add fingerprint as key id

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e8c8d9f..5c4cd77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ install:
   - echo "creating droplet with name ${DROPLET_NAME}"
   - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute ssh-key create ${DROPLET_NAME} --no-header --public-key "$(cat ~/.ssh/id_rsa.pub)"
   - sleep 2
-  - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute droplet create ${DROPLET_NAME} --wait --region fra1 --image debian-9-x64 --size 4gb --ssh-keys $(${DOCTL} compute ssh-key list --no-header | grep ${DROPLET_NAME} | awk -F ' ' '{print $1}') $(${DOCTL} compute ssh-key list --no-header | grep selamanse | awk -F ' ' '{print $1}')
+  - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute droplet create ${DROPLET_NAME} --wait --region fra1 --image debian-9-x64 --size 4gb --ssh-keys $(${DOCTL} compute ssh-key list --no-header | grep ${DROPLET_NAME} | awk -F ' ' '{print $3}'),$(${DOCTL} compute ssh-key list --no-header | grep selamanse | awk -F ' ' '{print $3}')
 
 script:
   - sleep 15

From 849431e65efd1a4b7bc712ed6f9804940133d5cf Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Sun, 3 Feb 2019 00:11:34 +0100
Subject: [PATCH 13/23] Use prebuilt image

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5c4cd77..febe217 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ install:
   - echo "creating droplet with name ${DROPLET_NAME}"
   - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute ssh-key create ${DROPLET_NAME} --no-header --public-key "$(cat ~/.ssh/id_rsa.pub)"
   - sleep 2
-  - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute droplet create ${DROPLET_NAME} --wait --region fra1 --image debian-9-x64 --size 4gb --ssh-keys $(${DOCTL} compute ssh-key list --no-header | grep ${DROPLET_NAME} | awk -F ' ' '{print $3}'),$(${DOCTL} compute ssh-key list --no-header | grep selamanse | awk -F ' ' '{print $3}')
+  - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute droplet create ${DROPLET_NAME} --wait --region fra1 --image 43180295 --size 4gb --ssh-keys $(${DOCTL} compute ssh-key list --no-header | grep ${DROPLET_NAME} | awk -F ' ' '{print $3}'),$(${DOCTL} compute ssh-key list --no-header | grep selamanse | awk -F ' ' '{print $3}')
 
 script:
   - sleep 15

From e8987757f4e4e4df20e9a46011ca0111be23ccea Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Sun, 3 Feb 2019 00:12:28 +0100
Subject: [PATCH 14/23] Remove variables in app.src

---
 conf/app.src | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 73df31e..5e807eb 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,7 +1,7 @@
-SOURCE_URL=${ROCKETCHAT_DOWNLOAD_URI}
-SOURCE_SUM=${ROCKETCHAT_SHASUM}
+SOURCE_URL=https://releases.rocket.chat/0.73.2/download
+SOURCE_SUM=3dc3eb11f383f7b72b0f23fedb305b6a566fa536a1e5087a4398255deeb864d8
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=rocket.chat-${ROCKETCHAT_VERSION}.tgz
+SOURCE_FILENAME=rocket.chat-0.73.2.tgz
 SOURCE_EXTRACT=true
\ No newline at end of file

From ad1a6fa1984fae0107fe10ee809d6d0d144d70fc Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Sun, 3 Feb 2019 00:20:36 +0100
Subject: [PATCH 15/23] Add cleanup cmds

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index febe217..0dbf80a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,8 @@ script:
   - sleep 15
   - $dropletsshcmd "apt-get update -y"
   - $dropletsshcmd "apt-get install git -y"
+  - $dropletsshcmd "rm -rf package_check"
+  - $dropletsshcmd "rm -rf package"
   - $dropletsshcmd "git clone https://github.com/YunoHost/package_check"
   - cat test/pkgchk-config | $dropletsshcmd "cat > package_check/config"
   - $dropletsshcmd "git clone https://github.com/${TRAVIS_REPO_SLUG} package"

From d4e2a2c7734a4561baaeb3391edcaaff92e66cc2 Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Sun, 3 Feb 2019 00:35:37 +0100
Subject: [PATCH 16/23] Fix upgrade

---
 scripts/upgrade | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 38e5ed1..a46fe1b 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -18,13 +18,12 @@ serviceuser=$(ynh_app_setting_get $app serviceuser)
 path=$(ynh_app_setting_get $app path)
 port=$(ynh_app_setting_get $app port)
 
-# download and extract rocketchat
-echo "Downloading rocket.chat-$ROCKETCHAT_VERSION.gtar from ${ROCKETCHAT_DOWNLOAD_URI}."
-sudo curl -s -L -o $final_path/rocket.chat-$ROCKETCHAT_VERSION.gtar "${ROCKETCHAT_DOWNLOAD_URI}"
-SHA_DOWNLOAD=$(sha256sum $final_path/rocket.chat-$ROCKETCHAT_VERSION.gtar | grep -o "^[a-f0-9]*")
-if [[ ! "$SHA_DOWNLOAD" == "$ROCKETCHAT_SHASUM" ]]; then
-  ynh_die "The sha256sum does not match the configured one"
-fi
+#=================================================
+# BACKUP THE APPLICATION
+#=================================================
+
+# Backup the current version of the app
+ynh_backup_before_upgrade > >(tee "upgrade.log")
 
 sudo systemctl stop rocketchat
 
@@ -34,8 +33,7 @@ sudo mkdir -p $final_path
 # update to latest required node setup
 installnode
 
-sudo tar -xzf $final_path/rocket.chat-$ROCKETCHAT_VERSION.gtar -C $final_path --strip-components=1 bundle
-sudo rm $final_path/rocket.chat-$ROCKETCHAT_VERSION.gtar
+ynh_setup_source "$final_path"
 
 sudo chown -R $serviceuser: $final_path
 

From df3e75d5f405d057ace74cdf77fd827dbaf0872a Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Sun, 3 Feb 2019 00:40:13 +0100
Subject: [PATCH 17/23] Remove apt-key warning

---
 scripts/_common.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index eddb1d4..dda5052 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -62,7 +62,8 @@ installdeps(){
     sudo yunohost service add mongodb -l /var/log/mongodb/mongodb.log
   else
     #Install mongodb for debian x86/x64
-    sudo apt-get install dirmngr && sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4
+    sudo apt-get install dirmngr
+    APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4
     echo "deb http://repo.mongodb.org/apt/debian ${DEBIAN_ISSUE}/mongodb-org/4.0 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.0.list
     sudo apt-get update
     sudo apt-get install -y mongodb-org

From 8b95bcb73456d6680c88cb0071bd7f26665b242b Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Sun, 3 Feb 2019 00:54:09 +0100
Subject: [PATCH 18/23] Revert travis

---
 .travis.yml        | 41 ++++-------------------------------------
 test/pkgchk-config |  8 --------
 2 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 test/pkgchk-config

diff --git a/.travis.yml b/.travis.yml
index 0dbf80a..d9f1363 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,40 +1,7 @@
-dist: trusty
-sudo: false
+language: node_js
 
-language: python
-
-env:
-  global:
-    - secure: "hqvINLgdxfGqZju03GgBWzZ1pdJkoIzx78FULktXkYGUXYRDSMh/tONjtKDMKJvK9rFflkZNIrTZ5j2ueipd73iXl2pM0+jXl3Z64rBa+XK6Kq78p/qP4XdpFoMmOVvs6YIumXHmtxCfcT6EtvHrDkkoNF7oKpuISObKEMDONOLyuEcO6ZjexzmkUpioxjDTkvaE5+jcXflqPLp5JR9A7E75Tofct/y7i2lWOfR45FCY7DIpuE82Hkic41ZhHWuMguedw7L+cIow449ynZQpGSGjpsOciu9OtneJB7LZakVZsOYb3e34+i0TdjqiLYwQa46vqLW4TEK5MLXQI5FF2TF3pvJXiIrFr/gAhoP5YMrbSGHkOYZtAcYVUoMX38lQctUU9NzaELkayo9RqFodXboBs2hniqFbxHuhYYC9tPsZNyTTf/+OcZXS9Ic1iE4HR2Ok4xOg6QF8iOTXW6nPt2Ct0f5oWAdGlyjmxYFVGs3l44g9HV84RkeHYP/BS43C3blAd0SIjtab/4TSgFcmSfv+M/5yl3ZsidBc9yTMvgOvZXPIhOFJq+XLTL4QB0tN1Sdy1wofs7wnRFjbGrw4kOTBrcCkBioqMiMZzTtmeVejjMr61cSmLG7lzPoYCvc5vpS3xAca5XiOECb50oCwkxxoXDoqdEGLz3RQQfnJWRk="
-    - DOCTL_CLI_URI="https://github.com/digitalocean/doctl/releases/download/v1.13.0/doctl-1.13.0-linux-amd64.tar.gz"
-    - DROPLET_NAME="ynh26-pkgchk-${TRAVIS_BUILD_ID}"
-    - dropletsshcmd="./doctl compute ssh ${DROPLET_NAME} --ssh-command"
-    - DOCTL=./doctl
-
-install:
-  - ssh-keygen -b 2048 -t rsa -f ~/.ssh/id_rsa -q -N "" # to disable Warning: Identity file...not accessible
-  - echo "Host *" | tee -a ~/.ssh/config # to disable authenticity of host input y/n
-  - echo "   StrictHostKeyChecking=no" | tee -a ~/.ssh/config # to disable authenticity of host input y/n
-  - echo "   UserKnownHostsFile=/dev/null" | tee -a ~/.ssh/config # to disable authenticity of host input y/n
-  - curl -L ${DOCTL_CLI_URI} | tar xz
-  - echo "creating droplet with name ${DROPLET_NAME}"
-  - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute ssh-key create ${DROPLET_NAME} --no-header --public-key "$(cat ~/.ssh/id_rsa.pub)"
-  - sleep 2
-  - DROPLET_NAME=${DROPLET_NAME} ${DOCTL} compute droplet create ${DROPLET_NAME} --wait --region fra1 --image 43180295 --size 4gb --ssh-keys $(${DOCTL} compute ssh-key list --no-header | grep ${DROPLET_NAME} | awk -F ' ' '{print $3}'),$(${DOCTL} compute ssh-key list --no-header | grep selamanse | awk -F ' ' '{print $3}')
+before_install:
+  - git clone https://github.com/YunoHost/package_linter /tmp/package_linter
 
 script:
-  - sleep 15
-  - $dropletsshcmd "apt-get update -y"
-  - $dropletsshcmd "apt-get install git -y"
-  - $dropletsshcmd "rm -rf package_check"
-  - $dropletsshcmd "rm -rf package"
-  - $dropletsshcmd "git clone https://github.com/YunoHost/package_check"
-  - cat test/pkgchk-config | $dropletsshcmd "cat > package_check/config"
-  - $dropletsshcmd "git clone https://github.com/${TRAVIS_REPO_SLUG} package"
-  - $dropletsshcmd "cd package && git checkout ${TRAVIS_COMMIT} && cd .."
-  - $dropletsshcmd "./package_check/package_check.sh --build-lxc --bash-mode package"
-  - $dropletsshcmd "cat ./package_check/Complete.log"
-
-after_script:
-  - ${DOCTL} compute droplet delete ${DROPLET_NAME} -f
-  - ${DOCTL} compute ssh-key delete $(${DOCTL} compute ssh-key list | grep ${DROPLET_NAME} | awk -F ' ' '{print $1}') -f
+  - /tmp/package_linter/package_linter.py ./
diff --git a/test/pkgchk-config b/test/pkgchk-config
deleted file mode 100644
index 9de744d..0000000
--- a/test/pkgchk-config
+++ /dev/null
@@ -1,8 +0,0 @@
-iface=eth0
-dns=8.8.8.8
-dnsforce=1
-PLAGE_IP=10.1.4
-DOMAIN=domain.local
-YUNO_PWD=admin
-LXC_NAME=pchecker_lxc
-LXC_BRIDGE=lxc-pchecker

From 28a2bf66a3e116c9a030aa1efb793e917dc7ebbd Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@users.noreply.github.com>
Date: Sun, 3 Feb 2019 11:14:23 +0100
Subject: [PATCH 19/23] Revert apt-key setting and restore modifications (#70)

---
 scripts/_common.sh |  3 +--
 scripts/restore    | 10 ++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index dda5052..eddb1d4 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -62,8 +62,7 @@ installdeps(){
     sudo yunohost service add mongodb -l /var/log/mongodb/mongodb.log
   else
     #Install mongodb for debian x86/x64
-    sudo apt-get install dirmngr
-    APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4
+    sudo apt-get install dirmngr && sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4
     echo "deb http://repo.mongodb.org/apt/debian ${DEBIAN_ISSUE}/mongodb-org/4.0 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.0.list
     sudo apt-get update
     sudo apt-get install -y mongodb-org
diff --git a/scripts/restore b/scripts/restore
index 683657e..4ac6360 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -1,14 +1,16 @@
 #!/bin/bash
 set -eu
 
-#=================================================
-# GENERIC START
 #=================================================
 # IMPORT GENERIC HELPERS
 #=================================================
-
-source ./_common.sh
+if [ ! -e _common.sh ]; then
+	# Fetch helpers file if not in current directory
+	sudo cp ../settings/scripts/_common.sh ./_common.sh
+	sudo chmod a+rx _common.sh
+fi
 source /usr/share/yunohost/helpers
+source _common.sh
 
 #=================================================
 # GENERIC START

From 6bb0d1166c2ea9cafaf29ecaef0832b220f71999 Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Sun, 10 Feb 2019 21:21:55 +0100
Subject: [PATCH 20/23] Fix linter issues

---
 manifest.json   |  2 ++
 scripts/backup  |  2 +-
 scripts/install | 52 ++++++++++++++++++++++++-------------------------
 scripts/remove  | 18 ++++++++---------
 scripts/restore | 20 +++++++++----------
 scripts/upgrade | 14 ++++++-------
 6 files changed, 55 insertions(+), 53 deletions(-)

diff --git a/manifest.json b/manifest.json
index 28c25ae..047e4ac 100644
--- a/manifest.json
+++ b/manifest.json
@@ -41,6 +41,7 @@
             },
             {
                 "name": "is_public",
+                "type": "boolean",
                 "ask": {
                     "en": "Is it a public application?"
                 },
@@ -49,6 +50,7 @@
             },
             {
                "name": "lang",
+               "type": "string",
                 "ask": {
                     "en": "Select default language"
                 },
diff --git a/scripts/backup b/scripts/backup
index 1980e58..f5a45d0 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -36,4 +36,4 @@ ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" "conf/nginx"
 # BACKUP THE MONGODB DATABASE
 #=================================================
 
-sudo mongodump -o "./dump"
+mongodump -o "./dump"
diff --git a/scripts/install b/scripts/install
index 9296b23..29ec72d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -82,35 +82,35 @@ ynh_app_setting_set $app is_public $is_public
 installdeps
 
 # Create destination
-sudo mkdir -p $final_path
+mkdir -p $final_path
 
 # Create user
-id -u $serviceuser || sudo useradd -d "$final_path" -M $serviceuser
+id -u $serviceuser || useradd -d "$final_path" -M $serviceuser
 
 # Copy and set systemd configuration
-sed -i "s@#ROOTURL#@$domain@g" ../conf/rocketchat.service
-sed -i "s@#LOCATION#@${path:-/}@g" ../conf/rocketchat.service
-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
+ynh_replace_string "s@#ROOTURL#@$domain@g" ../conf/rocketchat.service
+ynh_replace_string "s@#LOCATION#@${path:-/}@g" ../conf/rocketchat.service
+ynh_replace_string "s@#PORT#@$port@g" ../conf/rocketchat.service
+ynh_replace_string "s@#USER#@$serviceuser@g" ../conf/rocketchat.service
+ynh_replace_string "s@#DESTDIR#@$final_path@g" ../conf/rocketchat.service
+ynh_replace_string "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
+ynh_replace_string "s@#NODE#@$NODE_BIN@g" ../conf/rocketchat.service
+cp ../conf/rocketchat.service /etc/systemd/system/$app.service
+systemctl daemon-reload
 
 # Copy and set nginx configuration
 nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf"
-sed -i "s@#APP#@$app@g"          ../conf/nginx.conf
-sed -i "s@#PATH#@$path@g"        ../conf/nginx.conf
-sed -i "s@#PORT#@$port@g"        ../conf/nginx.conf
-sed -i "s@#LOCATION#@${path:-/}@g" ../conf/nginx.conf
+ynh_replace_string "s@#APP#@$app@g"          ../conf/nginx.conf
+ynh_replace_string "s@#PATH#@$path@g"        ../conf/nginx.conf
+ynh_replace_string "s@#PORT#@$port@g"        ../conf/nginx.conf
+ynh_replace_string "s@#LOCATION#@${path:-/}@g" ../conf/nginx.conf
 
 #set db name into ldap config
-sed -i "s@#DBNAME#@$dbname@g" ../conf/rocketchat_ldap.js
+ynh_replace_string "s@#DBNAME#@$dbname@g" ../conf/rocketchat_ldap.js
 
-sudo cp ../conf/nginx.conf "$nginx_conf"
+cp ../conf/nginx.conf "$nginx_conf"
 
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
@@ -118,33 +118,33 @@ sudo cp ../conf/nginx.conf "$nginx_conf"
 
 ynh_setup_source "$final_path"
 
-sudo chown -R $serviceuser: $final_path
+chown -R $serviceuser: $final_path
 
 cd $final_path/programs/server/
 
-sudo -u $serviceuser npm install --production
+-u $serviceuser npm install --production
 
 cd $workdir
 
-sudo systemctl reload nginx
+systemctl reload nginx
 if [ "$is_public" = "Yes" ];
 then
 	ynh_app_setting_set "$app" skipped_uris "/"
 fi
 
-sudo systemctl start $app.service
-sudo systemctl enable $app.service
+systemctl start $app.service
+systemctl enable $app.service
 
 # add rocketchat to services
-sudo yunohost service add $app
+yunohost service add $app
 
 # wait for rocketchat to populate db and start
 waitforservice
 
-sudo mongo < ../conf/rocketchat_ldap.js
+mongo < ../conf/rocketchat_ldap.js
 
-sudo systemctl restart $app.service
+systemctl restart $app.service
 
 waitforservice
 
-sudo yunohost app ssowatconf
+yunohost app ssowatconf
diff --git a/scripts/remove b/scripts/remove
index 88e1f51..9e77aa1 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -14,18 +14,18 @@ app=$YNH_APP_INSTANCE_NAME
 domain=$(ynh_app_setting_get $app domain)
 final_path=$(ynh_app_setting_get $app final_path)
 
-sudo systemctl stop $app.service
+systemctl stop $app.service
 
 # remove Rocketchat from services
-sudo yunohost service remove $app
+yunohost service remove $app
 
-sudo rm -rf $final_path
-sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf
-sudo rm -rf /var/log/$app
-sudo rm -f /etc/systemd/system/$app.service
+ynh_secure_remove $final_path
+ynh_secure_remove /etc/nginx/conf.d/$domain.d/$app.conf
+ynh_secure_remove /var/log/$app
+ynh_secure_remove /etc/systemd/system/$app.service
 
 # remove database!!!
-sudo mongo rocketchat --eval "db.dropDatabase()"
+mongo rocketchat --eval "db.dropDatabase()"
 
-sudo systemctl daemon-reload
-sudo systemctl reload nginx
+systemctl daemon-reload
+systemctl reload nginx
diff --git a/scripts/restore b/scripts/restore
index 4ac6360..adf14de 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -6,8 +6,8 @@ set -eu
 #=================================================
 if [ ! -e _common.sh ]; then
 	# Fetch helpers file if not in current directory
-	sudo cp ../settings/scripts/_common.sh ./_common.sh
-	sudo chmod a+rx _common.sh
+	cp ../settings/scripts/_common.sh ./_common.sh
+	chmod a+rx _common.sh
 fi
 source /usr/share/yunohost/helpers
 source _common.sh
@@ -45,10 +45,10 @@ fi
  You should safely delete it before restoring this app."
 
 # Create destination
-sudo mkdir -p $final_path
+mkdir -p $final_path
 
 # Create user
-id -u $serviceuser || sudo useradd -d "$final_path" -M $serviceuser
+id -u $serviceuser || useradd -d "$final_path" -M $serviceuser
 
 #=================================================
 # STANDARD RESTORATION STEPS
@@ -60,19 +60,19 @@ ynh_restore
 # RELOAD THE NGINX CONFIGURATION
 #=================================================
 
-sudo systemctl reload nginx
+systemctl reload nginx
 
 #=================================================
 # RELOAD AND ENABLE THE SYSTEMD CONFIGURATION
 #=================================================
-sudo systemctl daemon-reload
-sudo systemctl enable rocketchat
+systemctl daemon-reload
+systemctl enable rocketchat
 
 #=================================================
 # RESTORE PERMISSIONS IN THE APP MAIN DIR
 #=================================================
 
-sudo chown -R $serviceuser: $final_path
+chown -R $serviceuser: $final_path
 
 #=================================================
 # INSTALL DEPENDENCIES
@@ -84,11 +84,11 @@ installdeps
 # RESTORE THE MONGODB
 #=================================================
 
-sudo mongorestore ./dump
+mongorestore ./dump
 
 #=================================================
 # START APP RELATED SERVICES
 #=================================================
 
-sudo systemctl start rocketchat
+systemctl start rocketchat
 waitforservice
diff --git a/scripts/upgrade b/scripts/upgrade
index a46fe1b..5b31d0e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -25,22 +25,22 @@ port=$(ynh_app_setting_get $app port)
 # Backup the current version of the app
 ynh_backup_before_upgrade > >(tee "upgrade.log")
 
-sudo systemctl stop rocketchat
+systemctl stop rocketchat
 
-sudo rm -rf $final_path
-sudo mkdir -p $final_path
+ynh_secure_remove $final_path
+mkdir -p $final_path
 
 # update to latest required node setup
 installnode
 
 ynh_setup_source "$final_path"
 
-sudo chown -R $serviceuser: $final_path
+chown -R $serviceuser: $final_path
 
 cd $final_path/programs/server/
-sudo npm install --production
+npm install --production
 
-sudo chown -R $serviceuser: $final_path
+chown -R $serviceuser: $final_path
 
-sudo systemctl start rocketchat
+systemctl start rocketchat
 waitforservice

From c682b679167f188190de0a3e600a4afd080af4ec Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Sun, 10 Feb 2019 21:29:13 +0100
Subject: [PATCH 21/23] Fix linter issues

---
 manifest.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index 047e4ac..0ce0e4f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,7 +5,7 @@
     "description": {
         "en": "the ultimate chat platform"
     },
-    "url": "https://github.com/YunoHost-Apps/rocketchat_ynh",
+    "url": "https://rocket.chat",
     "license": "GPL-3.0",
     "version": "0.73.2",
     "maintainer": {
@@ -45,7 +45,6 @@
                 "ask": {
                     "en": "Is it a public application?"
                 },
-                "choices": ["Yes", "No"],
                 "default": "Yes"
             },
             {

From 7787c61f4c24063d849abd961c7fef47244b7ec8 Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Sun, 10 Feb 2019 22:16:42 +0100
Subject: [PATCH 22/23] Fix ynh_replace_string arguments

---
 scripts/install | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/install b/scripts/install
index 29ec72d..23f4aad 100644
--- a/scripts/install
+++ b/scripts/install
@@ -88,27 +88,27 @@ mkdir -p $final_path
 id -u $serviceuser || useradd -d "$final_path" -M $serviceuser
 
 # Copy and set systemd configuration
-ynh_replace_string "s@#ROOTURL#@$domain@g" ../conf/rocketchat.service
-ynh_replace_string "s@#LOCATION#@${path:-/}@g" ../conf/rocketchat.service
-ynh_replace_string "s@#PORT#@$port@g" ../conf/rocketchat.service
-ynh_replace_string "s@#USER#@$serviceuser@g" ../conf/rocketchat.service
-ynh_replace_string "s@#DESTDIR#@$final_path@g" ../conf/rocketchat.service
-ynh_replace_string "s@#DBNAME#@$dbname@g" ../conf/rocketchat.service
+ynh_replace_string "#ROOTURL#" "$domain" ../conf/rocketchat.service
+ynh_replace_string "#LOCATION#" "${path:-/}" ../conf/rocketchat.service
+ynh_replace_string "#PORT#" "$port" ../conf/rocketchat.service
+ynh_replace_string "#USER#" "$serviceuser" ../conf/rocketchat.service
+ynh_replace_string "#DESTDIR#" "$final_path" ../conf/rocketchat.service
+ynh_replace_string "#DBNAME#" "$dbname" ../conf/rocketchat.service
 # absolute node path needed
 NODE_BIN=$(which node)
-ynh_replace_string "s@#NODE#@$NODE_BIN@g" ../conf/rocketchat.service
+ynh_replace_string "#NODE#" "$NODE_BIN" ../conf/rocketchat.service
 cp ../conf/rocketchat.service /etc/systemd/system/$app.service
 systemctl daemon-reload
 
 # Copy and set nginx configuration
 nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf"
-ynh_replace_string "s@#APP#@$app@g"          ../conf/nginx.conf
-ynh_replace_string "s@#PATH#@$path@g"        ../conf/nginx.conf
-ynh_replace_string "s@#PORT#@$port@g"        ../conf/nginx.conf
-ynh_replace_string "s@#LOCATION#@${path:-/}@g" ../conf/nginx.conf
+ynh_replace_string "#APP#" "$app" ../conf/nginx.conf
+ynh_replace_string "#PATH#" "$path" ../conf/nginx.conf
+ynh_replace_string "#PORT#" "$port" ../conf/nginx.conf
+ynh_replace_string "#LOCATION#" "${path:-/}" ../conf/nginx.conf
 
 #set db name into ldap config
-ynh_replace_string "s@#DBNAME#@$dbname@g" ../conf/rocketchat_ldap.js
+ynh_replace_string "#DBNAME#" "$dbname" ../conf/rocketchat_ldap.js
 
 cp ../conf/nginx.conf "$nginx_conf"
 

From b35b12e553f52ccb98143af17908d115b1fdb795 Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@users.noreply.github.com>
Date: Sun, 10 Feb 2019 22:26:14 +0100
Subject: [PATCH 23/23] Update README.md

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 14be126..53160c9 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,12 @@ Backup stores:
 - nginx configuration
 - systemd service configuration
 
+#### Supported architectures
+
+* x86-64b - [![](https://ci-apps.yunohost.org/ci/logs/rocketchat%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/rocketchat/)
+* ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/rocketchat%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/rocketchat/)
+* Jessie x86-64b - [![](https://ci-stretch.nohost.me/ci/logs/rocketchat%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/rocketchat/)
+
 ## Links
 
  * Report a bug: [Issues](/../../issues)