From 891f80970d7c110768552f48d5205626cc63b469 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 13 Aug 2024 03:31:22 +0200 Subject: [PATCH 1/6] Upgrade sources - `main` v1.4.0: https://github.com/borgbackup/borg/releases/tag/1.4.0 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index f6ea0c3..afb6dee 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Borg Server" description.en = "Offer backup storage to a friend" description.fr = "Offrez un espace de stockage à un⋅e ami⋅e" -version = "1.2.8~ynh5" +version = "1.4.0~ynh1" maintainers = ["ljf"] @@ -61,8 +61,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 From 557c011c440db7504928c00f41e4e19a253653c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Tue, 20 Aug 2024 13:19:06 +0200 Subject: [PATCH 2/6] Fix apt packages list --- manifest.toml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index afb6dee..dde959b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -78,14 +78,15 @@ ram.runtime = "50M" [resources.apt] packages = [ - "python3-pip", + "python3", "python3-dev", - "python3-jinja2", - "python3-setuptools", + "python3-pip", "python3-venv", "libacl1-dev", "libssl-dev", "liblz4-dev", + "libzstd-dev", + "libxxhash-dev", "libfuse3-dev", "pkg-config", ] From 3d3c5cb8b3935021258d6425038116059ba0f98c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 20 Aug 2024 11:38:26 +0000 Subject: [PATCH 3/6] 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 | 2 +- README_ru.md | 2 +- README_zh_Hans.md | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index c6cdbc2..e834c86 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Setup a storage space to be used for backup using Borg This app is the "server" part, meant to be installed on the machine providing the backup storage. It is designed to work in combination with the [borg 'client' app](https://apps.yunohost.org/app/borg) installed on a diffent machine. -**Shipped version:** 1.2.8~ynh5 +**Shipped version:** 1.4.0~ynh1 ## Documentation and resources - Official app website: diff --git a/README_es.md b/README_es.md index 4966a19..ee5c836 100644 --- a/README_es.md +++ b/README_es.md @@ -21,7 +21,7 @@ Setup a storage space to be used for backup using Borg This app is the "server" part, meant to be installed on the machine providing the backup storage. It is designed to work in combination with the [borg 'client' app](https://apps.yunohost.org/app/borg) installed on a diffent machine. -**Versión actual:** 1.2.8~ynh5 +**Versión actual:** 1.4.0~ynh1 ## Documentaciones y recursos - Sitio web oficial: diff --git a/README_eu.md b/README_eu.md index 4368a91..73ecfbf 100644 --- a/README_eu.md +++ b/README_eu.md @@ -21,7 +21,7 @@ Setup a storage space to be used for backup using Borg This app is the "server" part, meant to be installed on the machine providing the backup storage. It is designed to work in combination with the [borg 'client' app](https://apps.yunohost.org/app/borg) installed on a diffent machine. -**Paketatutako bertsioa:** 1.2.8~ynh5 +**Paketatutako bertsioa:** 1.4.0~ynh1 ## Dokumentazioa eta baliabideak - Aplikazioaren webgune ofiziala: diff --git a/README_fr.md b/README_fr.md index 42ff73b..e746f86 100644 --- a/README_fr.md +++ b/README_fr.md @@ -21,7 +21,7 @@ Setup a storage space to be used for backup using Borg This app is the "server" part, meant to be installed on the machine providing the backup storage. It is designed to work in combination with the [borg 'client' app](https://apps.yunohost.org/app/borg) installed on a diffent machine. -**Version incluse :** 1.2.8~ynh5 +**Version incluse :** 1.4.0~ynh1 ## Documentations et ressources - Site officiel de l’app : diff --git a/README_gl.md b/README_gl.md index e252b8e..acd660b 100644 --- a/README_gl.md +++ b/README_gl.md @@ -21,7 +21,7 @@ Setup a storage space to be used for backup using Borg This app is the "server" part, meant to be installed on the machine providing the backup storage. It is designed to work in combination with the [borg 'client' app](https://apps.yunohost.org/app/borg) installed on a diffent machine. -**Versión proporcionada:** 1.2.8~ynh5 +**Versión proporcionada:** 1.4.0~ynh1 ## Documentación e recursos - Web oficial da app: diff --git a/README_id.md b/README_id.md index e0d7b05..871b8c1 100644 --- a/README_id.md +++ b/README_id.md @@ -21,7 +21,7 @@ Setup a storage space to be used for backup using Borg This app is the "server" part, meant to be installed on the machine providing the backup storage. It is designed to work in combination with the [borg 'client' app](https://apps.yunohost.org/app/borg) installed on a diffent machine. -**Versi terkirim:** 1.2.8~ynh5 +**Versi terkirim:** 1.4.0~ynh1 ## Dokumentasi dan sumber daya - Website aplikasi resmi: diff --git a/README_ru.md b/README_ru.md index 965e5fd..2f4e604 100644 --- a/README_ru.md +++ b/README_ru.md @@ -21,7 +21,7 @@ Setup a storage space to be used for backup using Borg This app is the "server" part, meant to be installed on the machine providing the backup storage. It is designed to work in combination with the [borg 'client' app](https://apps.yunohost.org/app/borg) installed on a diffent machine. -**Поставляемая версия:** 1.2.8~ynh5 +**Поставляемая версия:** 1.4.0~ynh1 ## Документация и ресурсы - Официальный веб-сайт приложения: diff --git a/README_zh_Hans.md b/README_zh_Hans.md index cf5a8f2..a37f8e2 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -21,7 +21,7 @@ Setup a storage space to be used for backup using Borg This app is the "server" part, meant to be installed on the machine providing the backup storage. It is designed to work in combination with the [borg 'client' app](https://apps.yunohost.org/app/borg) installed on a diffent machine. -**分发版本：** 1.2.8~ynh5 +**分发版本：** 1.4.0~ynh1 ## 文档与资源 - 官方应用网站： From 26c7e77f8db61c63fe3b06f0848b335d591eab17 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sat, 24 Aug 2024 09:18:27 +0000 Subject: [PATCH 4/6] Typo --- conf/monitor-backup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/monitor-backup.sh b/conf/monitor-backup.sh index 2618aa0..c0179af 100644 --- a/conf/monitor-backup.sh +++ b/conf/monitor-backup.sh @@ -7,6 +7,6 @@ ALERT_DELAY="$(grep '^alert_delay: ' /etc/yunohost/apps/__APP__/settings.yml | a if [[ $(find /home/__SSH_USER__/backup/data -follow -mtime -${ALERT_DELAY} -ls | wc -l) > 0 ]]; then : else - echo "No file has been backuped in /home/__SSH_USER__ since ${ALERT_DELAY} days" \ + echo "No file has been backed up in /home/__SSH_USER__ since ${ALERT_DELAY} days" \ | mail -s "[YNH] Backup missing : __SSH_USER__" $(grep '^alert_mails: ' /etc/yunohost/apps/__APP__/settings.yml | awk '{print $2}') fi From 89e1a991fd7a62f901f7a7a8064433ddc67384a5 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 24 Aug 2024 12:23:00 +0200 Subject: [PATCH 5/6] add PATH env var, and keep only one line in the authorized_keys file --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 75da2fb..d31b766 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -29,7 +29,7 @@ create_ssh_config() { if [[ -n "$quota" ]]; then extra="--storage-quota $quota" fi - command="$install_dir/venv/bin/borg serve $extra --restrict-to-repository $repository" + command="PATH=$install_dir/venv/bin/:$PATH borg serve $extra --restrict-to-repository $repository" ssh_opts="command=\"$command\",no-pty,no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-user-rc" mkdir -p "$ssh_dir" From 42e9a03358460f5ae03a5813a3460727e17155c1 Mon Sep 17 00:00:00 2001 From: Kayou Date: Sat, 24 Aug 2024 12:24:07 +0200 Subject: [PATCH 6/6] oups --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index d31b766..ff62b1d 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -34,7 +34,7 @@ create_ssh_config() { mkdir -p "$ssh_dir" touch "$ssh_dir/authorized_keys" - echo "$ssh_opts $public_key" >> "$ssh_dir/authorized_keys" + echo "$ssh_opts $public_key" > "$ssh_dir/authorized_keys" chown -R "$ssh_user:$ssh_user" "$ssh_dir" chmod -R u=rwX,go=--- "$ssh_dir"