Merge pull request #100 from YunoHost-Apps/helpers

Use standard redis helpers

manifest.toml

@@ -19,7 +19,7 @@ code = "https://github.com/paperless-ngx/paperless-ngx"
 cpe = "???" # XXX: No CPE yet... check https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=paperless
 
 [integration]
-yunohost = ">= 11.0.0"
+yunohost = ">= 11.2.12"
 architectures = "all"
 multi_instance = true
 ldap = false

scripts/install

@@ -7,7 +7,6 @@
 #=================================================
 
 source _common.sh
-source ynh_redis
 source /usr/share/yunohost/helpers
 
 #=================================================

scripts/remove

@@ -7,7 +7,6 @@
 #=================================================
 
 source _common.sh
-source ynh_redis
 source /usr/share/yunohost/helpers
 
 #=================================================

scripts/restore

@@ -8,7 +8,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 /usr/share/yunohost/helpers
 
 #=================================================

scripts/upgrade

@@ -7,7 +7,6 @@
 #=================================================
 
 source _common.sh
-source ynh_redis
 source /usr/share/yunohost/helpers
 
 #=================================================

scripts/ynh_redis

@@ -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
-}