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

Version 2

README.md

@@ -24,13 +24,6 @@ Music collection manager for Usenet and BitTorrent users
 
 ![Screenshot of Lidarr](./doc/screenshots/screenshot.jpg)
 
-## Disclaimers / important information
-
-* Supported architectures are `arm`, `arm64`, and `amd64`
-* Access control is done with YunoHost's permissions system.
-  * API (`domain.tld/path/api`) can be accessed by visitors to allow control by remote clients.
-* The app uses YunoHost's multimedia directories, hence it has write access to users' and shared directories in `/home/yunohost.multimedia`. After installation, you can choose these directories to store your media.
-
 ## Documentation and resources
 
 * Official app website: <https://lidarr.audio>

README_fr.md

@@ -16,7 +16,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 ## Vue d’ensemble
 
-Gestionnaire de discothèque pour utilisateurs de Usenet et BitTorrent
+Music collection manager for Usenet and BitTorrent users
 
 **Version incluse :** 1.0.2.2592~ynh2
 
@@ -24,13 +24,6 @@ Gestionnaire de discothèque pour utilisateurs de Usenet et BitTorrent
 
 ![Capture d’écran de Lidarr](./doc/screenshots/screenshot.jpg)
 
-## Avertissements / informations importantes
-
-* Les architectures compatibles sont `arm`, `arm64`, et `amd64`
-* Le contrôle de l'accès se fait avec le système de permissions de YunoHost.
-  * L'API (`domain.tld/path/api`) est accessible aux visiteurs pour permettre le contrôle via des clients externes.
-* L'application utilise les dossiers multimédia de YunoHost, elle a donc accès en écriture aux dossiers utilisateurs et communs de `/home/yunohost.multimedia`. Après installation, vous pourrez choisir ces dossiers pour y stocker vos médias.
-
 ## Documentations et ressources
 
 * Site officiel de l’app : <https://lidarr.audio>

check_process

@@ -1,24 +0,0 @@
-;; Test complet
-	; Manifest
-		domain="domain.tld"
-		path="/path"
-		admin="john"
-	; Checks
-		pkg_linter=1
-		setup_sub_dir=1
-		setup_root=1
-		setup_nourl=0
-		setup_private=1
-		setup_public=1
-		upgrade=1
-		upgrade=1	from_commit=cd2f91ab84cef8c143ee1f3f05c82691bce17726
-		backup_restore=1
-		multi_instance=1
-		change_url=1
-;;; Options
-Email=
-Notification=none
-;;; Upgrade options
-	; commit=CommitHash
-		name=2021-12-02 v0.8.1.2135
-		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&

conf/amd64.src

@@ -1,7 +0,0 @@
-SOURCE_URL=https://github.com/Lidarr/Lidarr/releases/download/v1.0.2.2592/Lidarr.master.1.0.2.2592.linux-core-x64.tar.gz
-SOURCE_SUM=8ae236e204fbfd1159f7173872c77ecd61333d23ecc6a618e45fbbf085918f14
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_EXTRACT=true
-SOURCE_FILENAME=lidarr.tar.gz

conf/arm64.src

@@ -1,7 +0,0 @@
-SOURCE_URL=https://github.com/Lidarr/Lidarr/releases/download/v1.0.2.2592/Lidarr.master.1.0.2.2592.linux-core-arm64.tar.gz
-SOURCE_SUM=c870286712de285ea6951fc0bf4107d0b8765eab8cf55c7a86e3434c4b38c325
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_EXTRACT=true
-SOURCE_FILENAME=lidarr.tar.gz

conf/armhf.src

@@ -1,7 +0,0 @@
-SOURCE_URL=https://github.com/Lidarr/Lidarr/releases/download/v1.0.2.2592/Lidarr.master.1.0.2.2592.linux-core-arm.tar.gz
-SOURCE_SUM=dc59225da4490b40bea386d5ec5a305d43706447dbfea05f84505bc21b4425e5
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_EXTRACT=true
-SOURCE_FILENAME=lidarr.tar.gz

conf/i386.src

@@ -1,7 +0,0 @@
-SOURCE_URL=https://github.com/Lidarr/Lidarr/releases/download/v1.0.2.2592/Lidarr.master.1.0.2.2592.linux-core-x86.tar.gz
-SOURCE_SUM=4e0a3828f9479c9b99210536903660839f38e5dd2764514d69b9661e0d087d00
-SOURCE_SUM_PRG=sha256sum
-SOURCE_FORMAT=tar.gz
-SOURCE_IN_SUBDIR=true
-SOURCE_EXTRACT=true
-SOURCE_FILENAME=lidarr.tar.gz

conf/nginx.conf

@@ -9,6 +9,7 @@ location __PATH__ {
   proxy_no_cache $cookie_session;
   proxy_set_header Upgrade $http_upgrade;
   proxy_set_header Connection $http_connection;
+  
   # Allow the Lidarr API
   location __PATH__/api {
     auth_request off;

conf/systemd.service

@@ -6,8 +6,8 @@ After=syslog.target network.target
 Type=simple
 User=__APP__
 Group=__APP__
-WorkingDirectory=__FINALPATH__/
+WorkingDirectory=__INSTALL_DIR__/
-ExecStart=__FINALPATH__/Lidarr -nobrowser -data=__DATA_PATH__
+ExecStart=__INSTALL_DIR__/Lidarr -nobrowser -data=__DATA_DIR__
 
 TimeoutStopSec=20
 KillMode=process

doc/ADMIN.md

@@ -1,4 +1,3 @@
-* Supported architectures are `arm`, `arm64`, and `amd64`
 * Access control is done with YunoHost's permissions system.
-  * API (`domain.tld/path/api`) can be accessed by visitors to allow control by remote clients.
+  * API (`__DOMAIN__/path/api`) can be accessed by visitors to allow control by remote clients.
 * The app uses YunoHost's multimedia directories, hence it has write access to users' and shared directories in `/home/yunohost.multimedia`. After installation, you can choose these directories to store your media.

doc/ADMIN_fr.md

@@ -1,4 +1,3 @@
-* Les architectures compatibles sont `arm`, `arm64`, et `amd64`
 * Le contrôle de l'accès se fait avec le système de permissions de YunoHost.
-  * L'API (`domain.tld/path/api`) est accessible aux visiteurs pour permettre le contrôle via des clients externes.
+  * L'API (`__DOMAIN__/path/api`) est accessible aux visiteurs pour permettre le contrôle via des clients externes.
 * L'application utilise les dossiers multimédia de YunoHost, elle a donc accès en écriture aux dossiers utilisateurs et communs de `/home/yunohost.multimedia`. Après installation, vous pourrez choisir ces dossiers pour y stocker vos médias.

doc/DESCRIPTION.md

@@ -0,0 +1 @@
+Music collection manager for Usenet and BitTorrent users

manifest.json

@@ -1,49 +0,0 @@
-{
-    "name": "Lidarr",
-    "id": "lidarr",
-    "packaging_format": 1,
-    "description": {
-        "en": "Music collection manager for Usenet and BitTorrent users",
-        "fr": "Gestionnaire de discothèque pour utilisateurs de Usenet et BitTorrent"
-    },
-    "version": "1.0.2.2592~ynh2",
-    "url": "https://lidarr.audio",
-    "upstream": {
-        "license": "GPL-3.0-only",
-        "website": "https://lidarr.audio",
-        "admindoc": "https://wiki.servarr.com/Lidarr",
-        "code": "https://github.com/Lidarr/Lidarr"
-    },
-    "license": "GPL-3.0-only",
-    "maintainer": {
-        "name": "tituspijean",
-        "email": "tituspijean@outlook.com"
-    },
-    "requirements": {
-        "yunohost": ">= 4.3.0"
-    },
-    "multi_instance": true,
-    "services": [
-        "nginx",
-        "php7.3-fpm",
-        "mysql"
-    ],
-    "arguments": {
-        "install": [
-            {
-                "name": "domain",
-                "type": "domain"
-            },
-            {
-                "name": "path",
-                "type": "path",
-                "example": "/lidarr",
-                "default": "/lidarr"
-            },
-            {
-                "name": "admin",
-                "type": "user"
-            }
-        ]
-    }
-}

manifest.toml

@@ -0,0 +1,66 @@
+packaging_format = 2
+
+id = "lidarr"
+name = "Lidarr"
+description.en = "Music collection manager for Usenet and BitTorrent users"
+description.fr = "Gestionnaire de discothèque pour utilisateurs de Usenet et BitTorrent"
+
+version = "1.0.2.2592~ynh2"
+
+maintainers = ["tituspijean"]
+
+[upstream]
+license = "GPL-3.0-only"
+website = "https://lidarr.audio"
+admindoc = "https://wiki.servarr.com/Lidarr"
+code = "https://github.com/Lidarr/Lidarr"
+
+[integration]
+yunohost = ">= 11.1.15"
+architectures = "all"
+multi_instance = true
+ldap = false
+sso = false
+disk = "50M"
+ram.build = "50M"
+ram.runtime = "50M"
+
+[install]
+    [install.domain]
+    type = "domain"
+
+    [install.path]
+    type = "path"
+    default = "/lidarr"
+
+    [install.admin]
+    type = "user"
+
+[resources]
+        [resources.sources.main]
+        arm64.url = "https://github.com/Lidarr/Lidarr/releases/download/v1.0.2.2592/Lidarr.master.1.0.2.2592.linux-core-arm64.tar.gz"
+        arm64.sha256 = "c870286712de285ea6951fc0bf4107d0b8765eab8cf55c7a86e3434c4b38c325"
+        amd64.url = "https://github.com/Lidarr/Lidarr/releases/download/v1.0.2.2592/Lidarr.master.1.0.2.2592.linux-core-x64.tar.gz"
+        amd64.sha256 = "8ae236e204fbfd1159f7173872c77ecd61333d23ecc6a618e45fbbf085918f14"
+        armhf.url = "https://github.com/Lidarr/Lidarr/releases/download/v1.0.2.2592/Lidarr.master.1.0.2.2592.linux-core-arm.tar.gz"
+        armhf.sha256 = "dc59225da4490b40bea386d5ec5a305d43706447dbfea05f84505bc21b4425e5"
+        i386.url = "https://github.com/Lidarr/Lidarr/releases/download/v1.0.2.2592/Lidarr.master.1.0.2.2592.linux-core-x86.tar.gz"
+        i386.sha256 = "4e0a3828f9479c9b99210536903660839f38e5dd2764514d69b9661e0d087d00"
+
+    [resources.ports]
+
+    [resources.system_user]
+
+    [resources.install_dir]
+
+    [resources.data_dir]
+
+    [resources.permissions]
+    main.url = "/"
+    api.main.url = "/api"
+    api.allowed = "visitors"
+    api.show_tile = false
+    api.protected = true
+
+    [resources.apt]
+    packages = "curl mediainfo sqlite3"

scripts/_common.sh

@@ -4,9 +4,6 @@
 # COMMON VARIABLES
 #=================================================
 
-# dependencies used by the app
-pkg_dependencies="curl mediainfo sqlite3"
-
 #=================================================
 # PERSONAL HELPERS
 #=================================================

scripts/backup

@@ -10,28 +10,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	### Remove this function if there's nothing to clean before calling the remove script.
-	true
-}
-# 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)
-data_path=$(ynh_app_setting_get --app=$app --key=data_path)
-domain=$(ynh_app_setting_get --app=$app --key=domain)
-
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
 #=================================================
@@ -41,13 +19,13 @@ 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 APP DATA DIR
 #=================================================
 
-ynh_backup --src_path="$data_path"
+ynh_backup --src_path="$data_dir"
 
 #=================================================
 # BACKUP THE NGINX CONFIGURATION

scripts/change_url

@@ -9,62 +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)
-data_path=$(ynh_app_setting_get --app=$app --key=data_path)
-port=$(ynh_app_setting_get --app=$app --key=port)
-api_key=$(ynh_app_setting_get --app=$app --key=api_key)
-
-#=================================================
-# 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
 #=================================================
@@ -79,34 +23,7 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
 #=================================================
 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"
-	path="$new_path"
-	# Create a dedicated NGINX config
-	ynh_add_nginx_config
-else
-	path_url="$old_path"
-	path="$old_path"
-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"
-	domain="$new_domain"
-fi
 
 #=================================================
 # SPECIFIC MODIFICATIONS
@@ -114,11 +31,11 @@ fi
 # UPDATE CONFIGURATION FILE
 #=================================================
 
-ynh_add_config --template="../conf/config.xml" --destination="$data_path/config.xml"
+ynh_add_config --template="../conf/config.xml" --destination="$data_dir/config.xml"
 
-chmod 750 "$data_path/config.xml"
+chmod 750 "$data_dir/config.xml"
-chmod o-rwx "$data_path/config.xml"
+chmod o-rwx "$data_dir/config.xml"
-chown $app "$data_path/config.xml"
+chown $app "$data_dir/config.xml"
 
 #=================================================
 # GENERIC FINALISATION
@@ -129,13 +46,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Application started"
 
-#=================================================
-# 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,88 +9,19 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	### Remove this function if there's nothing to clean before calling the remove script.
-	true
-}
-# 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
-admin=$YNH_APP_ARG_ADMIN
-architecture=$YNH_ARCH
-
-app=$YNH_APP_INSTANCE_NAME
-
-#=================================================
-# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
-#=================================================
-ynh_script_progression --message="Validating installation parameters..." --weight=1
-
-final_path=/opt/yunohost/$app
-test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
-
-data_path=/home/yunohost.app/$app
-test ! -e "$data_path" || ynh_die --message="Data directory ($data_path) already exists"
-
-# 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..." --weight=1
-
-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=admin --value=$admin
-
-#=================================================
-# STANDARD MODIFICATIONS
-#=================================================
-# FIND AND OPEN A PORT
-#=================================================
-ynh_script_progression --message="Finding an available port..." --weight=1
-
-# Find an available port
-port=$(ynh_find_port --port=8095)
-ynh_app_setting_set --app=$app --key=port --value=$port
-
-#=================================================
-# INSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Installing dependencies..." --weight=4
-
-ynh_install_app_dependencies $pkg_dependencies
-
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Configuring system user..." --weight=1
-
-# 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..." --weight=3
 
-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" --source_id="$architecture"
+ynh_setup_source --dest_dir="$install_dir" 
 
-ynh_app_setting_set --app=$app --key=data_path --value=$data_path
+mkdir -p "$data_dir/logs"
-mkdir -p "$data_path/logs"
+
+chmod 750 "$install_dir"
+chmod -R o-rwx "$install_dir"
+chown -R $app: "$install_dir"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -118,23 +49,10 @@ ynh_script_progression --message="Configuring Lidarr..." --weight=2
 api_key=$(ynh_string_random --length=32)
 ynh_app_setting_set --app=$app --key=api_key --value=$api_key
 
-ynh_add_config --template="../conf/config.xml" --destination="$data_path/config.xml"
+ynh_add_config --template="../conf/config.xml" --destination="$data_dir/config.xml"
 
-#=================================================
+chmod 400 "$data_dir/config.xml"
-# SETUP FILE PERMISSIONS
+chown $app:$app "$data_dir/config.xml"
-#=================================================
-ynh_script_progression --message="Setting files permissions and ownership..." --weight=1
-
-chmod 750 "$final_path"
-chmod -R o-rwx "$final_path"
-chown -R $app: "$final_path"
-
-chmod 750 "$data_path"
-chmod -R o-rwx "$data_path"
-chown -R $app: "$data_path"
-
-chmod 400 "$data_path/config.xml"
-chown $app:$app "$data_path/config.xml"
 
 #=================================================
 # YUNOHOST MULTIMEDIA INTEGRATION
@@ -154,15 +72,14 @@ ynh_multimedia_addaccess $app
 ynh_script_progression --message="Configuring log rotation..." --weight=1
 
 # Use logrotate to manage application logfile(s)
-ynh_use_logrotate
+ynh_use_logrotate --logfile="$data_dir/logs"
-ynh_use_logrotate --logfile="$data_path/logs"
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description="Lidarr daemon" --log="$data_path/logs/lidarr.txt"
+yunohost service add $app --description="Lidarr daemon" --log="$data_dir/logs/lidarr.txt"
 
 #=================================================
 # START SYSTEMD SERVICE
@@ -172,22 +89,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=2
 # Start a systemd service
 ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Application started"
 
-#=================================================
-# SETUP SSOWAT
-#=================================================
-ynh_script_progression --message="Configuring permissions..." --weight=1
-
-ynh_permission_update --permission="main" --add="$admin" --remove="all_users"
-
-ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true"
-
-#=================================================
-# RELOAD NGINX
-#=================================================
-ynh_script_progression --message="Reloading NGINX web server..." --weight=1
-
-ynh_systemd_action --service_name=nginx --action=reload
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/remove

@@ -9,18 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# 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)
-port=$(ynh_app_setting_get --app=$app --key=port)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-data_path=$(ynh_app_setting_get --app=$app --key=data_path)
-
 #=================================================
 # STANDARD REMOVE
 #=================================================
@@ -42,29 +30,13 @@ 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..." --weight=3
-
-# Remove metapackage and its dependencies
-ynh_remove_app_dependencies
-
-#=================================================
-# REMOVE APP MAIN DIR
-#=================================================
-ynh_script_progression --message="Removing app main directory..." --weight=1
-
-# Remove the app directory securely
-ynh_secure_remove --file="$final_path"
-
 #=================================================
 # REMOVE APP DATA DIR
 #=================================================
 ynh_script_progression --message="Removing app data directory..." --weight=1
 
 # Remove the app directory securely
-ynh_secure_remove --file="$data_path"
+ynh_secure_remove --file="$data_dir"
 
 #=================================================
 # REMOVE NGINX CONFIGURATION
@@ -92,16 +64,6 @@ ynh_script_progression --message="Removing various files..." --weight=1
 # Remove the log files
 ynh_secure_remove --file="/var/log/$app"
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# REMOVE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Removing the dedicated system user..." --weight=1
-
-# Delete a system user
-ynh_system_user_delete --username=$app
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/restore

@@ -10,39 +10,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# MANAGE SCRIPT FAILURE
-#=================================================
-
-ynh_clean_setup () {
-	#### Remove this function if there's nothing to clean before calling the remove script.
-	true
-}
-# 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)
-data_path=$(ynh_app_setting_get --app=$app --key=data_path)
-
-#=================================================
-# 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 "
-
-
-test ! -d $data_path || ynh_die --message="There is already a directory: $data_path "
-
 #=================================================
 # STANDARD RESTORATION STEPS
 #=================================================
@@ -52,38 +19,30 @@ ynh_script_progression --message="Restoring the NGINX configuration..." --weight
 
 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..." --weight=2
 
-ynh_restore_file --origin_path="$final_path"
+ynh_restore_file --origin_path="$install_dir"
 
-chmod 750 "$final_path"
+chmod 750 "$install_dir"
-chmod -R o-rwx "$final_path"
+chmod -R o-rwx "$install_dir"
-chown -R $app: "$final_path"
+chown -R $app: "$install_dir"
 
 #=================================================
 # RESTORE THE APP DATA DIR
 #=================================================
 ynh_script_progression --message="Restoring the app data directory..." --weight=2
 
-ynh_restore_file --origin_path="$data_path"
+ynh_restore_file --origin_path="$data_dir"
 
-chmod 750 "$data_path"
+chmod 750 "$data_dir"
-chmod -R o-rwx "$data_path"
+chmod -R o-rwx "$data_dir"
-chown -R $app: "$data_path"
+chown -R $app: "$data_dir"
 
-chmod 400 "$data_path/config.xml"
+chmod 400 "$data_dir/config.xml"
-chown $app:$app "$data_path/config.xml"
+chown $app:$app "$data_dir/config.xml"
 
 #=================================================
 # YUNOHOST MULTIMEDIA INTEGRATION
@@ -95,16 +54,6 @@ ynh_multimedia_build_main_dir
 # Enable writing into these directories
 ynh_multimedia_addaccess $app
 
-#=================================================
-# SPECIFIC RESTORATION
-#=================================================
-# REINSTALL DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Reinstalling dependencies..." --weight=4
-
-# Define and install dependencies
-ynh_install_app_dependencies $pkg_dependencies
-
 #=================================================
 # RESTORE SYSTEMD
 #=================================================
@@ -118,7 +67,7 @@ systemctl enable $app.service --quiet
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description="Lidarr daemon" --log="$data_path/logs/lidarr.txt"
+yunohost service add $app --description="Lidarr daemon" --log="$data_dir/logs/lidarr.txt"
 
 #=================================================
 # START SYSTEMD SERVICE

scripts/upgrade

@@ -9,42 +9,12 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# 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)
-admin=$(ynh_app_setting_get --app=$app --key=admin)
-port=$(ynh_app_setting_get --app=$app --key=port)
-final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-data_path=$(ynh_app_setting_get --app=$app --key=data_path)
-api_key=$(ynh_app_setting_get --app=$app --key=api_key)
-architecture=$YNH_ARCH
-
 #=================================================
 # CHECK 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=4
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-	# 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
 #=================================================
@@ -54,31 +24,6 @@ ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
 ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
 
-#=================================================
-# ENSURE DOWNWARD COMPATIBILITY
-#=================================================
-ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
-
-# Create a permission if needed
-if ! ynh_permission_exists --permission="api"; then
-	ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true"
-fi
-
-# Move data directory if needed
-if [ -z "$data_path" ]; then
-	data_path=/home/yunohost.app/$app
-	ynh_app_setting_set --app=$app --key=data_path --value=$data_path
-	mv "$final_path/.data" "/home/yunohost.app/$app"
-fi
-
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
-
-# Create a dedicated user (if not existing)
-ynh_system_user_create --username=$app --home_dir="$final_path"
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -88,17 +33,12 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=3
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --source_id="$architecture"
+	ynh_setup_source --dest_dir="$install_dir" 
 fi
 
-chmod 750 "$final_path"
+chmod 750 "$install_dir"
-chmod -R o-rwx "$final_path"
+chmod -R o-rwx "$install_dir"
-chown -R $app: "$final_path"
+chown -R $app: "$install_dir"
-
-mkdir -p "$data_path/logs"
-chmod 750 "$data_path"
-chmod -R o-rwx "$data_path"
-chown -R $app: "$data_path"
 
 #=================================================
 # NGINX CONFIGURATION
@@ -108,13 +48,6 @@ 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=4
-
-ynh_install_app_dependencies $pkg_dependencies
-
 #=================================================
 # SPECIFIC UPGRADE
 #=================================================
@@ -130,10 +63,10 @@ ynh_add_systemd_config
 #=================================================
 ynh_script_progression --message="Updating the configuration file.." --weight=1
 
-ynh_add_config --template="../conf/config.xml" --destination="$data_path/config.xml"
+ynh_add_config --template="../conf/config.xml" --destination="$data_dir/config.xml"
 
-chmod 400 "$data_path/config.xml"
+chmod 400 "$data_dir/config.xml"
-chown $app:$app "$data_path/config.xml"
+chown $app:$app "$data_dir/config.xml"
 
 #=================================================
 # GENERIC FINALIZATION
@@ -143,15 +76,14 @@ chown $app:$app "$data_path/config.xml"
 ynh_script_progression --message="Upgrading logrotate configuration..." --weight=1
 
 # Use logrotate to manage app-specific logfile(s)
-ynh_use_logrotate --non-append
+ynh_use_logrotate --non-append --logfile="$data_dir/logs"
-ynh_use_logrotate --non-append --logfile="$data_path/logs"
 
 #=================================================
 # INTEGRATE SERVICE IN YUNOHOST
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description="Lidarr daemon" --log="$data_path/logs/lidarr.txt"
+yunohost service add $app --description="Lidarr daemon" --log="$data_dir/logs/lidarr.txt"
 
 #=================================================
 # START SYSTEMD SERVICE
@@ -160,13 +92,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=2
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Application started"
 
-#=================================================
-# 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,5 @@
+test_format = 1.0
+
+[default]
+
+    test_upgrade_from.cd2f91ab.name = "Upgrade from 0.8.1.2135"