From 95915ba29a86a13e74a642834a8f6968ff9ca014 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 16:36:46 +0200
Subject: [PATCH] Use standard redis helpers

---
 manifest.toml      |  2 +-
 scripts/change_url |  1 -
 scripts/install    |  1 -
 scripts/remove     |  1 -
 scripts/restore    |  1 -
 scripts/upgrade    |  1 -
 scripts/ynh_redis  | 39 ---------------------------------------
 7 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 scripts/ynh_redis

diff --git a/manifest.toml b/manifest.toml
index 3c00aa7..ba0a90b 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -19,7 +19,7 @@ code = "https://pagure.io/pagure"
 cpe = "cpe:2.3:a:redhat:pagure"
 
 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.12"
 architectures = "all"
 multi_instance = false
 ldap = "?" # FIXME: replace with true, false, or "not_relevant". Not to confuse with the "sso" key : the "ldap" key corresponds to wether or not a user *can* login on the app using its YunoHost credentials.
diff --git a/scripts/change_url b/scripts/change_url
index 8ea339d..9803c9d 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -5,7 +5,6 @@
 #=================================================
 
 source _common.sh
-source ynh_redis
 source ynh_uwsgi_service__2
 source /usr/share/yunohost/helpers
 
diff --git a/scripts/install b/scripts/install
index f6c493d..304d1c7 100755
--- a/scripts/install
+++ b/scripts/install
@@ -5,7 +5,6 @@
 #=================================================
 
 source _common.sh
-source ynh_redis
 source ynh_uwsgi_service__2
 source /usr/share/yunohost/helpers
 
diff --git a/scripts/remove b/scripts/remove
index ef49fe5..66139ff 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -5,7 +5,6 @@
 #=================================================
 
 source _common.sh
-source ynh_redis
 source ynh_uwsgi_service__2
 source /usr/share/yunohost/helpers
 
diff --git a/scripts/restore b/scripts/restore
index f74c8d9..e19e852 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -6,7 +6,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_redis
 source ../settings/scripts/ynh_uwsgi_service__2
 source /usr/share/yunohost/helpers
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 8018c00..20bc04e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -5,7 +5,6 @@
 #=================================================
 
 source _common.sh
-source ynh_redis
 source ynh_uwsgi_service__2
 source /usr/share/yunohost/helpers
 
diff --git a/scripts/ynh_redis b/scripts/ynh_redis
deleted file mode 100644
index 9d6257d..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
-}