diff --git a/manifest.toml b/manifest.toml index 1a3ae8e..a94c1ca 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,7 +20,7 @@ userdoc = "https://standardnotes.com/help" code = "https://github.com/standardnotes/server" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.12" architectures = "all" multi_instance = true diff --git a/scripts/install b/scripts/install index 5e0ae61..3eb4fc2 100755 --- a/scripts/install +++ b/scripts/install @@ -8,7 +8,6 @@ source _common.sh source ynh_add_swap -source ynh_redis source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/remove b/scripts/remove index 39670dc..b7dbbc5 100755 --- a/scripts/remove +++ b/scripts/remove @@ -8,7 +8,6 @@ source _common.sh source ynh_add_swap -source ynh_redis source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/restore b/scripts/restore index b9e3b05..c072415 100755 --- a/scripts/restore +++ b/scripts/restore @@ -9,7 +9,6 @@ # Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source ../settings/scripts/ynh_add_swap -source ../settings/scripts/ynh_redis source /usr/share/yunohost/helpers redis_db=$(ynh_redis_get_free_db) diff --git a/scripts/upgrade b/scripts/upgrade index 58e9656..c7f4dec 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -8,7 +8,6 @@ source _common.sh source ynh_add_swap -source ynh_redis source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/ynh_redis b/scripts/ynh_redis deleted file mode 100644 index 0071247..0000000 --- a/scripts/ynh_redis +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -# 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 -}