diff --git a/manifest.toml b/manifest.toml index bcefa13..2460b6f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -21,7 +21,7 @@ code = "https://dev.funkwhale.audio/funkwhale/funkwhale" fund = "https://next.funkwhale.audio/donate/" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.12" architectures = "all" multi_instance = true @@ -69,9 +69,9 @@ ram.runtime = "50M" [resources.system_user] [resources.install_dir] - + [resources.data_dir] - + [resources.permissions] main.url = "/" diff --git a/scripts/_common.sh b/scripts/_common.sh index b2c67eb..599c71e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -11,48 +11,3 @@ #================================================= # EXPERIMENTAL HELPERS #================================================= - -#================================================= -# -# Redis HELPERS -# -# Point of contact : Jean-Baptiste Holcroft -#================================================= - -# 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 -}