From 05de7af835ff29e0b9a7cb17623f2bf52b9cb925 Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Fri, 21 Jul 2017 11:43:20 +0200
Subject: [PATCH] Fixes service user

---
 scripts/install | 11 ++++++-----
 scripts/remove  |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/install b/scripts/install
index 890a10e..684a8af 100644
--- a/scripts/install
+++ b/scripts/install
@@ -26,7 +26,7 @@ is_public=$YNH_APP_ARG_IS_PUBLIC
 language=$YNH_APP_ARG_LANG
 
 app=$YNH_APP_INSTANCE_NAME
-user=$app
+serviceuser=rocketchat
 
 ROCKETCHAT_VERSION=0.57.2
 NODE_VERSION=4.7.1
@@ -48,6 +48,7 @@ final_path="/var/lib/$app"
  You should safely delete it before installing this app."
 
 # Save specific settings
+ynh_app_setting_set $app serviceuser $serviceuser
 ynh_app_setting_set $app final_path $final_path
 ynh_app_setting_set $app is_public $is_public
 
@@ -78,7 +79,7 @@ sudo mkdir -p $final_path
 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#@/$user@g" ../conf/rocketchat.service
+sed -i "s@#USER#@/$serviceuser@g" ../conf/rocketchat.service
 sudo cp ../conf/rocketchat.service /etc/systemd/system/
 sudo systemctl daemon-reload
 
@@ -103,10 +104,10 @@ sudo npm install
 
 cd $final_path
 
-sudo useradd -d "$final_path" -M $user
-sudo chown -R $user: $final_path
+sudo useradd -d "$final_path" -M $serviceuser
+sudo chown -R $serviceuser: $final_path
 
-sudo chown -R $user: $final_path
+sudo chown -R $serviceuser: $final_path
 
 sudo systemctl reload nginx
 if [ "$is_public" = "Yes" ];
diff --git a/scripts/remove b/scripts/remove
index 15b4490..f8c4f97 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -12,6 +12,7 @@ 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
 
@@ -22,7 +23,7 @@ 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
-sudo userdel -r $app
+sudo userdel -r $serviceuser
 
 sudo systemctl daemon-reload
 sudo systemctl reload nginx