diff --git a/scripts/_common.sh b/scripts/_common.sh index 4ebac4e..352dbad 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,4 +4,4 @@ # COMMON VARIABLES AND CUSTOM HELPERS #================================================= -composer_version=2.5.8 +composer_version=2.7.7 diff --git a/scripts/install b/scripts/install index a6d70a7..2ecd447 100644 --- a/scripts/install +++ b/scripts/install @@ -11,9 +11,9 @@ timezone="$(cat /etc/timezone)" redis_db=$(ynh_redis_get_free_db) email=$(ynh_user_get_info --username=$admin --key=mail) -#REMOVEME? fpm_footprint="low" -#REMOVEME? fpm_free_footprint=0 -#REMOVEME? fpm_usage="low" +fpm_footprint="low" +fpm_free_footprint=0 +fpm_usage="low" #================================================= # STORE SETTINGS FROM MANIFEST @@ -36,13 +36,10 @@ ynh_setup_source --dest_dir="$install_dir" #================================================= 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 -# Create a dedicated systemd config ynh_config_add_systemd yunohost service add $app --description="BookStack Queue Worker" --log="/var/log/$app/$app.log" @@ -52,7 +49,6 @@ yunohost service add $app --description="BookStack Queue Worker" --log="/var/log #================================================= ynh_script_progression "Installing $app with Composer..." -# Install composer ynh_composer_install ynh_composer_exec install --no-dev diff --git a/scripts/remove b/scripts/remove index c585619..5d08558 100644 --- a/scripts/remove +++ b/scripts/remove @@ -7,7 +7,6 @@ source /usr/share/yunohost/helpers # REMOVE SYSTEM CONFIGURATIONS #================================================= # REMOVE SYSTEMD SERVICE - #================================================= ynh_script_progression "Removing system configurations related to $app..." @@ -18,15 +17,12 @@ then yunohost service remove $app fi -# Remove the dedicated systemd config ynh_config_remove_systemd ynh_redis_remove_db "$redis_db" -# Remove the dedicated NGINX config ynh_config_remove_nginx -# Remove the dedicated PHP-FPM config ynh_config_remove_phpfpm #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 67a10f8..d9354e2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -10,19 +10,19 @@ ynh_script_progression "Ensuring downward compatibility..." # If fpm_footprint doesn't exist, create it if [ -z "${fpm_footprint:-}" ]; then - #REMOVEME? fpm_footprint=low + fpm_footprint=low ynh_app_setting_set --key=fpm_footprint --value=$fpm_footprint fi # If fpm_free_footprint doesn't exist, create it if [ -z "${fpm_free_footprint:-}" ]; then - #REMOVEME? fpm_free_footprint=0 + fpm_free_footprint=0 ynh_app_setting_set --key=fpm_free_footprint --value=$fpm_free_footprint fi # If fpm_usage doesn't exist, create it if [ -z "${fpm_usage:-}" ]; then - #REMOVEME? fpm_usage=low + fpm_usage=low ynh_app_setting_set --key=fpm_usage --value=$fpm_usage fi @@ -31,7 +31,6 @@ fi #================================================= ynh_script_progression "Upgrading source files..." -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --full_replace --keep=".env public/uploads storage/uploads" #================================================= @@ -39,13 +38,10 @@ ynh_setup_source --dest_dir="$install_dir" --full_replace --keep=".env public/up #================================================= ynh_script_progression "Upgrading system configurations related to $app..." -# Create a dedicated PHP-FPM config ynh_config_add_phpfpm -# Create a dedicated NGINX config ynh_config_add_nginx -# Create a dedicated systemd config ynh_config_add_systemd yunohost service add $app --description="BookStack Queue Worker" --log="/var/log/$app/$app.log" @@ -55,7 +51,6 @@ yunohost service add $app --description="BookStack Queue Worker" --log="/var/log #================================================= ynh_script_progression "Installing $app with Composer..." -# Install composer ynh_composer_install ynh_composer_exec install --no-dev