Upgrade

.gitignore

@@ -1,3 +0,0 @@
-*.swp
-*~
-Notes

check_process

@@ -13,8 +13,7 @@
 		upgrade=1
 		#upgrade=1	from_commit=CommitHash
 		backup_restore=1
-		multi_instance=1
+		multi_instance=0
-		port_already_use=0
 		change_url=1
 ;;; Options
 Email=

conf/systemd.service

@@ -7,8 +7,9 @@ Type=simple
 User=__APP__
 Group=__APP__
 Environment="PORT=__PORT__"
+Environment="PATH=__ENV_PATH__"
 Environment="NODE_ENV=production"
-WorkingDirectory=__FINAL_PATH__
+WorkingDirectory=__FINALPATH__/
 ExecStart=__NODE_DIR__/node bin/wwww
 Restart=always
 

manifest.json

@@ -25,8 +25,7 @@
 	},
 	"multi_instance": false,
 	"services": [
-		"nginx",
+		"nginx"
-		"mysql"
 	],
 	"arguments": {
 		"install" : [

scripts/backup

@@ -6,70 +6,50 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-if [ ! -e _common.sh ]; then
+source ../settings/scripts/_common.sh
-	# Get the _common.sh file if it's not in the current directory
-	cp ../settings/scripts/_common.sh ./_common.sh
-	chmod a+rx _common.sh
-fi
-source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
 # MANAGE SCRIPT FAILURE
 #=================================================
 
-# 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 final_path)
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-domain=$(ynh_app_setting_get $app domain)
+domain=$(ynh_app_setting_get --app=$app --key=domain)
-#db_name=$(ynh_app_setting_get $app db_name)
 
 #=================================================
-# STANDARD BACKUP STEPS
+# DECLARE DATA AND CONF FILES TO BACKUP
 #=================================================
-# BACKUP OF THE MAIN DIR OF THE APP
+ynh_print_info --message="Declaring files to be backed up..."
-#=================================================
-
-CHECK_SIZE "$final_path"
-ynh_backup "$final_path"
 
 #=================================================
-# BACKUP OF THE NGINX CONFIGURATION
+# BACKUP THE APP MAIN DIR
 #=================================================
 
-ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_backup --src_path="$final_path"
 
 #=================================================
-# BACKUP OF THE SQL BDD
+# BACKUP THE NGINX CONFIGURATION
 #=================================================
 
-#ynh_mysql_dump_db "$db_name" > db.sql
+ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-#CHECK_SIZE "db.sql"
-
-#=================================================
-# SPECIFIC BACKUP
-#=================================================
-# BACKUP LOGROTATE
-#=================================================
-
-#ynh_backup "/etc/logrotate.d/$app"
 
 #=================================================
 # BACKUP SYSTEMD
 #=================================================
 
-ynh_backup "/etc/systemd/system/$app.service"
+ynh_backup --src_path="/etc/systemd/system/$app.service"
 
 #=================================================
-# BACKUP FAIL2BAN CONFIGURATION
+# END OF SCRIPT
 #=================================================
 
-#ynh_backup "/etc/fail2ban/jail.d/$app.conf"
+ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
-#ynh_backup "/etc/fail2ban/filter.d/$app.conf"

scripts/install

@@ -27,7 +27,6 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THIS ARGS
 #=================================================
-
 ynh_script_progression --message="Validating installation parameters..."
 
 final_path=/var/www/$app
@@ -40,44 +39,58 @@ 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 domain $domain
+ynh_app_setting_set --app=$app --key=domain --value=$domain
-ynh_app_setting_set $app path $path_url
+ynh_app_setting_set --app=$app --key=path --value=$path_url
 
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
 # FIND AND OPEN A PORT
 #=================================================
+ynh_script_progression --message="Finding an available port..."
 
-port=$(ynh_find_port 9001)	# Look for an available port
+# Find an available port
-ynh_app_setting_set $app port $port
+port=$(ynh_find_port 9001)
+ynh_app_setting_set --app=$app --key=port --value=$port
 
 #=================================================
-# INSTALL NODEJS
+# INSTALL DEPENDENCIES
 #=================================================
+ynh_script_progression --message="Installing dependencies..."
 
-ynh_install_nodejs $nodejs_version
+# Install Nodejs
-
+ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
-#=================================================
-# DOWNLOAD, CHECK AND UNPACK SOURCE
-#=================================================
-
-ynh_app_setting_set $app final_path $final_path
-ynh_setup_source "$final_path"	# Download, check integrity and uncompress the source from app.src
-
-#=================================================
-# NGINX CONFIGURATION
-#=================================================
-
-ynh_replace_string "__PATH__/" "${path_url%/}/" "../conf/nginx.conf"
-ynh_add_nginx_config
 
 #=================================================
 # CREATE DEDICATED USER
 #=================================================
+ynh_script_progression --message="Configuring system user..."
 
-ynh_system_user_create $app $final_path
+# 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
+
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Configuring NGINX web server..."
+
+# Create a dedicated NGINX config
+ynh_add_nginx_config
 
 #=================================================
 # SPECIFIC SETUP
@@ -98,58 +111,66 @@ ynh_use_logrotate
 #=================================================
 # INSTALL
 #=================================================
+ynh_script_progression --message="Installing The Lounge..."
 
-# Install dependencies and proceed with the installation
+pushd $final_path
-nodedir=$(ynh_get_nodejs_bindir $nodejs_version)
+	ynh_use_nodejs
-(cd $final_path && PATH=$nodedir:$PATH npm install --production > $install_log 2>&1)
+ 	ynh_exec_warn_less NODE_ENV=production npm install --production > $install_log 2>&1
+popd
 
 #=================================================
 # CONFIGURE
 #=================================================
+ynh_script_progression --message="Modifying a config file..."
 
-cp ../conf/app.json "$final_path/config/app.json"
+ynh_add_config --template="../conf/app.json" --destination="$final_path/config/app.json"
-ynh_replace_string "__DOMAIN__" "$domain" "$final_path/config/app.json"
+ynh_add_config --template="../conf/db.json" --destination="$final_path/config/db.json"
-
-cp ../conf/db.json "$final_path/config/db.json"
-
-ynh_store_file_checksum "$final_path/config/app.json"
-ynh_store_file_checksum "$final_path/config/db.json"
-
-#=================================================
-# SECURING FILES AND DIRECTORIES
-#=================================================
-
-# Set files ownership to etherpad
-chown -R $app: $final_path
-chmod 600 "$final_path/config/db.json"	# Restrict access to db.json
 
 #=================================================
 # SETUP SYSTEMD
 #=================================================
+ynh_script_progression --message="Configuring a systemd service..."
+
+ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service"
 
-#ynh_replace_string "__NODEJS__" "$nodejs_use_version" "../conf/systemd.service"
-ynh_replace_string "__NODE_DIR__" "$nodedir" "../conf/systemd.service"
-ynh_replace_string "__PORT__" "$port" "../conf/systemd.service"
-ynh_replace_string "__FINAL_PATH__" "$final_path" "../conf/systemd.service"
 ynh_add_systemd_config
 
 #=================================================
-# ENABLE SERVICE IN ADMIN PANEL
+# INTEGRATE SERVICE IN YUNOHOST
 #=================================================
+ynh_script_progression --message="Integrating service in YunoHost..."
 
-systemctl start $app.service
+yunohost service add $app --description="Manage employee absences" --log="/var/log/$app/$app.log"
-
-# Add service to YunoHost monitoring panel
-yunohost service add $app
 
 #=================================================
-# SETUP FAIL2BAN
+# START SYSTEMD SERVICE
 #=================================================
+ynh_script_progression --message="Starting a systemd service..."
 
-#ynh_add_fail2ban_config "/var/log/nginx/$domain-access.log" "<HOST> .* \"POST /mypads/api/auth/login HTTP/1.1\" 400" 5
+# Start a systemd service
+ynh_systemd_action --service_name=$app --action=start --log_path=systemd
+
+#=================================================
+# SETUP SSOWAT
+#=================================================
+ynh_script_progression --message="Configuring permissions..."
+
+# Make app public if necessary
+if [ $is_public -eq 1 ]
+then
+	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
+#=================================================
+
+ynh_script_progression --message="Installation of $app completed"
 
-systemctl reload nginx

scripts/remove

@@ -12,54 +12,57 @@ 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 domain)
+domain=$(ynh_app_setting_get --app=$app --key=domain)
-port=$(ynh_app_setting_get $app port)
+port=$(ynh_app_setting_get --app=$app --key=port)
-db_name=$(ynh_app_setting_get $app db_name)
 
 #=================================================
 # STANDARD REMOVE
 #=================================================
-# STOP AND REMOVE SERVICE
+# REMOVE SERVICE INTEGRATION IN YUNOHOST
 #=================================================
 
-ynh_remove_systemd_config
+# Remove the service from the list of services known by Yunohost (added from `yunohost service add`)
-
+if ynh_exec_warn_less yunohost service status $app >/dev/null
-#=================================================
-# DISABLE SERVICE IN ADMIN PANEL
-#=================================================
-
-if yunohost service status | grep -q $app	# Check if service is declared in YunoHost
 then
-	ynh_print_info "Remove $app service" >&2
+	ynh_script_progression --message="Removing $app service..."
 	yunohost service remove $app
 fi
 
 #=================================================
-# REMOVE NODEJS
+# STOP AND REMOVE SERVICE
 #=================================================
+ynh_script_progression --message="Stopping and removing the systemd service..."
 
+# Remove the dedicated systemd config
+ynh_remove_systemd_config
+
+#=================================================
+# REMOVE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Removing dependencies..."
+
+# Remove NodeJS
 ynh_remove_nodejs
 
 #=================================================
-# REMOVE THE SQL DB
+# REMOVE APP MAIN DIR
 #=================================================
+ynh_script_progression --message="Removing $app main directory..."
 
-ynh_mysql_remove_db $db_name $db_name	# Remove the database along with the associated user
+# Remove the app directory securely
+ynh_secure_remove --file="$final_path"
 
 #=================================================
-# REMOVE THE MAIN DIR OF THE APP
+# REMOVE NGINX CONFIGURATION
 #=================================================
+ynh_script_progression --message="Removing NGINX web server configuration..."
 
-ynh_secure_remove "/var/www/$app"	# Remove the app directory securely
+# Remove the dedicated NGINX config
-
+ynh_remove_nginx_config
-#=================================================
-# REMOVE THE NGINX CONFIGURATION
-#=================================================
-
-ynh_remove_nginx_config	# Remove the dedicated nginx config
 
 #=================================================
 # REMOVE THE LOGROTATE CONFIG
@@ -67,16 +70,19 @@ ynh_remove_nginx_config	# Remove the dedicated nginx config
 
 ynh_remove_logrotate	# Remove the app-specific logrotate config
 
-#=================================================
-# REMOVE FAIL2BAN CONFIGURATION
-#=================================================
-
-#ynh_remove_fail2ban_config
-
 #=================================================
 # 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
+#=================================================
+
+ynh_script_progression --message="Removal of $app completed"
 
-ynh_system_user_delete $app

scripts/restore

@@ -6,65 +6,72 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 
-if [ ! -e _common.sh ]; then
+source ../settings/scripts/_common.sh
-	# Get the _common.sh file if it's not in the current directory
-	cp ../settings/scripts/_common.sh ./_common.sh
-	chmod a+rx _common.sh
-fi
-source _common.sh
 source /usr/share/yunohost/helpers
-# Load common variables for all scripts.
-source ../settings/scripts/_variables
 
 #=================================================
 # MANAGE SCRIPT FAILURE
 #=================================================
 
-ynh_clean_setup () {
-# Nettoyage des résidus d'installation non pris en charge par le script remove.
-	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 settings..."
 
 app=$YNH_APP_INSTANCE_NAME
 
-domain=$(ynh_app_setting_get $app domain)
+domain=$(ynh_app_setting_get --app=$app --key=domain)
-path_url=$(ynh_app_setting_get $app path)
+path_url=$(ynh_app_setting_get --app=$app --key=path)
-final_path=$(ynh_app_setting_get $app final_path)
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
 #=================================================
+ynh_script_progression --message="Validating restoration parameters..."
 
-ynh_webpath_available $domain $path_url \
-	|| ynh_die "Path not available: ${domain}${path_url}"
 test ! -d $final_path \
-	|| ynh_die "There is already a directory: $final_path "
+	|| ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
-# STANDARD RESTORE STEPS
+# STANDARD RESTORATION STEPS
 #=================================================
-# RESTORE OF THE NGINX CONFIGURATION
+# RESTORE THE NGINX CONFIGURATION
 #=================================================
+ynh_script_progression --message="Restoring the NGINX configuration..."
 
-ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
 #=================================================
-# RESTORE OF THE MAIN DIR OF THE APP
+# CREATE DEDICATED USER
 #=================================================
+ynh_script_progression --message="Recreating the dedicated system user..."
 
-ynh_restore_file "$final_path"
+# Create a dedicated user (if not existing)
+ynh_system_user_create --username=$app --home_dir="$final_path"
 
 #=================================================
-# RECREATE THE DEDICATED USER
+# RESTORE THE APP MAIN DIR
 #=================================================
+ynh_script_progression --message="Restoring $app main directory..."
 
-ynh_system_user_create $app $final_path	# Recreate the dedicated user, if it doesn't exist
+ynh_restore_file --origin_path="$final_path"
+
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
+
+#=================================================
+# SPECIFIC RESTORATION
+#=================================================
+# REINSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Reinstalling dependencies..."
+
+# Install Nodejs
+ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
 #=================================================
 # SPECIFIC RESTORE
@@ -82,44 +89,39 @@ chown admin -R $install_log
 # Restore logrotate configuration
 ynh_restore_file "/etc/logrotate.d/$app"
 
-#=================================================
-# INSTALL NODEJS
-#=================================================
-
-ynh_install_nodejs $nodejs_version
-
-#=================================================
-# INSTALL DEPENDENCIES
-#=================================================
-nodedir=$(ynh_get_nodejs_bindir $nodejs_version)
-PATH=$nodedir:$PATH npm cache clean
-PATH=$nodedir:$PATH npm update
-
-#=================================================
-# ENABLE SERVICE IN ADMIN PANEL
-#=================================================
-
-yunohost service add $app --log "/var/log/$app/timeoff.log"
-
 #=================================================
 # RESTORE SYSTEMD
 #=================================================
+ynh_script_progression --message="Restoring the systemd configuration..."
 
-ynh_restore_file "/etc/systemd/system/$app.service"
+ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
-## Démarrage auto du service
+systemctl enable $app.service --quiet
-systemctl enable $app.service
-systemctl start $app.service
 
 #=================================================
-# RESTORE FAIL2BAN CONFIGURATION
+# INTEGRATE SERVICE IN YUNOHOST
 #=================================================
+ynh_script_progression --message="Integrating service in YunoHost..."
 
-# ynh_restore_file "/etc/fail2ban/jail.d/$app.conf"
+yunohost service add $app --description="Manage employee absences" --log="/var/log/$app/$app.log"
-# ynh_restore_file "/etc/fail2ban/filter.d/$app.conf"
-# systemctl restart fail2ban
 
+#=================================================
+# START SYSTEMD SERVICE
+#=================================================
+ynh_script_progression --message="Starting a systemd service..."
+
+ynh_systemd_action --service_name=$app --action=start --log_path=systemd
+
+#=================================================
+# GENERIC FINALIZATION
 #=================================================
 # RELOAD NGINX
 #=================================================
+ynh_script_progression --message="Reloading NGINX web server..."
 
-systemctl reload nginx
+ynh_systemd_action --service_name=nginx --action=reload
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Restoration completed for $app"

scripts/upgrade

@@ -1,46 +1,41 @@
 #!/bin/bash
 
 #=================================================
-# GENERIC STARTING
+# GENERIC START
 #=================================================
 # IMPORT GENERIC HELPERS
 #=================================================
 
 source _common.sh
 source /usr/share/yunohost/helpers
-# Load common variables for all scripts.
-source _variables
 
 #=================================================
 # LOAD SETTINGS
 #=================================================
+ynh_script_progression --message="Loading installation settings..."
 
 app=$YNH_APP_INSTANCE_NAME
 
-domain=$(ynh_app_setting_get $app domain)
+domain=$(ynh_app_setting_get --app=$app --key=domain)
-path_url=$(ynh_app_setting_get $app path)
+path_url=$(ynh_app_setting_get --app=$app --key=path)
-final_path=$(ynh_app_setting_get $app final_path)
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-port=$(ynh_app_setting_get $app port)
+port=$(ynh_app_setting_get --app=$app --key=port)
 
 #=================================================
 # CHECK VERSION
 #=================================================
 
-# Wait for etherpad to be fully started
+upgrade_type=$(ynh_check_app_version_changed)
-# ynh_check_starting "You can access your Etherpad instance at" "/var/log/$app/etherpad.log" "120"
-
-ynh_abort_if_up_to_date
 
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
+ynh_script_progression --message="Backing up the app before upgrading (may take a while)..."
 
 # Backup the current version of the app
 ynh_backup_before_upgrade
 ynh_clean_setup () {
-	# Cleanup installatioNettoyage des résidus d'installation non pris en charge par le script remove.
 	ynh_clean_check_starting
-
 	# restore it if the upgrade fails
 	ynh_restore_upgradebackup
 }
@@ -48,75 +43,86 @@ ynh_clean_setup () {
 ynh_abort_if_errors
 
 #=================================================
-# STOP ETHERPAD
+# ENSURE DOWNWARD COMPATIBILITY
 #=================================================
+ynh_script_progression --message="Ensuring downward compatibility..."
 
-systemctl stop $app
+# If final_path doesn't exist, create it
+if [ -z "$final_path" ]; then
+	final_path=/var/www/$app
+	ynh_app_setting_set --app=$app --key=final_path --value=$final_path
+fi
+
+# Cleaning legacy permissions
+if ynh_legacy_permissions_exists; then
+	ynh_legacy_permissions_delete_all
+
+	ynh_app_setting_delete --app=$app --key=is_public
+fi
 
 #=================================================
 # STANDARD UPGRADE STEPS
+#=================================================
+# STOP SYSTEMD SERVICE
+#=================================================
+ynh_script_progression --message="Stopping a systemd service..."
+
+ynh_systemd_action --service_name=$app --action=stop --log_path=systemd
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 
-ynh_setup_source "$final_path"	# Download, check integrity and uncompress the source from app.src
+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
+
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:www-data "$final_path"
 
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
+ynh_script_progression --message="Upgrading NGINX web server configuration..."
 
-ynh_replace_string "__PATH__/" "${path_url%/}/" "../conf/nginx.conf"
+# Create a dedicated NGINX config
 ynh_add_nginx_config
 
 #=================================================
-# UPGRADE NODEJS
+# UPGRADE DEPENDENCIES
 #=================================================
+ynh_script_progression --message="Upgrading dependencies..."
 
-ynh_install_nodejs $nodejs_version
+# Install Nodejs
+ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 
 #=================================================
 # UPGRADE NPM MODULES
 #=================================================
-nodedir=$(ynh_get_nodejs_bindir $nodejs_version)
+
-PATH=$nodedir:$PATH npm cache clean
+if [ "$upgrade_type" == "UPGRADE_APP" ]
-PATH=$nodedir:$PATH npm update
+then
+	ynh_script_progression --message="Upgrading the lounge..."
+	pushd $final_path
+		ynh_use_nodejs
+		ynh_exec_warn_less NODE_ENV=production npm cache clean
+		ynh_exec_warn_less NODE_ENV=production npm update
+	popd
+fi
 
 #=================================================
-# SPECIFIC UPGRADE
+# CONFIGURE
 #=================================================
-# CONFIGURE ETHERPAD
+ynh_script_progression --message="Modifying a config file..."
-#=================================================
-ynh_backup_if_checksum_is_different "$final_path/config/app.json"
-ynh_backup_if_checksum_is_different "$final_path/config/db.json"
 
-cp ../conf/app.json "$final_path/config/app.json"
+ynh_add_config --template="../conf/app.json" --destination="$final_path/config/app.json"
-ynh_replace_string "__DOMAIN__" "$domain" "$final_path/config/app.json"
+ynh_add_config --template="../conf/db.json" --destination="$final_path/config/db.json"
-
-cp ../conf/db.json "$final_path/config/db.json"
-
-ynh_store_file_checksum "$final_path/config/app.json"
-ynh_store_file_checksum "$final_path/config/db.json"
-
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-
-ynh_system_user_create $app $final_path	# Create the dedicated user, if it doesn't exist
-
-#=================================================
-# SECURING FILES AND DIRECTORIES
-#=================================================
-
-# Set files ownership to etherpad
-chown -R $app: $final_path
-chmod 600 "$final_path/config/db.json"	# Restrict access to credentials.json
-chown $app -R /var/log/$app/timeoff.log
-
-#=================================================
-# UPGRADE FAIL2BAN
-#=================================================
-
-# ynh_add_fail2ban_config "/var/log/nginx/$domain-access.log" "<HOST> .* \"POST /mypads/api/auth/login HTTP/1.1\" 400" 5
 
 #=================================================
 # SETUP LOGROTATE
@@ -127,17 +133,37 @@ ynh_use_logrotate --non-append
 #=================================================
 # SETUP SYSTEMD
 #=================================================
+ynh_script_progression --message="Upgrading systemd configuration..."
+
+ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file="../conf/systemd.service"
 
-ynh_replace_string "__NODEJS__" "$nodejs_use_version" "../conf/systemd.service"
-ynh_replace_string "__ENV_PATH__" "$PATH" "../conf/systemd.service"
-ynh_replace_string "__PORT__" "$port" "../conf/systemd.service"
-ynh_replace_string "__FINAL_PATH__" "$final_path" "../conf/systemd.service"
 ynh_add_systemd_config
 
-systemctl restart $app.service
+#=================================================
+# GENERIC FINALIZATION
+#=================================================
+# SECURE FILES AND DIRECTORIES
+#=================================================
+ynh_script_progression --message="Integrating service in YunoHost..."
+
+yunohost service add $app --description="Client Web IRC" --log="/var/log/$app/$app.log"
+
+#=================================================
+# START SYSTEMD SERVICE
+#=================================================
+ynh_script_progression --message="Starting a systemd service..."
+
+ynh_systemd_action --service_name=$app --action=start --log_path=systemd
 
 #=================================================
 # RELOAD NGINX
 #=================================================
+ynh_script_progression --message="Reloading NGINX web server..."
 
-systemctl reload nginx
+ynh_systemd_action --service_name=nginx --action=reload
+
+#=================================================
+# END OF SCRIPT
+#=================================================
+
+ynh_script_progression --message="Upgrade of $app completed"