Merge pull request #61 from YunoHost-Apps/helpers

Use standard redis helpers

manifest.toml

@@ -19,7 +19,7 @@ admindoc = "https://samr1.github.io/FitTrackee"
 code = "https://github.com/SamR1/FitTrackee"
 
 [integration]
-yunohost = ">= 11.2.4"
+yunohost = ">= 11.2.12"
 architectures = "all"
 multi_instance = true
 
@@ -35,7 +35,7 @@ ram.runtime = "50M"
     [install.domain]
     # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "domain"
-      
+
     [install.init_main_permission]
     type = "group"
     default = "visitors"
@@ -85,7 +85,7 @@ ram.runtime = "50M"
     [resources.permissions]
     main.url = "/"
     main.auth_header = false
-    
+
     [resources.ports]
     main.default = 5000
 

scripts/_common.sh

@@ -12,44 +12,6 @@
 # EXPERIMENTAL 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
-}
-
 #=================================================
 # FUTURE OFFICIAL HELPERS
 #=================================================