From 396e9b4191802fc487905959d596343df7b425c5 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 18 Dec 2021 13:56:39 +0100 Subject: [PATCH] Move app data directory to /home/yunohost.app --- check_process | 8 ++++---- manifest.json | 2 +- scripts/backup | 7 +++++++ scripts/install | 18 +++++++++++++----- scripts/remove | 9 +++++++++ scripts/restore | 17 ++++++++++++++++- scripts/upgrade | 18 +++++++++++++++--- 7 files changed, 65 insertions(+), 14 deletions(-) diff --git a/check_process b/check_process index 1ba2470..d804bfb 100644 --- a/check_process +++ b/check_process @@ -16,7 +16,7 @@ setup_private=1 setup_public=1 upgrade=1 - #upgrade=1 from_commit=CommitHash + upgrade=1 from_commit=e0fcbf74138612f466fe0ce735060394245d8bb5 backup_restore=1 multi_instance=1 port_already_use=0 @@ -25,6 +25,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1& + ; commit=e0fcbf74138612f466fe0ce735060394245d8bb5 + name=2021-09-30 0.1.1.875~ynh1 + manifest_arg=domain=DOMAIN&path=PATH&admin=USER& diff --git a/manifest.json b/manifest.json index f4b20d8..093db56 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Complete management of your indexers for Radarr, Sonarr, Lidarr, ...", "fr": "Gestion complète de vos indexeurs pour Radarr, Sonarr, Lidarr, ..." }, - "version": "0.1.1.875~ynh1", + "version": "0.1.1.875~ynh2", "url": "https://prowlarr.com", "upstream": { "license": "GPL-3.0-only", diff --git a/scripts/backup b/scripts/backup index 0670178..8555a32 100755 --- a/scripts/backup +++ b/scripts/backup @@ -29,6 +29,7 @@ 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) #================================================= @@ -47,6 +48,12 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$final_path" +#================================================= +# BACKUP THE APP DATA DIR +#================================================= + +ynh_backup --src_path="$data_path" + #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= diff --git a/scripts/install b/scripts/install index 4b2d2bf..029f01c 100755 --- a/scripts/install +++ b/scripts/install @@ -36,7 +36,10 @@ app=$YNH_APP_INSTANCE_NAME 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" +test ! -e "$final_path" || ynh_die --message="Installation path ($final_path) already exists" + +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 @@ -87,7 +90,8 @@ 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="app.$architecture" -mkdir -p "$final_path/.data/logs" +ynh_app_setting_set --app=$app --key=data_path --value=$data_path +mkdir -p "$data_path/logs" #================================================= # NGINX CONFIGURATION @@ -115,7 +119,7 @@ ynh_script_progression --message="Configuring Prowlarr..." --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="$final_path/.data/config.xml" +ynh_add_config --template="../conf/config.xml" --destination="$data_path/config.xml" #================================================= # SETUP FILE PERMISSIONS @@ -126,6 +130,10 @@ 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" + #================================================= # YUNOHOST MULTIMEDIA INTEGRATION #================================================= @@ -145,14 +153,14 @@ ynh_script_progression --message="Configuring log rotation..." --weight=1 # Use logrotate to manage application logfile(s) ynh_use_logrotate -ynh_use_logrotate --logfile="$final_path/.data/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="Prowlarr daemon" --log="$final_path/.data/logs/prowlarr.txt" +yunohost service add $app --description="Prowlarr daemon" --log="$data_path/logs/prowlarr.txt" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/remove b/scripts/remove index 6a5a83e..582f1c6 100755 --- a/scripts/remove +++ b/scripts/remove @@ -19,6 +19,7 @@ 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 @@ -57,6 +58,14 @@ 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" + #================================================= # REMOVE NGINX CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index 41ea82a..b8e9be7 100755 --- a/scripts/restore +++ b/scripts/restore @@ -31,6 +31,7 @@ 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 @@ -40,6 +41,9 @@ ynh_script_progression --message="Validating restoration parameters..." --weight 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 #================================================= @@ -68,6 +72,17 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app: "$final_path" +#================================================= +# RESTORE THE APP DATA DIR +#================================================= +ynh_script_progression --message="Restoring the app data directory..." --weight=2 + +ynh_restore_file --origin_path="$data_path" + +chmod 750 "$data_path" +chmod -R o-rwx "$data_path" +chown -R $app: "$data_path" + #================================================= # YUNOHOST MULTIMEDIA INTEGRATION #================================================= @@ -101,7 +116,7 @@ systemctl enable $app.service --quiet #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description="Prowlarr daemon" --log="$final_path/.data/logs/prowlarr.txt" +yunohost service add $app --description="Prowlarr daemon" --log="$data_path/logs/prowlarr.txt" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index c49fce1..2bea658 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -21,6 +21,7 @@ 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) #================================================= # CHECK VERSION @@ -67,6 +68,13 @@ 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=$daya_path + mv "$final_path/.data" "/home/yunohost.app/$app" +fi + #================================================= # CREATE DEDICATED USER #================================================= @@ -89,11 +97,15 @@ then ynh_setup_source --dest_dir="$final_path" --source_id="app.$architecture" fi -mkdir -p "$final_path/.data/logs" chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app: "$final_path" +mkdir -p "$data_path/logs" +chmod 750 "$data_path" +chmod -R o-rwx "$data_path" +chown -R $app: "$data_path" + #================================================= # NGINX CONFIGURATION #================================================= @@ -128,14 +140,14 @@ ynh_script_progression --message="Upgrading logrotate configuration..." --weight # Use logrotate to manage app-specific logfile(s) ynh_use_logrotate --non-append -ynh_use_logrotate --non-append --logfile="$final_path/.data/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="Prowlarr daemon" --log="$final_path/.data/logs/prowlarr.txt" +yunohost service add $app --description="Prowlarr daemon" --log="$data_path/logs/prowlarr.txt" #================================================= # START SYSTEMD SERVICE