From 0effb97402f8d87011684cac13aae65bd7bc0653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 12 Jun 2023 16:20:54 +0200 Subject: [PATCH] cleaning --- check_process | 27 --------------------------- manifest.toml | 3 ++- scripts/remove | 22 ---------------------- scripts/restore | 17 ----------------- scripts/upgrade | 1 - 5 files changed, 2 insertions(+), 68 deletions(-) delete mode 100644 check_process diff --git a/check_process b/check_process deleted file mode 100644 index c17c745..0000000 --- a/check_process +++ /dev/null @@ -1,27 +0,0 @@ -;; Test complet - ; Manifest - domain="domain.tld" - path="/path" - is_public=1 - admin="john" - ; Checks - pkg_linter=1 - setup_sub_dir=1 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - # 10.6.2~ynh3 - upgrade=1 from_commit=6ca76697a8f8da7419eb490aa435649f1b9d96c2 - backup_restore=1 - multi_instance=1 - port_already_use=0 - change_url=1 -;;; Options -Email= -Notification=none -;;; Upgrade options - ; commit=6ca76697a8f8da7419eb490aa435649f1b9d96c2 - name=10.6.2~ynh3 - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& diff --git a/manifest.toml b/manifest.toml index 406f880..399dabb 100644 --- a/manifest.toml +++ b/manifest.toml @@ -15,7 +15,7 @@ admindoc = "https://airsonic.github.io/docs/" code = "https://github.com/airsonic-advanced/airsonic-advanced" [integration] -yunohost = ">= 11.1.17" +yunohost = ">= 11.1.20" architectures = "all" multi_instance = true ldap = true @@ -54,6 +54,7 @@ ram.runtime = "50M" [resources.install_dir] [resources.data_dir] + subdirs =["Podcasts", "Playlists"] [resources.permissions] main.url = "/" diff --git a/scripts/remove b/scripts/remove index da07c96..8bd9e98 100644 --- a/scripts/remove +++ b/scripts/remove @@ -22,37 +22,15 @@ then yunohost service remove $app fi -#================================================= -# STOP AND REMOVE SERVICE -#================================================= -ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1 - # Remove the dedicated systemd config ynh_remove_systemd_config -#================================================= -# REMOVE LOGROTATE CONFIGURATION -#================================================= -ynh_script_progression --message="Removing logrotate configuration..." --weight=1 - # Remove the app-specific logrotate config ynh_remove_logrotate -#================================================= -# REMOVE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 - # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# SPECIFIC REMOVE -#================================================= -# REMOVE VARIOUS FILES -#================================================= -ynh_script_progression --message="Removing various files..." --weight=1 - ynh_secure_remove --file="/etc/default/$app" #================================================= diff --git a/scripts/restore b/scripts/restore index c612405..6d7fbd9 100644 --- a/scripts/restore +++ b/scripts/restore @@ -83,18 +83,8 @@ ynh_script_progression --message="Restoring the systemd configuration..." --weig ynh_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable $app.service --quiet -#================================================= -# RESTORE THE LOGROTATE CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1 - ynh_restore_file --origin_path="/etc/logrotate.d/$app" -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 - yunohost service add $app --description="Airsonic daemon" --log="$install_dir/$app.log" #================================================= @@ -104,13 +94,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=12 ynh_systemd_action --service_name=$app --action="start" --log_path="$install_dir/$app.log" --line_match="Started Application in" -#================================================= -# 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 #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 0e42db7..789ced4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -36,7 +36,6 @@ then ynh_setup_source --dest_dir="$install_dir" --keep="airsonic.properties" fi -chmod 750 "$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir"