From eb3ab6dfbfca9e3367337382b74bf1823d55cd42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 20 May 2024 16:55:44 +0200 Subject: [PATCH] Use standard redis helpers --- manifest.toml | 2 +- scripts/_common.sh | 38 -------------------------------------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/manifest.toml b/manifest.toml index e51e442..1f43b38 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ code = "https://github.com/eldertek/scovie" demo = "https://scovie.eclipse-technology.eu" [integration] -yunohost = ">=11.2" +yunohost = ">=11.2.12" architectures = "all" multi_instance = true ldap = true diff --git a/scripts/_common.sh b/scripts/_common.sh index 6997dc6..4fec2a1 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -49,41 +49,3 @@ _install_scovie_venv() { #================================================= # 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 "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 -}