From d5977dd7a7eef374a9de22017d8599b97eeb6853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 20 May 2024 17:02:14 +0200 Subject: [PATCH] Use standard redis helpers --- manifest.toml | 4 ++-- scripts/_common.sh | 42 ------------------------------------------ 2 files changed, 2 insertions(+), 44 deletions(-) diff --git a/manifest.toml b/manifest.toml index 2861e9f..a829176 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://vikunja.io/docs/" code = "https://kolaente.dev/vikunja/vikunja" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.12" architectures = "all" multi_instance = true @@ -60,7 +60,7 @@ ram.runtime = "50M" i386.sha256 = "de1e271b6d3fe6024b790b95c1bf946a415598b31192638ef85589cd2c35f996" in_subdir = false format = "zip" - + [resources.sources.front] url = "https://dl.vikunja.io/frontend/vikunja-frontend-0.22.1.zip" sha256 = "8e4145eacb9c2d95a95a43dca2f4dd0fd30ec8934f4562017caf77f3c5f9a277" diff --git a/scripts/_common.sh b/scripts/_common.sh index d847bb9..944a65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -15,45 +15,3 @@ #================================================= # FUTURE OFFICIAL HELPERS #================================================= - -#================================================= -# REDIS 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 -}