diff --git a/manifest.toml b/manifest.toml index 8b26ec8..f2258f7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://etherpad.org/doc/v2.0.2/" code = "https://github.com/ether/etherpad-lite" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.12" architectures = "all" multi_instance = true diff --git a/scripts/_common.sh b/scripts/_common.sh index 2b9094e..184eecc 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -17,42 +17,3 @@ nodejs_version=22 #================================================= # FUTURE OFFICIAL HELPERS #================================================= - -# get the first available redis database -# -# usage: ynh_redis_get_free_db -# | returns: the database number to use -ynh_redis_get_free_db() { - local result max db - result="$(redis-cli INFO keyspace)" - - # get the num - max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+") - - db=0 - # default Debian setting is 15 databases - for i in $(seq 0 "$max") - do - if ! echo "$result" | grep -q "db$i" - then - db=$i - break 1 - fi - db=-1 - done - - test "$db" -eq -1 && ynh_die --message="No available Redis databases..." - - echo "$db" -} - -# Create a master password and set up global settings -# Please always call this script in install and restore scripts -# -# usage: ynh_redis_remove_db database -# | arg: database - the database to erase -ynh_redis_remove_db() { - local db=$1 - redis-cli -n "$db" flushall -} - diff --git a/scripts/install b/scripts/install index c5b73ee..52a0006 100644 --- a/scripts/install +++ b/scripts/install @@ -81,7 +81,7 @@ ynh_script_progression --message="Installing $app..." --weight=10 pushd $install_dir ynh_use_nodejs env $ynh_node_load_PATH corepack enable - env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate + env $ynh_node_load_PATH corepack prepare pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh #ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --recursive --production popd