From fde3e53fd9d23205148f619a85be639ae85ab540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 29 Aug 2024 10:07:41 +0200 Subject: [PATCH] cleaning --- manifest.toml | 2 +- scripts/install | 4 ---- scripts/remove | 2 -- scripts/restore | 2 -- scripts/upgrade | 4 ---- 5 files changed, 1 insertion(+), 13 deletions(-) diff --git a/manifest.toml b/manifest.toml index c8efae4..088a9fe 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,7 +16,7 @@ demo = "https://demo.adminer.org/adminer.php?username=" code = "https://github.com/adminerevo/adminerevo" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.27" helpers_version = "2.1" architectures = "all" multi_instance = true diff --git a/scripts/install b/scripts/install index 9c7c31d..f60233a 100644 --- a/scripts/install +++ b/scripts/install @@ -13,19 +13,15 @@ ynh_script_progression "Setting up source files..." #================================================= ynh_script_progression "Setting up source files..." -# Download, check integrity, uncompress and patch the source from manifest.toml ynh_setup_source --dest_dir="$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 | chown -R "$app:www-data" "$install_dir" #================================================= # SYSTEM CONFIGURATION #================================================= ynh_script_progression "Adding system configurations related to $app..." -# Create a dedicated php-fpm config ynh_config_add_phpfpm -# Create a dedicated nginx config ynh_config_add_nginx #================================================= diff --git a/scripts/remove b/scripts/remove index 4ca3383..ee9c6ec 100644 --- a/scripts/remove +++ b/scripts/remove @@ -8,10 +8,8 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression "Removing system configurations related to $app..." -# Remove the dedicated nginx config ynh_config_remove_nginx -# Remove the dedicated php-fpm config ynh_config_remove_phpfpm #================================================= diff --git a/scripts/restore b/scripts/restore index 323b16b..e214dfa 100644 --- a/scripts/restore +++ b/scripts/restore @@ -11,8 +11,6 @@ ynh_script_progression "Restoring $app main directory..." ynh_restore "$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" -#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:www-data "$install_dir" #================================================= # RESTORE SYSTEM CONFIGURATIONS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index aa49b7e..f077475 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -8,19 +8,15 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression "Upgrading source files..." -# Download, check integrity, uncompress and patch the source from manifest.toml ynh_setup_source --dest_dir="$install_dir" --full_replace -#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:www-data" "$install_dir" #================================================= # PHP-FPM CONFIGURATION #================================================= ynh_script_progression "Upgrading PHP-FPM configuration..." -# Create a dedicated PHP-FPM config ynh_config_add_phpfpm -# Create a dedicated NGINX config ynh_config_add_nginx #=================================================