From aac38a0a660be9f3f275380971d9e0bd58f37f9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Mon, 20 May 2024 20:50:34 +0200
Subject: [PATCH] Use standard redis helpers

---
 manifest.json     |  2 +-
 scripts/install   |  1 -
 scripts/remove    |  1 -
 scripts/restore   |  1 -
 scripts/upgrade   |  1 -
 scripts/ynh_redis | 39 ---------------------------------------
 6 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 scripts/ynh_redis

diff --git a/manifest.json b/manifest.json
index 1e25ae8..0daa393 100644
--- a/manifest.json
+++ b/manifest.json
@@ -21,7 +21,7 @@
         "email": "46000361+FabianWilkens@users.noreply.github.com"
     },
     "requirements": {
-        "yunohost": ">= 11.1"
+        "yunohost": ">= 11.2.12"
     },
     "multi_instance": true,
     "services": [
diff --git a/scripts/install b/scripts/install
index 7aed4e3..ce9c71a 100755
--- a/scripts/install
+++ b/scripts/install
@@ -8,7 +8,6 @@
 
 source _common.sh
 source ynh_add_swap
-source ynh_redis
 source /usr/share/yunohost/helpers
 
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 1263572..6e438c1 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -8,7 +8,6 @@
 
 source _common.sh
 source ynh_add_swap
-source ynh_redis
 source /usr/share/yunohost/helpers
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 4dbe522..9bd7758 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -9,7 +9,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/ynh_add_swap
-source ../settings/scripts/ynh_redis
 source /usr/share/yunohost/helpers
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 197c127..e231128 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -8,7 +8,6 @@
 
 source _common.sh
 source ynh_add_swap
-source ynh_redis
 source /usr/share/yunohost/helpers
 
 #=================================================
diff --git a/scripts/ynh_redis b/scripts/ynh_redis
deleted file mode 100644
index 0071247..0000000
--- a/scripts/ynh_redis
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# 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
-}