Merge pull request #22 from YunoHost-Apps/version-2

Version 2

README.md

@@ -16,7 +16,8 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 ## Overview
 
-The news reader that doesn't know you
+Pétrolette is fully self-contained, makes no external call whatsoever, and embarks a total of zero tracker or "analysis" tool. Needless to say she is also completely ad-free.
+
 
 **Shipped version:** 1.6.0~ynh2
 
@@ -26,18 +27,9 @@ The news reader that doesn't know you
 
 ![Screenshot of Petrolette](./doc/screenshots/petrolette.webp)
 
-## Disclaimers / important information
-
-
-- The application has 2 modes 
-    - multi user : each user store is own config itself.
-    - mono user : configuration is store locally in the server. Each visitor see the same page. 
-        /!\ For now, there is no any mechanism included for feed protection. Any visitor can modify the feed list.
-
-- If you like this software, Please consider to [support the Pétrolette project by sending a donation](https://liberapay.com/yPhil/donate). Even the smallest amount will help a lot.
-
 ## Documentation and resources
 
+* Official app website: <https://framagit.org/yphil/petrolette>
 * Upstream app code repository: <https://framagit.org/yphil/petrolette>
 * YunoHost documentation for this app: <https://yunohost.org/app_petrolette>
 * Report a bug: <https://github.com/YunoHost-Apps/petrolette_ynh/issues>

README_fr.md

@@ -16,7 +16,8 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 ## Vue d’ensemble
 
-La page d'actu qui ne sait rien de toi
+Pétrolette is fully self-contained, makes no external call whatsoever, and embarks a total of zero tracker or "analysis" tool. Needless to say she is also completely ad-free.
+
 
 **Version incluse :** 1.6.0~ynh2
 
@@ -26,18 +27,9 @@ La page d'actu qui ne sait rien de toi
 
 ![Capture d’écran de Petrolette](./doc/screenshots/petrolette.webp)
 
-## Avertissements / informations importantes
-
-
-- The application has 2 modes 
-    - multi user : each user store is own config itself.
-    - mono user : configuration is store locally in the server. Each visitor see the same page. 
-        /!\ For now, there is no any mechanism included for feed protection. Any visitor can modify the feed list.
-
-- If you like this software, Please consider to [support the Pétrolette project by sending a donation](https://liberapay.com/yPhil/donate). Even the smallest amount will help a lot.
-
 ## Documentations et ressources
 
+* Site officiel de l’app : <https://framagit.org/yphil/petrolette>
 * Dépôt de code officiel de l’app : <https://framagit.org/yphil/petrolette>
 * Documentation YunoHost pour cette app : <https://yunohost.org/app_petrolette>
 * Signaler un bug : <https://github.com/YunoHost-Apps/petrolette_ynh/issues>

check_process

@@ -1,18 +0,0 @@
-;; Test complet
-	; Manifest
-		domain="domain.tld"
-		is_public=1
-	; Checks
-		pkg_linter=1
-		setup_sub_dir=1
-		setup_root=1
-		setup_nourl=0
-		setup_private=1
-		setup_public=1
-		upgrade=1
-		# 1.4.3~ynh1
-		upgrade=1	from_commit=3a43f1d64bb44e7cc57fe30ebe125a5157f1e5f8
-		backup_restore=1
-		multi_instance=1
-		port_already_use=0
-		change_url=1

conf/app.src

@@ -1,6 +0,0 @@
-SOURCE_URL=https://framagit.org/yphil/petrolette/-/archive/v1.6.0/petrolette-v1.6.0.tar.gz
-SOURCE_SUM=25cff32873fb643882a1b43681842a646d4e46a9802da2ab086ab29f770b7d7e
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=

conf/nginx.conf

@@ -1,8 +1,7 @@
+#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
-   proxy_set_header       Host $host;
-   proxy_buffering off;
-
-   rewrite ^__PATH__$ __PATH__/ break;
-   proxy_pass      http://localhost:__PORT__/;
 
+   proxy_pass       http://127.0.0.1:__PORT__/;
+   proxy_set_header Host $host;
+   proxy_buffering  off;
 }

conf/systemd.service

@@ -4,12 +4,12 @@ After=network.target
 
 [Service]
 Type=simple
-Environment="__YNH_NODE_LOAD_PATH__"
-Environment="NODE_ENV=development"
 User=__APP__
 Group=__APP__
+Environment="__YNH_NODE_LOAD_PATH__"
+Environment="NODE_ENV=development"
 ExecStart=/bin/sh -c ' npm run unmanaged'
-WorkingDirectory=__FINALPATH__/
+WorkingDirectory=__INSTALL_DIR__/
 Restart=always
 
 # Sandboxing options to harden security
@@ -42,6 +42,5 @@ CapabilityBoundingSet=~CAP_MAC_ADMIN CAP_MAC_OVERRIDE
 CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW
 CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG
 
-
 [Install]
 WantedBy=multi-user.target

config_panel.toml

@@ -9,6 +9,6 @@ services = ["__APP__"]
         [main.customization.instanceType]
         ask = "Mono user instance"
         type = "boolean"
-        help = "if this instance is mono user, the feed list will be the same for all users"
+        help = "If this instance is mono user, the feed list will be the same for all users"
         bind = "instance_type()"
 

doc/ADMIN.md

@@ -1,7 +1,4 @@
-
+The application has 2 modes 
-- The application has 2 modes 
     - multi user : each user store is own config itself.
     - mono user : configuration is store locally in the server. Each visitor see the same page. 
         /!\ For now, there is no any mechanism included for feed protection. Any visitor can modify the feed list.
-
-- If you like this software, Please consider to [support the Pétrolette project by sending a donation](https://liberapay.com/yPhil/donate). Even the smallest amount will help a lot.

doc/DESCRIPTION.md

@@ -0,0 +1 @@
+Pétrolette is fully self-contained, makes no external call whatsoever, and embarks a total of zero tracker or "analysis" tool. Needless to say she is also completely ad-free.

manifest.json

@@ -1,64 +0,0 @@
-{
-    "name": "Petrolette",
-    "id": "petrolette",
-    "packaging_format": 1,
-    "description": {
-        "en": "The news reader that doesn't know you",
-        "fr": "La page d'actu qui ne sait rien de toi"
-    },
-    "version": "1.6.0~ynh2",
-    "url": "https://framagit.org/yphil/petrolette",
-    "upstream": {
-        "license": "AGPL-3.0-only",
-        "demo": "https://petrolette.space",
-        "code": "https://framagit.org/yphil/petrolette"
-    },
-    "license": "AGPL-3.0-only",
-    "maintainer": {
-        "name": "oiseauroch",
-        "email": "tobias.ollive@oiseauroch.fr"
-    },
-    "requirements": {
-        "yunohost": ">= 4.3.0"
-    },
-    "multi_instance": true,
-    "services": [
-        "nginx"
-    ],
-    "arguments": {
-        "install": [
-            {
-                "name": "domain",
-                "type": "domain"
-            },
-            {
-                "name": "path",
-                "type": "path",
-                "example": "/petrolette",
-                "default": "/petrolette"
-            },
-            {
-                "name": "mono_user",
-                "type": "boolean",
-                "default": true,
-                "ask": {
-                    "fr" : "Cette instance est elle mono utilisateur ?",
-                    "en" : "Is this instance mono user ?"
-                },
-                "help" : {
-                    "fr" : "Cette instance ne proposera qu'une seule selection de flux, la même pour tous les visiteurs",
-                    "en" : "This instance will have the same rss selection for any visitor visiting the page"
-                }
-            },
-            {
-                "name": "is_public",
-                "type": "boolean",
-                "default": true,
-                "help" : {
-                    "fr" : "Cette page sera accessible par n'importe qui. En revanche, la configuration reste personnelle",
-                    "en" : "The page will be accessible by anyone."
-                }
-            }
-        ]
-    }
-}

manifest.toml

@@ -0,0 +1,63 @@
+packaging_format = 2
+
+id = "petrolette"
+name = "Petrolette"
+description.en = "The news reader that doesn't know you"
+description.fr = "La page d'actu qui ne sait rien de toi"
+
+version = "1.6.0~ynh2"
+
+maintainers = ["oiseauroch"]
+
+[upstream]
+license = "AGPL-3.0-only"
+demo = "https://petrolette.space"
+code = "https://framagit.org/yphil/petrolette"
+website = "https://framagit.org/yphil/petrolette"
+fund = "https://liberapay.com/yPhil/donate"
+
+[integration]
+yunohost = ">= 11.2"
+architectures = "all"
+multi_instance = true
+ldap = false
+sso = false
+disk = "50M"
+ram.build = "500M"
+ram.runtime = "50M"
+
+[install]
+    [install.domain]
+    type = "domain"
+
+    [install.path]
+    type = "path"
+    default = "/petrolette"
+
+    [install.init_main_permission]
+    type = "group"
+    default = "visitors"
+
+    [install.mono_user]
+    ask.fr = "Cette instance est elle mono utilisateur ?"
+    ask.en = "Is this instance mono user ?"
+    help.fr = "Cette instance ne proposera qu'une seule selection de flux, la même pour tous les visiteurs"
+    help.en = "This instance will have the same rss selection for any visitor visiting the page"
+    type = "boolean"
+    default = true
+
+[resources]
+        [resources.sources.main]
+        url = "https://framagit.org/yphil/petrolette/-/archive/v1.6.0/petrolette-v1.6.0.tar.gz"
+        sha256 = "25cff32873fb643882a1b43681842a646d4e46a9802da2ab086ab29f770b7d7e"
+
+    [resources.system_user]
+
+    [resources.install_dir]
+
+    [resources.ports]
+    main.default = 8001
+    https.default = 8002
+
+    [resources.permissions]
+    main.url = "/"

scripts/_common.sh

@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-NODEJS_VERSION=16
+NODEJS_VERSION=18
 
 #=================================================
 # PERSONAL HELPERS

scripts/backup

@@ -10,27 +10,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	ynh_clean_check_starting
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_print_info --message="Loading installation settings..."
-
-app=$YNH_APP_INSTANCE_NAME
-
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-datadir=$(ynh_app_setting_get --app=$app --key=datadir)
-
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
 #=================================================
@@ -40,7 +19,7 @@ ynh_print_info --message="Declaring files to be backed up..."
 # BACKUP THE APP MAIN DIR
 #=================================================
 
-ynh_backup --src_path="$final_path"
+ynh_backup --src_path="$install_dir"
 
 #=================================================
 # BACKUP THE NGINX CONFIGURATION

scripts/change_url

@@ -9,60 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# RETRIEVE ARGUMENTS
-#=================================================
-
-old_domain=$YNH_APP_OLD_DOMAIN
-old_path=$YNH_APP_OLD_PATH
-
-new_domain=$YNH_APP_NEW_DOMAIN
-new_path=$YNH_APP_NEW_PATH
-
-app=$YNH_APP_INSTANCE_NAME
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=1
-
-# Needed for helper "ynh_add_nginx_config"
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-port=$(ynh_app_setting_get --app=$app --key=port)
-
-#=================================================
-# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..."  --weight=1
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-	# Remove the new domain config file, the remove script won't do it as it doesn't know yet its location.
-	ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
-
-	# Restore it if the upgrade fails
-	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# CHECK WHICH PARTS SHOULD BE CHANGED
-#=================================================
-
-change_domain=0
-if [ "$old_domain" != "$new_domain" ]
-then
-	change_domain=1
-fi
-
-change_path=0
-if [ "$old_path" != "$new_path" ]
-then
-	change_path=1
-fi
-
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
@@ -70,37 +16,14 @@ fi
 #=================================================
 ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
 
 #=================================================
 # MODIFY URL IN NGINX CONF
 #=================================================
 ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1
 
-nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
+ynh_change_url_nginx_config
-
-# Change the path in the NGINX config file
-if [ $change_path -eq 1 ]
-then
-	# Make a backup of the original NGINX config file if modified
-	ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
-	# Set global variables for NGINX helper
-	domain="$old_domain"
-	path_url="$new_path"
-	# Create a dedicated NGINX config
-	ynh_add_nginx_config
-fi
-
-# Change the domain for NGINX
-if [ $change_domain -eq 1 ]
-then
-	# Delete file checksum for the old conf file location
-	ynh_delete_file_checksum --file="$nginx_conf_path"
-	mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf
-	# Store file checksum for the new config file location
-	ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf"
-fi
-
 
 #=================================================
 # GENERIC FINALISATION
@@ -109,14 +32,7 @@ fi
 #=================================================
 ynh_script_progression --message="Starting a systemd service..."  --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd"
-
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..."  --weight=1
-
-ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================
 # END OF SCRIPT

scripts/install

@@ -9,61 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	ynh_clean_check_starting
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# RETRIEVE ARGUMENTS FROM THE MANIFEST
-#=================================================
-
-domain=$YNH_APP_ARG_DOMAIN
-path_url=$YNH_APP_ARG_PATH
-is_public=$YNH_APP_ARG_IS_PUBLIC
-mono_user=$YNH_APP_ARG_MONO_USER
-
-app=$YNH_APP_INSTANCE_NAME
-
-#=================================================
-# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
-#=================================================
-ynh_script_progression --message="Validating installation parameters..."
-
-final_path=/opt/yunohost/$app
-test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
-
-# Register (book) web path
-ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
-
-#=================================================
-# STORE SETTINGS FROM MANIFEST
-#=================================================
-ynh_script_progression --message="Storing installation settings..."
-
-ynh_app_setting_set --app=$app --key=domain --value=$domain
-ynh_app_setting_set --app=$app --key=path --value=$path_url
-ynh_app_setting_set --app=$app --key=mono_user --value=$mono_user
-
-#=================================================
-# STANDARD MODIFICATIONS
-#=================================================
-# FIND AND OPEN A PORT
-#=================================================
-ynh_script_progression --message="Finding an available port..."
-
-# Find an available port
-port=$(ynh_find_port --port=8001)
-ynh_app_setting_set --app=$app --key=port --value=$port
-
-https_port=$(ynh_find_port --port=8002)
-ynh_app_setting_set --app=$app --key=https_port --value=$https_port
-
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
@@ -71,22 +16,13 @@ ynh_script_progression --message="Installing dependencies..."
 
 ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Configuring system user..."
-
-# Create a system user
-ynh_system_user_create --username=$app --home_dir="$final_path"
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 ynh_script_progression --message="Setting up source files..."
 
-ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source --dest_dir="$final_path"
+ynh_setup_source --dest_dir="$install_dir"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -96,6 +32,11 @@ ynh_script_progression --message="Configuring NGINX web server..."
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
+# Create a dedicated systemd config
+ynh_add_systemd_config
+
+yunohost service add $app --description="The news reader that doesn't know you"
+
 #=================================================
 # SPECIFIC SETUP
 #=================================================
@@ -103,45 +44,28 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Installing application using node..."
 
-pushd $final_path
+pushd $install_dir
 # set port in configuration file
 	sed -i "/HTTP_PORT/s/[0-9]*[0-9]/$port/" package.json
-	sed -i "/HTTPS_PORT/s/[0-9]*[0-9]/$https_port/" package.json
+	sed -i "/HTTPS_PORT/s/[0-9]*[0-9]/$port_https/" package.json
 	# use custom home value to avoid bower storing values in root and have right errors
 	if [ $mono_user -eq 1 ] ; then
 	    ynh_add_config --template="petrolette.config.json" --destination="petrolette.config.json"
 	fi
-	if [ "$path_url" != "/" ] ; then
+	if [ "$path" != "/" ] ; then
         sed -i "s|\$.get(\"/feed\", {|\$.get(\"feed\", {|" public/js/PTL.feed.js 
 	fi
 	[[ -v HOME ]] && TMP_HOME=$HOME
 	HOME=$(pwd)
 	export NODE_ENV=production
 	ynh_use_nodejs
-	ynh_npm install --ignore-scripts
+	ynh_exec_warn_less $ynh_npm install --ignore-scripts
 	[[ -v TMP_HOME ]] && HOME=$TMP_HOME || unset HOME
 popd
 
-chmod 750 "$final_path"
+chmod 750 "$install_dir"
-chmod -R o-rwx "$final_path"
+chmod -R o-rwx "$install_dir"
-chown -R $app:$app "$final_path"
+chown -R $app:$app "$install_dir"
-
-#=================================================
-# SETUP SYSTEMD
-#=================================================
-ynh_script_progression --message="Configuring a systemd service..."
-
-# Create a dedicated systemd config
-ynh_add_systemd_config
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..."
-
-yunohost service add $app --description="The news reader that doesn't know you"
 
 #=================================================
 # START SYSTEMD SERVICE
@@ -151,26 +75,6 @@ ynh_script_progression --message="Starting a systemd service..."
 # Start a systemd service
 ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Pétrolette HTTP Server running on port"
 
-#=================================================
-# SETUP SSOWAT
-#=================================================
-ynh_script_progression --message="Configuring permissions..."
-
-# Make app public if necessary
-if [ $is_public -eq 1 ]
-then
-	# Everyone can access the app.
-	# The "main" permission is automatically created before the install script.
-	ynh_permission_update --permission="main" --add="visitors"
-fi
-
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..."
-
-ynh_systemd_action --service_name=nginx --action=reload
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/remove

@@ -9,16 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading installation settings..."
-
-app=$YNH_APP_INSTANCE_NAME
-
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-
 #=================================================
 # STANDARD REMOVE
 #=================================================
@@ -32,47 +22,14 @@ then
 	yunohost service remove $app
 fi
 
-#=================================================
-# STOP AND REMOVE SERVICE
-#=================================================
-ynh_script_progression --message="Stopping and removing the systemd service..."
-
 # Remove the dedicated systemd config
 ynh_remove_systemd_config
 
-#=================================================
-# REMOVE APP MAIN DIR
-#=================================================
-ynh_script_progression --message="Removing app main directory..."
-
-# Remove the app directory securely
-ynh_secure_remove --file="$final_path"
-
-#=================================================
-# REMOVE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..."
-
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing dependencies..."
-
 ynh_remove_nodejs
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# REMOVE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Removing the dedicated system user..."
-
-# Delete a system user
-ynh_system_user_delete --username=$app
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/restore

@@ -10,87 +10,29 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	ynh_clean_check_starting
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading installation settings..." --weight=1
-
-app=$YNH_APP_INSTANCE_NAME
-
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-path_url=$(ynh_app_setting_get --app=$app --key=path)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-port=$(ynh_app_setting_get --app=$app --key=port)
-https_port=$(ynh_app_setting_get --app=$app --key=https_port)
-
-#=================================================
-# CHECK IF THE APP CAN BE RESTORED
-#=================================================
-ynh_script_progression --message="Validating restoration parameters..." --weight=1
-
-test ! -d $final_path \
-	|| ynh_die --message="There is already a directory: $final_path "
-
-#=================================================
-# STANDARD RESTORATION STEPS
-#=================================================
-# RESTORE THE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring the NGINX web server configuration..."
-
-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-
-#=================================================
-# RECREATE THE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Recreating the dedicated system user..." --weight=1
-
-# Create the dedicated user (if not existing)
-ynh_system_user_create --username=$app --home_dir="$final_path"
-
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
 ynh_script_progression --message="Restoring the app main directory..."
 
-ynh_restore_file --origin_path="$final_path"
+ynh_restore_file --origin_path="$install_dir"
 
-chmod 750 "$final_path"
+chmod -R o-rwx "$install_dir"
-chmod -R o-rwx "$final_path"
+chown -R $app:$app "$install_dir"
-chown -R $app:$app "$final_path"
 
 #=================================================
 # SPECIFIC RESTORATION
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Reinstalling dependencies..." --weight=1
 
 ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 
-#=================================================
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-# RESTORE SYSTEMD
-#=================================================
-ynh_script_progression --message="Restoring the systemd configuration..." --weight=1
 
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable $app.service --quiet
 
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-
 yunohost service add $app --description="The news reader that doesn't know you"
 
 #=================================================
@@ -100,13 +42,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=3
 
 ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Pétrolette HTTP Server running on port"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# RELOAD NGINX AND PHP-FPM
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================

scripts/upgrade

@@ -9,41 +9,12 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# LOAD SETTINGS
-#=================================================
-ynh_script_progression --message="Loading installation settings..."
-
-app=$YNH_APP_INSTANCE_NAME
-
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-path_url=$(ynh_app_setting_get --app=$app --key=path)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-port=$(ynh_app_setting_get --app=$app --key=port)
-https_port=$(ynh_app_setting_get --app=$app --key=https_port)
-
 #=================================================
 # CHECK VERSION
 #=================================================
-ynh_script_progression --message="Checking version..."
 
 upgrade_type=$(ynh_check_app_version_changed)
 
-#=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-	ynh_clean_check_starting
-	# Restore it if the upgrade fails
-	ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
 #=================================================
 # STANDARD UPGRADE STEPS
 #=================================================
@@ -53,14 +24,6 @@ ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action=stop --log_path=systemd --line_match="Stopped"
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..." --weight=8
-
-# Create a dedicated user (if not existing)
-ynh_system_user_create --username=$app --home_dir="$final_path"
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -70,7 +33,7 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path"
+	ynh_setup_source --dest_dir="$install_dir"
 fi
 
 #=================================================
@@ -81,13 +44,13 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." -
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# UPGRADE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Upgrading dependencies..." --weight=2
-
 ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 
+# Create a dedicated systemd config
+ynh_add_systemd_config
+
+yunohost service add $app --description="The news reader that doesn't know you"
+
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================
@@ -95,41 +58,24 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
 #=================================================
 ynh_script_progression --message="Upgrading the app..." --weight=5
 
-pushd $final_path
+pushd $install_dir
 # set port in configuration file
         sed -i "/HTTP_PORT/s/[0-9]*[0-9]/$port/" package.json
-        sed -i "/HTTPS_PORT/s/[0-9]*[0-9]/$https_port/" package.json
+        sed -i "/HTTPS_PORT/s/[0-9]*[0-9]/$port_https/" package.json
-    if [ "$path_url" != "/" ] ; then
+    if [ "$path" != "/" ] ; then
         sed -i "s|\$.get(\"/feed\", {|\$.get(\"feed\", {|" public/js/PTL.feed.js 
     fi
 
 	[[ -v HOME ]] && TMP_HOME=$HOME
         HOME=$(pwd)
         ynh_use_nodejs
-        ynh_npm update
+        ynh_exec_warn_less $ynh_npm install --ignore-scripts
         [[ -v TMP_HOME ]] && HOME=$TMP_HOME || unset HOME
 popd
 
-chmod 750 "$final_path"
+chmod 750 "$install_dir"
-chmod -R o-rwx "$final_path"
+chmod -R o-rwx "$install_dir"
-chown -R $app:$app "$final_path"
+chown -R $app:$app "$install_dir"
-
-#=================================================
-# SETUP SYSTEMD
-#=================================================
-ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
-
-# Create a dedicated systemd config
-ynh_add_systemd_config
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-
-yunohost service add $app --description="The news reader that doesn't know you"
 
 #=================================================
 # START SYSTEMD SERVICE
@@ -138,14 +84,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=3
 
 ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="Pétrolette HTTP Server running on port"
 
-
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
-ynh_systemd_action --service_name=nginx --action=reload
-
 #=================================================
 # END OF SCRIPT
 #=================================================

tests.toml

@@ -0,0 +1,9 @@
+test_format = 1.0
+
+[default]
+
+    # -------------------------------
+    # Default args to use for install
+    # -------------------------------
+
+    args.mono_user = "true"