From ba2715e945f402e3697dc24a369f8528b5f162c2 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Sun, 1 Sep 2024 21:16:17 +0200 Subject: [PATCH] Fix helpers 2.1 --- manifest.toml | 3 --- scripts/_common.sh | 7 ------- scripts/change_url | 2 +- scripts/install | 6 ------ 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/manifest.toml b/manifest.toml index de54218..29ef7a5 100644 --- a/manifest.toml +++ b/manifest.toml @@ -76,9 +76,6 @@ ram.runtime = "50M" [resources.system_user] [resources.install_dir] - dir = "/var/www/__APP__" - owner = "__APP__:rwx" - group = "__APP__:rx" [resources.permissions] main.url = "/" diff --git a/scripts/_common.sh b/scripts/_common.sh index 6728b6a..503b8a6 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,11 +3,4 @@ #================================================= # COMMON VARIABLES AND CUSTOM HELPERS #================================================= -ynh_arch="$YNH_ARCH" -myynh_set_permissions () { - #REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app: "$install_dir" - #REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 750 "$install_dir" - #REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir" - chmod -R +x "$install_dir/bin/" -} diff --git a/scripts/change_url b/scripts/change_url index 6e06aad..4289200 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -43,7 +43,7 @@ then ynh_store_file_checksum "$install_dir/config/scrutiny.yaml" # Update collector.yaml - port=$(ynh_app_setting_get --key=port) + port=$(ynh_app_setting_get --key=port) key="endpoint" new_value="'http:\/\/127.0.0.1:${port}${new_base_path}\/'" sed --regexp-extended "s/^(\s*${key}:\s*).*/\1${new_value}/" --in-place "$install_dir/config/collector.yaml" diff --git a/scripts/install b/scripts/install index c3b0506..f46aaeb 100755 --- a/scripts/install +++ b/scripts/install @@ -57,12 +57,6 @@ ynh_config_add --template="config/scrutiny.yaml" --destination="$install_dir/con ynh_config_add --template="systemd-scrutiny-collector.timer" --destination="/etc/systemd/system/scrutiny-collector.timer" ynh_config_add --template="config/collector.yaml" --destination="$install_dir/config/collector.yaml" -#================================================= -# SET FILE OWNERSHIP / PERMISSIONS -#================================================= - -myynh_set_permissions - #================================================= # START SYSTEMD SERVICE #=================================================