From 20fd7841a6f4162846c2fedde07fafa9103104ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 20 May 2024 16:59:37 +0200 Subject: [PATCH] Use standard redis helpers --- manifest.toml | 2 +- scripts/_common.sh | 42 ------------------------------------------ 2 files changed, 1 insertion(+), 43 deletions(-) diff --git a/manifest.toml b/manifest.toml index 1bb8356..2fc5329 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://public-community.tracim.fr/ui/workspaces/143/contents" code = "https://github.com/tracim/tracim" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.12" architectures = ["amd64"] multi_instance = true diff --git a/scripts/_common.sh b/scripts/_common.sh index c694a8a..9d577cf 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -16,48 +16,6 @@ nodejs_version=16 #================================================= # 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 -} - - - #=================================================