From 77ecdad0f0a3be38394e05d7a82008d45422a6d2 Mon Sep 17 00:00:00 2001 From: selfhoster1312 Date: Wed, 28 Aug 2024 17:00:00 +0200 Subject: [PATCH] Remove custom swap helpers ; use new upstream helpers --- manifest.toml | 3 +- scripts/experimental_helpers/ynh_add_swap | 93 ----------------------- scripts/install | 5 +- scripts/remove | 1 - scripts/restore | 5 +- scripts/upgrade | 5 +- 6 files changed, 5 insertions(+), 107 deletions(-) delete mode 100644 scripts/experimental_helpers/ynh_add_swap diff --git a/manifest.toml b/manifest.toml index 5f81bde..db2650c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,7 +20,8 @@ cpe = "cpe:2.3:a:flarum:flarum" fund = "https://flarum.org/donate/" [integration] -yunohost = ">= 11.2" +yunohost = ">=11.2.30" +helpers_version = "2.1" architectures = "all" multi_instance = true ldap = true diff --git a/scripts/experimental_helpers/ynh_add_swap b/scripts/experimental_helpers/ynh_add_swap deleted file mode 100644 index d7ec44b..0000000 --- a/scripts/experimental_helpers/ynh_add_swap +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash - -# Add swap -# -# usage: ynh_add_swap --size=SWAP in Mb -# | arg: -s, --size= - Amount of SWAP to add in Mb. -ynh_add_swap () { - # Declare an array to define the options of this helper. - declare -Ar args_array=( [s]=size= ) - local size - # Manage arguments with getopts - ynh_handle_getopts_args "$@" - - local swap_max_size=$(( $size * 1024 )) - - local free_space=$(df --output=avail / | sed 1d) - # Because we don't want to fill the disk with a swap file, divide by 2 the available space. - local usable_space=$(( $free_space / 2 )) - - SD_CARD_CAN_SWAP=${SD_CARD_CAN_SWAP:-0} - - # Swap on SD card only if it's is specified - if ynh_is_main_device_a_sd_card && [ "$SD_CARD_CAN_SWAP" == "0" ] - then - ynh_print_warn --message="The main mountpoint of your system '/' is on an SD card, swap will not be added to prevent some damage of this one, but that can cause troubles for the app $app. If you still want activate the swap, you can relaunch the command preceded by 'SD_CARD_CAN_SWAP=1'" - return - fi - - # Compare the available space with the size of the swap. - # And set a acceptable size from the request - if [ $usable_space -ge $swap_max_size ] - then - local swap_size=$swap_max_size - elif [ $usable_space -ge $(( $swap_max_size / 2 )) ] - then - local swap_size=$(( $swap_max_size / 2 )) - elif [ $usable_space -ge $(( $swap_max_size / 3 )) ] - then - local swap_size=$(( $swap_max_size / 3 )) - elif [ $usable_space -ge $(( $swap_max_size / 4 )) ] - then - local swap_size=$(( $swap_max_size / 4 )) - else - echo "Not enough space left for a swap file" >&2 - local swap_size=0 - fi - - # If there's enough space for a swap, and no existing swap here - if [ $swap_size -ne 0 ] && [ ! -e /swap_$app ] - then - # Preallocate space for the swap file, fallocate may sometime not be used, use dd instead in this case - if ! fallocate -l ${swap_size}K /swap_$app - then - dd if=/dev/zero of=/swap_$app bs=1024 count=${swap_size} - fi - chmod 0600 /swap_$app - # Create the swap - mkswap /swap_$app - # And activate it - swapon /swap_$app - # Then add an entry in fstab to load this swap at each boot. - echo -e "/swap_$app swap swap defaults 0 0 #Swap added by $app" >> /etc/fstab - fi -} - -ynh_del_swap () { - # If there a swap at this place - if [ -e /swap_$app ] - then - # Clean the fstab - sed -i "/#Swap added by $app/d" /etc/fstab - # Desactive the swap file - swapoff /swap_$app - # And remove it - rm /swap_$app - fi -} - -# Check if the device of the main mountpoint "/" is an SD card -# -# [internal] -# -# return 0 if it's an SD card, else 1 -ynh_is_main_device_a_sd_card () { - local main_device=$(lsblk --output PKNAME --noheadings $(findmnt / --nofsroot --uniq --output source --noheadings --first-only)) - - if echo $main_device | grep --quiet "mmc" && [ $(tail -n1 /sys/block/$main_device/queue/rotational) == "0" ] - then - return 0 - else - return 1 - fi -} diff --git a/scripts/install b/scripts/install index 364c93e..0a46630 100644 --- a/scripts/install +++ b/scripts/install @@ -7,7 +7,6 @@ #================================================= source _common.sh -source experimental_helpers/ynh_add_swap source /usr/share/yunohost/helpers #================================================= @@ -62,9 +61,7 @@ ynh_use_logrotate #================================================= ynh_print_info --message="Adding swap..." -if [ ${PACKAGE_CHECK_EXEC:-0} -eq 0 ]; then - ynh_add_swap --size=$swap_needed -fi +ynh_add_swap --size=$swap_needed #================================================= # INSTALL COMPOSER DEPENDENCIES diff --git a/scripts/remove b/scripts/remove index 51843f2..3f0a679 100644 --- a/scripts/remove +++ b/scripts/remove @@ -7,7 +7,6 @@ #================================================= source _common.sh -source experimental_helpers/ynh_add_swap source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/restore b/scripts/restore index 2bf8cee..243d38d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -8,7 +8,6 @@ # Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh -source ../settings/scripts/experimental_helpers/ynh_add_swap source /usr/share/yunohost/helpers #================================================= @@ -48,9 +47,7 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app" #================================================= ynh_script_progression --message="Adding swap..." -if [ ${PACKAGE_CHECK_EXEC:-0} -eq 0 ]; then - ynh_add_swap --size=$swap_needed -fi +ynh_add_swap --size=$swap_needed #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 9b0900f..128122b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -7,7 +7,6 @@ #================================================= source _common.sh -source experimental_helpers/ynh_add_swap source /usr/share/yunohost/helpers #================================================= @@ -100,9 +99,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Adding swap..." -if [ ${PACKAGE_CHECK_EXEC:-0} -eq 0 ]; then - ynh_add_swap --size=$swap_needed -fi +ynh_add_swap --size=$swap_needed #================================================= # COMPOSER AND FLARUM UPGRADE