From e269a0427caf8f4fa1010f32371ea8efca9cca5b Mon Sep 17 00:00:00 2001
From: frju365 <win10@tutanota.com>
Date: Fri, 30 Jun 2017 18:40:59 +0200
Subject: [PATCH] [Fix] System config (#3)

* [Fix] File system

* Update install

* [Fix] Configuration system + nginx

* [Fix] Problem Conf error #20

* [Fix] Problem conf

* [Fix] $app.service

* [Fix] Nodejs command (1st try)
---
 conf/osjs.service  |  9 +++++----
 scripts/_common.sh |  1 +
 scripts/install    | 10 +++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/conf/osjs.service b/conf/osjs.service
index 6ab4bc5..ba027a8 100644
--- a/conf/osjs.service
+++ b/conf/osjs.service
@@ -1,15 +1,16 @@
 [Unit]
 Description=OS.js is a web-desktop written in Nodejs and javascript. 
-After=syslog.target
 After=network.target
 
+
 [Service]
 Type=simple
-User=root
-WorkingDirectory=__FINALPATH__
+User=__APP__
+Group=__APP__
+ExecStartPre=__NODEJS__
+Environment="PATH=__ENV_PATH__"
 ExecStart=/usr/bin/node osjs run --port=__PORT__
 Restart=always
-Environment=USER=osjs HOME=__FINALPATH__
 
 [Install]
 WantedBy=multi-user.target
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 8ec667f..e051ad6 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -79,6 +79,7 @@ ynh_systemd_config () {
 	if test -n "${app:-}"; then
 		ynh_replace_string "__APP__" "$app" "$finalsystemdconf"
 	fi
+        ynh_replace_string "__PORT__" "$port" "$finalsystemdconf"
 	ynh_store_file_checksum "$finalsystemdconf"
 
 	sudo chown root: "$finalsystemdconf"
diff --git a/scripts/install b/scripts/install
index e71c84a..3b975da 100644
--- a/scripts/install
+++ b/scripts/install
@@ -114,13 +114,14 @@ sudo chmod 755 $final_path -R
 #=================================================
 # Modify Nginx configuration file and copy it to Nginx conf directory
 #=================================================
-ynh_replace_string "__PORT__" "$port" "../conf/nginx.conf"
-ynh_replace_string "__PORT__" "$port" "../conf/osjs.service"
-ynh_replace_string "__FINALPATH__" "$final_path" "../conf/osjs.service"
+
+ynh_nginx_config
 nginxconf=/etc/nginx/conf.d/$domain.d/$app.conf
-sudo cp ../conf/nginx.conf $nginxconf
 sudo chown root: $nginxconf
 sudo chmod 600 $nginxconf
+ynh_systemd_config
+ynh_replace_string "__NODEJS__" "$nodejs_use_version" "/etc/systemd/system/$app.service"
+ynh_replace_string "__ENV_PATH__" "$PATH" "/etc/systemd/system/$app.service"
 
 #=================================================
 # Install OSjs
@@ -137,7 +138,6 @@ sudo yunohost firewall allow Both $port
 # Configure init script
 #=================================================
 
-sudo cp ../conf/"$app".service /etc/systemd/system/
 sudo systemctl daemon-reload
 sudo systemctl enable "$app".service
 sudo systemctl start "$app".service