From a31837d6276d56b72ce0503db9d36638e62aa4a8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 29 Jul 2024 03:44:18 +0200 Subject: [PATCH 1/3] Upgrade sources - `main` v2.11.2: https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.11.2 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 50e7687..1d2edb2 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.11.1~ynh1" +version = "2.11.2~ynh1" maintainers = ["Tagada"] @@ -51,8 +51,8 @@ ram.runtime = "350M" [resources.sources] [resources.sources.main] - url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v2.11.1/paperless-ngx-v2.11.1.tar.xz" - sha256 = "0dedc1e9fa742380c2b99aee11bf1f76e20fc8e8fba2c0fb50a11a3742c99a6a" + url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v2.11.2/paperless-ngx-v2.11.2.tar.xz" + sha256 = "84ba3a474333953fc831e687649bc996e4e79ad24e663c973ac2ef4ae2d84927" autoupdate.strategy = "latest_github_release" autoupdate.asset = "paperless-ngx-.*.tar.xz" From 4194984307b6e674ac1f2f39a1bf7fc0acea30bb Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 29 Jul 2024 01:44:20 +0000 Subject: [PATCH 2/3] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 4 ++-- README_zh_Hans.md | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 4a198f5..fac0b6e 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.11.1~ynh1 +**Shipped version:** 2.11.2~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index d9f1ca8..b6e53e6 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.11.1~ynh1 +**Versión actual:** 2.11.2~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index a1da20a..086666c 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.11.1~ynh1 +**Paketatutako bertsioa:** 2.11.2~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index b6503c3..04c0535 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.11.1~ynh1 +**Version incluse :** 2.11.2~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 51f1e06..f4d7710 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.11.1~ynh1 +**Versión proporcionada:** 2.11.2~ynh1 **Demo:** diff --git a/README_id.md b/README_id.md index 879a8ac..214af6a 100644 --- a/README_id.md +++ b/README_id.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 terkirim:** 2.11.1~ynh1 +**Versi terkirim:** 2.11.2~ynh1 **Demo:** @@ -46,7 +46,7 @@ Paperless-ngx is a document management system that transforms your physical docu - Website aplikasi resmi: - Dokumentasi pengguna resmi: - Dokumentasi admin resmi: -- Repositori kode aplikasi hulu: +- Depot kode aplikasi hulu: - Gudang YunoHost: - Laporkan bug: diff --git a/README_zh_Hans.md b/README_zh_Hans.md index a7944a1..dba3a19 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.11.1~ynh1 +**分发版本：** 2.11.2~ynh1 **演示：** From 73fc0ebf6e438473dcfcaa18a200d146bb31c60d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 30 Jul 2024 22:20:11 +0200 Subject: [PATCH 3/3] cleaning --- scripts/backup | 17 ----------------- scripts/install | 10 ---------- scripts/remove | 43 ------------------------------------------- scripts/restore | 20 -------------------- scripts/upgrade | 8 -------- 5 files changed, 98 deletions(-) diff --git a/scripts/backup b/scripts/backup index 66f7b2c..c1e87bf 100755 --- a/scripts/backup +++ b/scripts/backup @@ -33,25 +33,8 @@ ynh_backup --src_path="$data_dir" --is_big ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP FAIL2BAN CONFIGURATION -#================================================= - -#ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf" -#ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" - -#================================================= -# SPECIFIC BACKUP -#================================================= -# BACKUP LOGROTATE -#================================================= - ynh_backup --src_path="/etc/logrotate.d/$app" -#================================================= -# BACKUP SYSTEMD -#================================================= - ynh_backup --src_path="/etc/systemd/system/$app.service" ynh_backup --src_path="/etc/systemd/system/$app-consumer.service" ynh_backup --src_path="/etc/systemd/system/$app-scheduler.service" diff --git a/scripts/install b/scripts/install index cf18621..bf57d28 100755 --- a/scripts/install +++ b/scripts/install @@ -176,16 +176,6 @@ ynh_systemd_action --service_name="$app-consumer" --action="start" --log_path="/ ynh_systemd_action --service_name="$app-scheduler" --action="start" --log_path="/var/log/$app/$app-scheduler.log" ynh_systemd_action --service_name="$app-task-queue" --action="start" --log_path="/var/log/$app/$app-task-queue.log" -#================================================= -# SETUP FAIL2BAN -#================================================= -#ynh_script_progression --message="Configuring Fail2Ban..." --weight=1 - -# Create a dedicated Fail2Ban config -#ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Regex to match into the log for a failed login" -# FIXME fail2ban -# ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-access.log" --failregex=".* \"POST /api/v1/token/ HTTP/1.1\" 400 68.*$" --max_retry=5 - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/remove b/scripts/remove index d26f7cb..f8de052 100755 --- a/scripts/remove +++ b/scripts/remove @@ -25,64 +25,21 @@ then yunohost service remove "$app-task-queue" fi -#================================================= -# STOP AND REMOVE SERVICE -#================================================= -ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1 - # Remove the dedicated systemd config ynh_remove_systemd_config --service="$app" ynh_remove_systemd_config --service="$app-consumer" ynh_remove_systemd_config --service="$app-scheduler" ynh_remove_systemd_config --service="$app-task-queue" -#================================================= -# REMOVE LOGROTATE CONFIGURATION -#================================================= -ynh_script_progression --message="Removing logrotate configuration..." --weight=1 - # Remove the app-specific logrotate config ynh_remove_logrotate -#================================================= -# REMOVE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 - # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE DEPENDENCIES -#================================================= -#REMOVEME? ynh_script_progression --message="Removing dependencies..." --weight=1 - # Remove metapackage and its dependencies ynh_redis_remove_db "$redis_db" -#================================================= -# REMOVE FAIL2BAN CONFIGURATION -#================================================= -#ynh_script_progression --message="Removing Fail2Ban configuration..." --weight=1 - -# Remove the dedicated Fail2Ban config -#ynh_remove_fail2ban_config - -#================================================= -# SPECIFIC REMOVE -#================================================= -# REMOVE VARIOUS FILES -#================================================= -ynh_script_progression --message="Removing various files..." --weight=1 - -# Remove the log files - -#================================================= -# GENERIC FINALIZATION -#================================================= -# ... -#================================================= - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index 4c8aca0..f58006f 100755 --- a/scripts/restore +++ b/scripts/restore @@ -54,19 +54,6 @@ ynh_add_config --template="../settings/conf/paperless.conf.example" --destinatio chmod 400 "$install_dir/paperless.conf" chown $app:$app "$install_dir/paperless.conf" -#================================================= -# RESTORE FAIL2BAN CONFIGURATION -#================================================= -#ynh_script_progression --message="Restoring the Fail2Ban configuration..." --weight=1 - -#ynh_restore_file --origin_path="/etc/fail2ban/jail.d/$app.conf" -#ynh_restore_file --origin_path="/etc/fail2ban/filter.d/$app.conf" -#ynh_systemd_action --action=restart --service_name=fail2ban - -#================================================= -# SPECIFIC RESTORATION -#================================================= - #================================================= # INSTALL PYTHON DEPENDENCIES #================================================= @@ -98,13 +85,6 @@ ynh_script_progression --message="Restoring the PostgresSQL database..." --weigh ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql -#================================================= -# RESTORE VARIOUS FILES -#================================================= -#ynh_script_progression --message="Restoring various files..." --weight=1 - -#ynh_restore_file --origin_path="/etc/$app/" - #================================================= # RESTORE SYSTEMD #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 83600ab..d7b12d4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -181,14 +181,6 @@ ynh_systemd_action --service_name="$app-consumer" --action="start" --log_path="/ ynh_systemd_action --service_name="$app-scheduler" --action="start" --log_path="/var/log/$app/$app-scheduler.log" ynh_systemd_action --service_name="$app-task-queue" --action="start" --log_path="/var/log/$app/$app-task-queue.log" -#================================================= -# UPGRADE FAIL2BAN -#================================================= -#ynh_script_progression --message="Reconfiguring Fail2Ban..." --weight=1 - -# Create a dedicated Fail2Ban config -#ynh_add_fail2ban_config --logpath="/var/log/nginx/${domain}-error.log" --failregex="Regex to match into the log for a failed login" - #================================================= # END OF SCRIPT #=================================================