From 8a29dc8bf2d5e53eca1f810682cac6b290b55e5f Mon Sep 17 00:00:00 2001 From: Selamanse Date: Thu, 17 Aug 2017 23:38:22 +0200 Subject: [PATCH 1/3] Updates mongodb and user handling --- scripts/install | 4 ++-- scripts/remove | 4 ---- scripts/restore | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index e5935e0..73c2850 100644 --- a/scripts/install +++ b/scripts/install @@ -56,7 +56,7 @@ ynh_app_setting_set $app is_public $is_public #Install dependencies sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 >/dev/null -echo "deb http://repo.mongodb.org/apt/debian wheezy/mongodb-org/3.0 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.0.list +echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.4 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list sudo apt-get update sudo apt-get install -y mongodb-org gzip curl graphicsmagick npm @@ -71,7 +71,7 @@ sudo n $NODE_VERSION sudo mkdir -p $final_path # Create user -sudo useradd -d "$final_path" -M $serviceuser +id -u $serviceuser || sudo useradd -d "$final_path" -M $serviceuser # Copy and set systemd configuration sed -i "s@#ROOTURL#@$domain@g" ../conf/rocketchat.service diff --git a/scripts/remove b/scripts/remove index d240c6d..e025c1f 100644 --- a/scripts/remove +++ b/scripts/remove @@ -13,7 +13,6 @@ source /usr/share/yunohost/helpers app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get $app domain) final_path=$(ynh_app_setting_get $app final_path) -serviceuser=$(ynh_app_setting_get $app serviceuser) sudo systemctl stop $app.service @@ -28,8 +27,5 @@ sudo rm -f /etc/systemd/system/$app.service # remove database!!! sudo mongo rocketchat --eval "db.dropDatabase()" -# remove user!!! -sudo userdel -r $serviceuser - sudo systemctl daemon-reload sudo systemctl reload nginx diff --git a/scripts/restore b/scripts/restore index 4291773..c261bd5 100644 --- a/scripts/restore +++ b/scripts/restore @@ -39,7 +39,7 @@ sudo yunohost app checkurl "${domain}${path}" -a "$app" || ynh_die sudo mkdir -p $final_path # Create user -sudo useradd -d "$final_path" -M $serviceuser +id -u $serviceuser || sudo useradd -d "$final_path" -M $serviceuser #================================================= # STANDARD RESTORATION STEPS From f4e1fcf0f73b819d64edb219052d81c67407f87e Mon Sep 17 00:00:00 2001 From: Selamanse Date: Fri, 18 Aug 2017 00:44:01 +0200 Subject: [PATCH 2/3] Fix mongodb repo key --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 73c2850..0eb234f 100644 --- a/scripts/install +++ b/scripts/install @@ -55,7 +55,7 @@ ynh_app_setting_set $app path $path ynh_app_setting_set $app is_public $is_public #Install dependencies -sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 >/dev/null +sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6 echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.4 main" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list sudo apt-get update sudo apt-get install -y mongodb-org gzip curl graphicsmagick npm From 9075a9855f7df2e0cae52eefa0d3323b277474c2 Mon Sep 17 00:00:00 2001 From: Selamanse Date: Fri, 18 Aug 2017 00:51:22 +0200 Subject: [PATCH 3/3] Adds mongodb service enable and start --- scripts/install | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/install b/scripts/install index 0eb234f..d1295ce 100644 --- a/scripts/install +++ b/scripts/install @@ -60,6 +60,10 @@ echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/3.4 main" | sudo sudo apt-get update sudo apt-get install -y mongodb-org gzip curl graphicsmagick npm +# start mongodb service +sudo systemctl enable mongod.service +sudo systemctl start mongod.service + # add mongodb to services sudo yunohost service add mongod -l /var/log/mongodb/mongod.log