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 1/4] 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 -} From 8e51189a06f53720ed8f82c84ec0c424c17d12c5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 4 Jun 2024 03:41:57 +0200 Subject: [PATCH 2/4] Upgrade to v2.9.0 https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.9.0 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index a575bb9..e57b2df 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Paperless-ngx" description.en = "Scan, index and archive all your physical documents" description.fr = "Scannez, triez et archivez tous vos documents papiers" -version = "2.8.6~ynh1" +version = "2.9.0~ynh1" maintainers = ["Tagada"] @@ -54,8 +54,8 @@ ram.runtime = "350M" [resources.sources] [resources.sources.main] - url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v2.8.6/paperless-ngx-v2.8.6.tar.xz" - sha256 = "e7f144f6357daa372e0b5e5a5f2ec9ebf80e473a65e44ee7cc15529c8687b4f4" + url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v2.9.0/paperless-ngx-v2.9.0.tar.xz" + sha256 = "e5acf5c0213bbe3c93de7ce02867bd9adb0d02dcf7e11b40d1fe05d162d62d13" autoupdate.strategy = "latest_github_release" autoupdate.asset = "paperless-ngx-.*.tar.xz" From 4f2679ae21fc8e2de4c282096b615cabf55d87fa Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 4 Jun 2024 01:41:59 +0000 Subject: [PATCH 3/4] Auto-update READMEs --- ALL_README.md | 2 +- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ALL_README.md b/ALL_README.md index 8938aae..152f2e7 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,7 +1,7 @@ # All available README files by language - [Read the README in English](README.md) -- [Lee el README en español](README_es.md) +- [Lea el README en español](README_es.md) - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) diff --git a/README.md b/README.md index 071b1a9..c7489ac 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Paperless-ngx is a document management system that transforms your physical docu * [More screenshots are available in the documentation](https://paperless-ngx.readthedocs.io/en/latest/screenshots.html). -**Shipped version:** 2.8.6~ynh1 +**Shipped version:** 2.9.0~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 61d2388..e4588c4 100644 --- a/README_es.md +++ b/README_es.md @@ -33,7 +33,7 @@ Paperless-ngx is a document management system that transforms your physical docu * [More screenshots are available in the documentation](https://paperless-ngx.readthedocs.io/en/latest/screenshots.html). -**Versión actual:** 2.8.6~ynh1 +**Versión actual:** 2.9.0~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index a686af8..6b54fb5 100644 --- a/README_eu.md +++ b/README_eu.md @@ -33,7 +33,7 @@ Paperless-ngx is a document management system that transforms your physical docu * [More screenshots are available in the documentation](https://paperless-ngx.readthedocs.io/en/latest/screenshots.html). -**Paketatutako bertsioa:** 2.8.6~ynh1 +**Paketatutako bertsioa:** 2.9.0~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 8a517cc..82fa1fe 100644 --- a/README_fr.md +++ b/README_fr.md @@ -33,7 +33,7 @@ Paperless-ngx is a document management system that transforms your physical docu * [More screenshots are available in the documentation](https://paperless-ngx.readthedocs.io/en/latest/screenshots.html). -**Version incluse :** 2.8.6~ynh1 +**Version incluse :** 2.9.0~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index bd56921..a7b621e 100644 --- a/README_gl.md +++ b/README_gl.md @@ -33,7 +33,7 @@ Paperless-ngx is a document management system that transforms your physical docu * [More screenshots are available in the documentation](https://paperless-ngx.readthedocs.io/en/latest/screenshots.html). -**Versión proporcionada:** 2.8.6~ynh1 +**Versión proporcionada:** 2.9.0~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 4d2ceb0..1791a27 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -33,7 +33,7 @@ Paperless-ngx is a document management system that transforms your physical docu * [More screenshots are available in the documentation](https://paperless-ngx.readthedocs.io/en/latest/screenshots.html). -**分发版本：** 2.8.6~ynh1 +**分发版本：** 2.9.0~ynh1 **演示：** From e5480c72728846aa5ee3616d80522ea6c6d11156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 4 Jun 2024 22:19:21 +0200 Subject: [PATCH 4/4] fix linter --- manifest.toml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/manifest.toml b/manifest.toml index e57b2df..21b07cb 100644 --- a/manifest.toml +++ b/manifest.toml @@ -16,10 +16,9 @@ demo = "https://demo.paperless-ngx.com/" admindoc = "https://paperless-ngx.readthedocs.io/en/latest/index.html" userdoc = "https://paperless-ngx.readthedocs.io/en/latest/usage_overview.html" 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" architectures = "all" multi_instance = true ldap = false @@ -30,11 +29,9 @@ ram.runtime = "350M" [install] [install.domain] - # this is a generic question - ask strings are automatically handled by Yunohost's core type = "domain" [install.admin] - # this is a generic question - ask strings are automatically handled by Yunohost's core type = "user" [install.admin_pw]