Merge ba706bdb61 into f752f415d9

2024-09-03 18:16:05 +02:00 · 2024-08-30 18:22:34 +02:00 · 2024-08-30 18:22:34 +02:00 · 7169a0e09e
commit 7169a0e09e
parent f752f415d9 ba706bdb61
14 changed files with 106 additions and 30 deletions
--- a/ALL_README.md
+++ b/ALL_README.md
@ -6,4 +6,5 @@
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
 - [Baca README dalam bahasa bahasa Indonesia](README_id.md)
+- [Прочитать README на русский](README_ru.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)
--- a/README.md
+++ b/README.md
@ -26,7 +26,7 @@ This app is the "client" part, meant to be installed on the server to be backed
 - ... or on a [commercial borg service](https://www.borgbackup.org/support/commercial.html)
 - Backups are encrypted (the remote server can't read the content) and deduplicated (optimize space)
 - Backups are ran automatically, you can choose when and at which frequency
- You can choose what apps are backuped
+- You can choose what apps are backed up
 - Receive email alerts if the backup fails (the [borg server app](https://apps.yunohost.org/app/borgserver) also checks that new content arrives and send an email to your friend otherwise)

 ### Install procedure
@ -34,10 +34,12 @@ This app is the "client" part, meant to be installed on the server to be backed
 Maybe counter-intuitively, you should *first* install this app (`borg_ynh`) and *then* (`borgserver_ynh`) on the other machine. In fact, at the end of the install of `borg_ynh`, you will be provided with the info, in particular the SSH public key, to be used to setup `borgserver_ynh` on the other machine.


-**Shipped version:** 1.2.8~ynh2
+**Shipped version:** 1.4.0~ynh1
 ## Documentation and resources

- Official app website: <https://borgbackup.readthedocs.io>
+- Official app website: <https://www.borgbackup.org>
+- Official admin documentation: <https://borgbackup.readthedocs.io>
+- Upstream app code repository: <https://github.com/borgbackup/borg>
 - YunoHost Store: <https://apps.yunohost.org/app/borg>
 - Report a bug: <https://github.com/YunoHost-Apps/borg_ynh/issues>

--- a/README_es.md
+++ b/README_es.md
@ -26,7 +26,7 @@ This app is the "client" part, meant to be installed on the server to be backed
 - ... or on a [commercial borg service](https://www.borgbackup.org/support/commercial.html)
 - Backups are encrypted (the remote server can't read the content) and deduplicated (optimize space)
 - Backups are ran automatically, you can choose when and at which frequency
- You can choose what apps are backuped
+- You can choose what apps are backed up
 - Receive email alerts if the backup fails (the [borg server app](https://apps.yunohost.org/app/borgserver) also checks that new content arrives and send an email to your friend otherwise)

 ### Install procedure
@ -34,10 +34,12 @@ This app is the "client" part, meant to be installed on the server to be backed
 Maybe counter-intuitively, you should *first* install this app (`borg_ynh`) and *then* (`borgserver_ynh`) on the other machine. In fact, at the end of the install of `borg_ynh`, you will be provided with the info, in particular the SSH public key, to be used to setup `borgserver_ynh` on the other machine.


-**Versión actual:** 1.2.8~ynh2
+**Versión actual:** 1.4.0~ynh1
 ## Documentaciones y recursos

- Sitio web oficial: <https://borgbackup.readthedocs.io>
+- Sitio web oficial: <https://www.borgbackup.org>
+- Documentación administrador oficial: <https://borgbackup.readthedocs.io>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/borgbackup/borg>
 - Catálogo YunoHost: <https://apps.yunohost.org/app/borg>
 - Reportar un error: <https://github.com/YunoHost-Apps/borg_ynh/issues>

--- a/README_eu.md
+++ b/README_eu.md
@ -26,7 +26,7 @@ This app is the "client" part, meant to be installed on the server to be backed
 - ... or on a [commercial borg service](https://www.borgbackup.org/support/commercial.html)
 - Backups are encrypted (the remote server can't read the content) and deduplicated (optimize space)
 - Backups are ran automatically, you can choose when and at which frequency
- You can choose what apps are backuped
+- You can choose what apps are backed up
 - Receive email alerts if the backup fails (the [borg server app](https://apps.yunohost.org/app/borgserver) also checks that new content arrives and send an email to your friend otherwise)

 ### Install procedure
@ -34,10 +34,12 @@ This app is the "client" part, meant to be installed on the server to be backed
 Maybe counter-intuitively, you should *first* install this app (`borg_ynh`) and *then* (`borgserver_ynh`) on the other machine. In fact, at the end of the install of `borg_ynh`, you will be provided with the info, in particular the SSH public key, to be used to setup `borgserver_ynh` on the other machine.


-**Paketatutako bertsioa:** 1.2.8~ynh2
+**Paketatutako bertsioa:** 1.4.0~ynh1
 ## Dokumentazioa eta baliabideak

- Aplikazioaren webgune ofiziala: <https://borgbackup.readthedocs.io>
+- Aplikazioaren webgune ofiziala: <https://www.borgbackup.org>
+- Administratzaileen dokumentazio ofiziala: <https://borgbackup.readthedocs.io>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/borgbackup/borg>
 - YunoHost Denda: <https://apps.yunohost.org/app/borg>
 - Eman errore baten berri: <https://github.com/YunoHost-Apps/borg_ynh/issues>

--- a/README_fr.md
+++ b/README_fr.md
@ -26,7 +26,7 @@ This app is the "client" part, meant to be installed on the server to be backed
 - ... or on a [commercial borg service](https://www.borgbackup.org/support/commercial.html)
 - Backups are encrypted (the remote server can't read the content) and deduplicated (optimize space)
 - Backups are ran automatically, you can choose when and at which frequency
- You can choose what apps are backuped
+- You can choose what apps are backed up
 - Receive email alerts if the backup fails (the [borg server app](https://apps.yunohost.org/app/borgserver) also checks that new content arrives and send an email to your friend otherwise)

 ### Install procedure
@ -34,10 +34,12 @@ This app is the "client" part, meant to be installed on the server to be backed
 Maybe counter-intuitively, you should *first* install this app (`borg_ynh`) and *then* (`borgserver_ynh`) on the other machine. In fact, at the end of the install of `borg_ynh`, you will be provided with the info, in particular the SSH public key, to be used to setup `borgserver_ynh` on the other machine.


-**Version incluse :** 1.2.8~ynh2
+**Version incluse :** 1.4.0~ynh1
 ## Documentations et ressources

- Site officiel de l’app : <https://borgbackup.readthedocs.io>
+- Site officiel de l’app : <https://www.borgbackup.org>
+- Documentation officielle de l’admin : <https://borgbackup.readthedocs.io>
+- Dépôt de code officiel de l’app : <https://github.com/borgbackup/borg>
 - YunoHost Store : <https://apps.yunohost.org/app/borg>
 - Signaler un bug : <https://github.com/YunoHost-Apps/borg_ynh/issues>

--- a/README_gl.md
+++ b/README_gl.md
@ -26,7 +26,7 @@ This app is the "client" part, meant to be installed on the server to be backed
 - ... or on a [commercial borg service](https://www.borgbackup.org/support/commercial.html)
 - Backups are encrypted (the remote server can't read the content) and deduplicated (optimize space)
 - Backups are ran automatically, you can choose when and at which frequency
- You can choose what apps are backuped
+- You can choose what apps are backed up
 - Receive email alerts if the backup fails (the [borg server app](https://apps.yunohost.org/app/borgserver) also checks that new content arrives and send an email to your friend otherwise)

 ### Install procedure
@ -34,10 +34,12 @@ This app is the "client" part, meant to be installed on the server to be backed
 Maybe counter-intuitively, you should *first* install this app (`borg_ynh`) and *then* (`borgserver_ynh`) on the other machine. In fact, at the end of the install of `borg_ynh`, you will be provided with the info, in particular the SSH public key, to be used to setup `borgserver_ynh` on the other machine.


-**Versión proporcionada:** 1.2.8~ynh2
+**Versión proporcionada:** 1.4.0~ynh1
 ## Documentación e recursos

- Web oficial da app: <https://borgbackup.readthedocs.io>
+- Web oficial da app: <https://www.borgbackup.org>
+- Documentación oficial para admin: <https://borgbackup.readthedocs.io>
+- Repositorio de orixe do código: <https://github.com/borgbackup/borg>
 - Tenda YunoHost: <https://apps.yunohost.org/app/borg>
 - Informar dun problema: <https://github.com/YunoHost-Apps/borg_ynh/issues>

--- a/README_id.md
+++ b/README_id.md
@ -26,7 +26,7 @@ This app is the "client" part, meant to be installed on the server to be backed
 - ... or on a [commercial borg service](https://www.borgbackup.org/support/commercial.html)
 - Backups are encrypted (the remote server can't read the content) and deduplicated (optimize space)
 - Backups are ran automatically, you can choose when and at which frequency
- You can choose what apps are backuped
+- You can choose what apps are backed up
 - Receive email alerts if the backup fails (the [borg server app](https://apps.yunohost.org/app/borgserver) also checks that new content arrives and send an email to your friend otherwise)

 ### Install procedure
@ -34,10 +34,12 @@ This app is the "client" part, meant to be installed on the server to be backed
 Maybe counter-intuitively, you should *first* install this app (`borg_ynh`) and *then* (`borgserver_ynh`) on the other machine. In fact, at the end of the install of `borg_ynh`, you will be provided with the info, in particular the SSH public key, to be used to setup `borgserver_ynh` on the other machine.


-**Versi terkirim:** 1.2.8~ynh2
+**Versi terkirim:** 1.4.0~ynh1
 ## Dokumentasi dan sumber daya

- Website aplikasi resmi: <https://borgbackup.readthedocs.io>
+- Website aplikasi resmi: <https://www.borgbackup.org>
+- Dokumentasi admin resmi: <https://borgbackup.readthedocs.io>
+- Depot kode aplikasi hulu: <https://github.com/borgbackup/borg>
 - Gudang YunoHost: <https://apps.yunohost.org/app/borg>
 - Laporkan bug: <https://github.com/YunoHost-Apps/borg_ynh/issues>

--- a/README_ru.md
+++ b/README_ru.md
@ -0,0 +1,58 @@
+<!--
+Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Он НЕ ДОЛЖЕН редактироваться вручную.
+-->
+
+# Borg Backup для YunoHost
+
+[![Уровень интеграции](https://dash.yunohost.org/integration/borg.svg)](https://ci-apps.yunohost.org/ci/apps/borg/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/borg.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/borg.maintain.svg)
+
+[![Установите Borg Backup с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=borg)
+
+*[Прочтите этот README на других языках.](./ALL_README.md)*
+
+> *Этот пакет позволяет Вам установить Borg Backup быстро и просто на YunoHost-сервер.*  
+> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*
+
+## Обзор
+
+A [Borg](https://borgbackup.readthedocs.io/en/stable/index.html#what-is-borgbackup) integration to backup your YunoHost server to another remote server (e.g. one of your friends).
+
+This app is the "client" part, meant to be installed on the server to be backed up. It works in combination with the [borg server app](https://apps.yunohost.org/app/borgserver) installed on a diffent machine.
+
+### Features
+
+- Backup on a remote machine, in combination with the [borg server app](https://apps.yunohost.org/app/borgserver)
+- ... or on a [commercial borg service](https://www.borgbackup.org/support/commercial.html)
+- Backups are encrypted (the remote server can't read the content) and deduplicated (optimize space)
+- Backups are ran automatically, you can choose when and at which frequency
+- You can choose what apps are backed up
+- Receive email alerts if the backup fails (the [borg server app](https://apps.yunohost.org/app/borgserver) also checks that new content arrives and send an email to your friend otherwise)
+
+### Install procedure
+
+Maybe counter-intuitively, you should *first* install this app (`borg_ynh`) and *then* (`borgserver_ynh`) on the other machine. In fact, at the end of the install of `borg_ynh`, you will be provided with the info, in particular the SSH public key, to be used to setup `borgserver_ynh` on the other machine.
+
+
+**Поставляемая версия:** 1.4.0~ynh1
+## Документация и ресурсы
+
+- Официальный веб-сайт приложения: <https://www.borgbackup.org>
+- Официальная документация администратора: <https://borgbackup.readthedocs.io>
+- Репозиторий кода главной ветки приложения: <https://github.com/borgbackup/borg>
+- Магазин YunoHost: <https://apps.yunohost.org/app/borg>
+- Сообщите об ошибке: <https://github.com/YunoHost-Apps/borg_ynh/issues>
+
+## Информация для разработчиков
+
+Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/borg_ynh/tree/testing).
+
+Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/borg_ynh/tree/testing --debug
+или
+sudo yunohost app upgrade borg -u https://github.com/YunoHost-Apps/borg_ynh/tree/testing --debug
+```
+
+**Больше информации о пакетировании приложений:** <https://yunohost.org/packaging_apps>
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@ -26,7 +26,7 @@ This app is the "client" part, meant to be installed on the server to be backed
 - ... or on a [commercial borg service](https://www.borgbackup.org/support/commercial.html)
 - Backups are encrypted (the remote server can't read the content) and deduplicated (optimize space)
 - Backups are ran automatically, you can choose when and at which frequency
- You can choose what apps are backuped
+- You can choose what apps are backed up
 - Receive email alerts if the backup fails (the [borg server app](https://apps.yunohost.org/app/borgserver) also checks that new content arrives and send an email to your friend otherwise)

 ### Install procedure
@ -34,10 +34,12 @@ This app is the "client" part, meant to be installed on the server to be backed
 Maybe counter-intuitively, you should *first* install this app (`borg_ynh`) and *then* (`borgserver_ynh`) on the other machine. In fact, at the end of the install of `borg_ynh`, you will be provided with the info, in particular the SSH public key, to be used to setup `borgserver_ynh` on the other machine.


-**分发版本：** 1.2.8~ynh2
+**分发版本：** 1.4.0~ynh1
 ## 文档与资源

- 官方应用网站： <https://borgbackup.readthedocs.io>
+- 官方应用网站： <https://www.borgbackup.org>
+- 官方管理文档： <https://borgbackup.readthedocs.io>
+- 上游应用代码库： <https://github.com/borgbackup/borg>
 - YunoHost 商店： <https://apps.yunohost.org/app/borg>
 - 报告 bug： <https://github.com/YunoHost-Apps/borg_ynh/issues>

--- a/conf/backup-with-borg
+++ b/conf/backup-with-borg
@ -50,7 +50,7 @@ for application in $(sudo ls /etc/yunohost/apps/); do
    fi

    if sudo test ! -f "/etc/yunohost/apps/$application/scripts/backup" ; then
-        errors+="\nWarning: The application $application has no backup script. This app won't be backuped."
+        errors+="\nWarning: The application $application has no backup script. This app won't be backed up."
        continue
    fi

--- a/config_panel.toml
+++ b/config_panel.toml
@ -48,7 +48,7 @@ services = []
        help = "Alerts are sent to the first user of this server"
        
    [main.content]
-    name = "What should be backuped?"
+    name = "What should be backed up?"
    optional = false

        [main.content.conf]
--- a/doc/DESCRIPTION.md
+++ b/doc/DESCRIPTION.md
@ -8,7 +8,7 @@ This app is the "client" part, meant to be installed on the server to be backed
 - ... or on a [commercial borg service](https://www.borgbackup.org/support/commercial.html)
 - Backups are encrypted (the remote server can't read the content) and deduplicated (optimize space)
 - Backups are ran automatically, you can choose when and at which frequency
- You can choose what apps are backuped
+- You can choose what apps are backed up
 - Receive email alerts if the backup fails (the [borg server app](https://apps.yunohost.org/app/borgserver) also checks that new content arrives and send an email to your friend otherwise)

 ### Install procedure
--- a/manifest.toml
+++ b/manifest.toml
@ -7,18 +7,20 @@ name = "Borg Backup"
 description.en = "Regularly create deduplicated, encrypted backups sent to another server using Borg"
 description.fr = "Créez régulièrement des sauvegardes dédupliquées et chiffées envoyées sur un autre serveur à l'aide de Borg"

-version = "1.2.8~ynh2"
+version = "1.4.0~ynh1"

 maintainers = ["ljf"]

 [upstream]
 license = "BSD-3-Clause"
-website = "https://borgbackup.readthedocs.io"
+website = "https://www.borgbackup.org"
+admindoc = "https://borgbackup.readthedocs.io"
+code = "https://github.com/borgbackup/borg"
 cpe = "cpe:2.3:a:borg_project:borg"
 fund = "https://www.borgbackup.org/support/fund.html"

 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.20"
 architectures = "all"
 multi_instance = true
 ldap = "not_relevant"
@ -78,8 +80,8 @@ ram.runtime = "50M"

 [resources]
    [resources.sources.main]
-    url = "https://github.com/borgbackup/borg/archive/refs/tags/1.2.8.tar.gz"
-    sha256 = "0b7d124191372dda45274fbf9e393b066992fcfef05fea63714f7c5c1843fc7c"
+    url = "https://github.com/borgbackup/borg/archive/refs/tags/1.4.0.tar.gz"
+    sha256 = "88d0e37bee67398ee12414c18d67502a5dbf06b1a72fbffe2e20fcd5736e7320"
    # Only here to bump the package version
    prefetch = false

@ -103,5 +105,7 @@ ram.runtime = "50M"
        "libssl-dev",
        "liblz4-dev",
        "libfuse3-dev",
+        "libxxhash-dev",
+        "libzstd-dev",
        "pkg-config",
    ]
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -13,7 +13,6 @@ install_borg_with_pip () {
    venvpy="$install_dir/venv/bin/python3"

    ynh_exec_as "$app" "$venvpy" -m pip install --upgrade setuptools wheel
-
    BORG_VERSION=$(ynh_app_upstream_version)
    ynh_exec_as "$app" "$venvpy" -m pip install borgbackup[pyfuse3]=="$BORG_VERSION"
 }