From eb5ce9464c32dba72e6db41bcec598491fe94b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 20 May 2024 16:38:10 +0200 Subject: [PATCH] Use standard redis helpers --- manifest.toml | 4 ++-- scripts/install | 1 - scripts/remove | 1 - scripts/restore | 1 - scripts/upgrade | 1 - scripts/ynh_redis | 39 --------------------------------------- 6 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 scripts/ynh_redis diff --git a/manifest.toml b/manifest.toml index a575bb9..061169c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -19,7 +19,7 @@ code = "https://github.com/paperless-ngx/paperless-ngx" cpe = "???" # XXX: No CPE yet... check https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=paperless [integration] -yunohost = ">= 11.0.0" +yunohost = ">= 11.2.12" architectures = "all" multi_instance = true ldap = false @@ -84,7 +84,7 @@ ram.runtime = "350M" share.auth_header = false share.protected = true share.allowed = "visitors" - + [resources.ports] main.default = 8095 diff --git a/scripts/install b/scripts/install index f5f87df..cf18621 100755 --- a/scripts/install +++ b/scripts/install @@ -7,7 +7,6 @@ #================================================= source _common.sh -source ynh_redis source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/remove b/scripts/remove index 7e0bb1a..2b4056f 100755 --- a/scripts/remove +++ b/scripts/remove @@ -7,7 +7,6 @@ #================================================= source _common.sh -source ynh_redis source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/restore b/scripts/restore index 98f6323..a42aa67 100755 --- a/scripts/restore +++ b/scripts/restore @@ -8,7 +8,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_redis source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 6be9942..eaac48e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -7,7 +7,6 @@ #================================================= source _common.sh -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 -}