From 04be246a03eda584e48db6311f388162dd00b545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 23 Mar 2023 23:29:06 +0100 Subject: [PATCH] cleaning --- check_process | 24 ------------------------ manifest.toml | 4 ++-- scripts/change_url | 8 ++++---- scripts/install | 16 +++++----------- scripts/upgrade | 1 - 5 files changed, 11 insertions(+), 42 deletions(-) delete mode 100644 check_process diff --git a/check_process b/check_process deleted file mode 100644 index a64ae5f..0000000 --- a/check_process +++ /dev/null @@ -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& diff --git a/manifest.toml b/manifest.toml index 4ce7370..2a3db34 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,7 +19,7 @@ code = "https://github.com/Lidarr/Lidarr" yunohost = ">= 11.1.15" architectures = "all" multi_instance = true -ldap = false +ldap = false sso = false disk = "50M" ram.build = "50M" @@ -56,7 +56,7 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" api.main.url = "/api" - api.allowed="visitors" + api.allowed = "visitors" api.show_tile = false api.protected = true diff --git a/scripts/change_url b/scripts/change_url index 1a44a0a..aa9bf25 100755 --- a/scripts/change_url +++ b/scripts/change_url @@ -31,11 +31,11 @@ ynh_change_url_nginx_config # 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 o-rwx "$data_path/config.xml" -chown $app "$data_path/config.xml" +chmod 750 "$data_dir/config.xml" +chmod o-rwx "$data_dir/config.xml" +chown $app "$data_dir/config.xml" #================================================= # GENERIC FINALISATION diff --git a/scripts/install b/scripts/install index ebab4b2..14a058b 100755 --- a/scripts/install +++ b/scripts/install @@ -19,6 +19,10 @@ ynh_setup_source --dest_dir="$install_dir" mkdir -p "$data_dir/logs" +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app: "$install_dir" + #================================================= # NGINX CONFIGURATION #================================================= @@ -45,16 +49,7 @@ 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" - -#================================================= -# SETUP FILE PERMISSIONS -#================================================= -ynh_script_progression --message="Setting files permissions and ownership..." --weight=1 - -chmod 750 "$install_dir" -chmod -R o-rwx "$install_dir" -chown -R $app: "$install_dir" +ynh_add_config --template="../conf/config.xml" --destination="$data_dir/config.xml" chmod 400 "$data_dir/config.xml" chown $app:$app "$data_dir/config.xml" @@ -77,7 +72,6 @@ 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" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 0ebe144..e7bf5c9 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -76,7 +76,6 @@ chown $app:$app "$data_dir/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" #=================================================