mirror of
https://github.com/YunoHost-Apps/pyinventory_ynh.git
synced 2024-09-03 20:16:09 +02:00
Use standard redis helpers
This commit is contained in:
parent
54aee976be
commit
fb5eb9938f
2 changed files with 1 additions and 44 deletions
|
@ -19,7 +19,7 @@ code = "https://github.com/jedie/PyInventory/"
|
||||||
|
|
||||||
[integration]
|
[integration]
|
||||||
# https://yunohost.org/en/packaging_manifest#integration-section
|
# https://yunohost.org/en/packaging_manifest#integration-section
|
||||||
yunohost = ">=11"
|
yunohost = ">=11.2.12"
|
||||||
architectures = "all"
|
architectures = "all"
|
||||||
multi_instance = true
|
multi_instance = true
|
||||||
ldap = true
|
ldap = true
|
||||||
|
|
|
@ -84,46 +84,3 @@ myynh_fix_file_permissions() {
|
||||||
chmod -c o-rwx "$data_dir"
|
chmod -c o-rwx "$data_dir"
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
#=================================================
|
|
||||||
# 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 "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
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue