diff --git a/manifest.toml b/manifest.toml index d3c4255..d44520c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,7 +19,7 @@ code = "https://github.com/jedie/PyInventory/" [integration] # https://yunohost.org/en/packaging_manifest#integration-section -yunohost = ">=11" +yunohost = ">=11.2.12" architectures = "all" multi_instance = true ldap = true diff --git a/scripts/_common.sh b/scripts/_common.sh index 244e91a..0c73c1b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -84,46 +84,3 @@ myynh_fix_file_permissions() { 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 -} -