diff --git a/manifest.toml b/manifest.toml index 06205f3e..49802d32 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ userdoc = "https://docs.pixelfed.org/" code = "https://github.com/pixelfed/pixelfed" [integration] -yunohost = ">= 11.2.4" +yunohost = ">= 11.2.12" architectures = "all" multi_instance = true ldap = false diff --git a/scripts/_common.sh b/scripts/_common.sh index c4a6760d..bb3f8d89 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -18,47 +18,6 @@ YNH_COMPOSER_VERSION="2.2.21" # FUTURE OFFICIAL 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" flushdb -} - - -#================================================= - # Create a dedicated supervisor config #