Merge branch 'try'

README.md

@@ -3,14 +3,14 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app
 It shall NOT be edited by hand.
 -->
 
-# Timeoff Management for YunoHost
+# Timeoff for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/timeoff.svg)](https://dash.yunohost.org/appci/app/timeoff) ![](https://ci-apps.yunohost.org/ci/badges/timeoff.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/timeoff.maintain.svg)  
-[![Install Timeoff Management with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=timeoff)
+[![Install Timeoff with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=timeoff)
 
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *This package allows you to install Timeoff Management quickly and simply on a YunoHost server.
+> *This package allows you to install Timeoff quickly and simply on a YunoHost server.
 If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
 ## Overview

README_fr.md

@@ -1,22 +1,21 @@
-# Timeoff Management pour YunoHost
+# Timeoff pour YunoHost
 
 [![Niveau d'intégration](https://dash.yunohost.org/integration/timeoff.svg)](https://dash.yunohost.org/appci/app/timeoff) ![](https://ci-apps.yunohost.org/ci/badges/timeoff.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/timeoff.maintain.svg)  
-[![Installer Timeoff Management avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=timeoff)
+[![Installer Timeoff avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=timeoff)
 
 *[Read this readme in english.](./README.md)*
 *[Lire ce readme en français.](./README_fr.md)*
 
-> *Ce package vous permet d'installer Timeoff Management rapidement et simplement sur un serveur YunoHost.
+> *Ce package vous permet d'installer Timeoff rapidement et simplement sur un serveur YunoHost.
 Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
 
 ## Vue d'ensemble
 
-
+Web application for managing employee absences
 
 **Version incluse :** 1.4.0~ynh1
 
 
-
 ## Captures d'écran
 
 ![](./doc/screenshots/smartmockups_kkjk5hh4-p-2000.png)

check_process

@@ -14,7 +14,7 @@
 		#upgrade=1	from_commit=CommitHash
 		backup_restore=1
 		multi_instance=0
-		change_url=1
+		change_url=0
 ;;; Options
 Email=
 Notification=none

conf/db.json

@@ -5,13 +5,3 @@
     "logging": false
   }
 }
-
-/*{
-  "production": {
-    "username": "",
-    "password": "",
-    "database": "",
-    "host": "127.0.0.1",
-    "dialect": "mysql"
-  }
-}*/

manifest.json

@@ -1,9 +1,10 @@
 {
-	"name": "Timeoff Management",
+	"name": "Timeoff",
 	"id": "timeoff",
 	"packaging_format": 1,
 	"description": {
-		"en": "Web application for managing employee absences"
+		"en": "Web application for managing employee absences",
+		"fr": "Web application for managing employee absences"
 	},
 	"version": "1.4.0~ynh1",
 	"url": "https://timeoff.management/",

scripts/install

@@ -52,7 +52,7 @@ ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_script_progression --message="Finding an available port..."
 
 # Find an available port
-port=$(ynh_find_port --port=9001)
+port=$(ynh_find_port --port=3000)
 ynh_app_setting_set --app=$app --key=port --value=$port
 
 #=================================================
@@ -61,6 +61,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port
 ynh_script_progression --message="Installing dependencies..."
 
 ynh_install_app_dependencies $pkg_dependencies
+
 # Install Nodejs
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
@@ -100,7 +101,7 @@ ynh_script_progression --message="Installing TimeOff..."
 
 pushd $final_path
 	ynh_use_nodejs
- 	ynh_exec_warn_less $ynh_npm install
+ 	ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install 2>/dev/null
 popd
 
 #=================================================
@@ -111,6 +112,9 @@ ynh_script_progression --message="Modifying a config file..."
 ynh_add_config --template="../conf/app.json" --destination="$final_path/config/app.json"
 ynh_add_config --template="../conf/db.json" --destination="$final_path/config/db.json"
 
+chmod 600 "$final_path/config/db.json"
+chown $app:$app "$final_path/config/db.json"
+
 #=================================================
 # SETUP SYSTEMD
 #=================================================

scripts/remove

@@ -49,7 +49,6 @@ ynh_script_progression --message="Removing dependencies..."
 # Remove metapackage and its dependencies
 ynh_remove_app_dependencies
 
-# Remove NodeJS
 ynh_remove_nodejs
 
 #=================================================

scripts/restore

@@ -70,6 +70,7 @@ chown -R $app:www-data "$final_path"
 ynh_script_progression --message="Reinstalling dependencies..."
 
 ynh_install_app_dependencies $pkg_dependencies
+
 # Install Nodejs
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 

scripts/upgrade

@@ -77,7 +77,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..."
 
-	ynh_secure_remove --file=$final_path
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$final_path"
 fi
@@ -112,8 +111,9 @@ then
 	ynh_script_progression --message="Upgrading TimeOff..."
 	pushd $final_path
 		ynh_use_nodejs
-		ynh_exec_warn_less $ynh_npm cache clean
+		ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm cache clean 2>/dev/null
-		ynh_exec_warn_less $ynh_npm update
+	 	ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install 2>/dev/null
+	 	#ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm run-script db-update --production 2>/dev/null
 	popd
 fi
 
@@ -125,6 +125,9 @@ ynh_script_progression --message="Modifying a config file..."
 ynh_add_config --template="../conf/app.json" --destination="$final_path/config/app.json"
 ynh_add_config --template="../conf/db.json" --destination="$final_path/config/db.json"
 
+chmod 600 "$final_path/config/db.json"
+chown $app:$app "$final_path/config/db.json"
+
 #=================================================
 # SETUP SYSTEMD
 #=================================================