Merge branch 'testing' into add-apprise

ALL_README.md

@@ -1,8 +1,10 @@
 # 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)
+- [Baca README dalam bahasa bahasa Indonesia](README_id.md)
+- [Прочитать README на русский](README_ru.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # BorgWarehouse for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/borgwarehouse.svg)](https://dash.yunohost.org/appci/app/borgwarehouse) ![Working status](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/borgwarehouse.svg)](https://ci-apps.yunohost.org/ci/apps/borgwarehouse/) ![Working status](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.maintain.svg)
 
 [![Install BorgWarehouse with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=borgwarehouse)
 
@@ -19,7 +19,7 @@ It shall NOT be edited by hand.
 BorgWarhouse is a fast and modern WebUI for a BorgBackup's central repository server. 
 
 
-**Shipped version:** 2.3.0~ynh1
+**Shipped version:** 2.4.1~ynh1
 
 ## Screenshots
 

README_es.md

@@ -5,7 +5,7 @@ No se debe editar a mano.
 
 # BorgWarehouse para Yunohost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/borgwarehouse.svg)](https://dash.yunohost.org/appci/app/borgwarehouse) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/borgwarehouse.svg)](https://ci-apps.yunohost.org/ci/apps/borgwarehouse/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.maintain.svg)
 
 [![Instalar BorgWarehouse con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=borgwarehouse)
 
@@ -19,7 +19,7 @@ No se debe editar a mano.
 BorgWarhouse is a fast and modern WebUI for a BorgBackup's central repository server. 
 
 
-**Versión actual:** 2.3.0~ynh1
+**Versión actual:** 2.4.1~ynh1
 
 ## Capturas
 

README_eu.md

@@ -5,7 +5,7 @@ EZ editatu eskuz.
 
 # BorgWarehouse YunoHost-erako
 
-[![Integrazio maila](https://dash.yunohost.org/integration/borgwarehouse.svg)](https://dash.yunohost.org/appci/app/borgwarehouse) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.maintain.svg)
+[![Integrazio maila](https://dash.yunohost.org/integration/borgwarehouse.svg)](https://ci-apps.yunohost.org/ci/apps/borgwarehouse/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.maintain.svg)
 
 [![Instalatu BorgWarehouse YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=borgwarehouse)
 
@@ -19,7 +19,7 @@ EZ editatu eskuz.
 BorgWarhouse is a fast and modern WebUI for a BorgBackup's central repository server. 
 
 
-**Paketatutako bertsioa:** 2.3.0~ynh1
+**Paketatutako bertsioa:** 2.4.1~ynh1
 
 ## Pantaila-argazkiak
 

README_fr.md

@@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
 
 # BorgWarehouse pour YunoHost
 
-[![Niveau d’intégration](https://dash.yunohost.org/integration/borgwarehouse.svg)](https://dash.yunohost.org/appci/app/borgwarehouse) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.maintain.svg)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/borgwarehouse.svg)](https://ci-apps.yunohost.org/ci/apps/borgwarehouse/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.maintain.svg)
 
 [![Installer BorgWarehouse avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=borgwarehouse)
 
@@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main.
 
 BorgWarhouse est une interface Web rapide et moderne pour BorgBackup.
 
-**Version incluse :** 2.3.0~ynh1
+**Version incluse :** 2.4.1~ynh1
 
 ## Captures d’écran
 

README_gl.md

@@ -5,7 +5,7 @@ NON debe editarse manualmente.
 
 # BorgWarehouse para YunoHost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/borgwarehouse.svg)](https://dash.yunohost.org/appci/app/borgwarehouse) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/borgwarehouse.svg)](https://ci-apps.yunohost.org/ci/apps/borgwarehouse/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.maintain.svg)
 
 [![Instalar BorgWarehouse con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=borgwarehouse)
 
@@ -19,7 +19,7 @@ NON debe editarse manualmente.
 BorgWarhouse is a fast and modern WebUI for a BorgBackup's central repository server. 
 
 
-**Versión proporcionada:** 2.3.0~ynh1
+**Versión proporcionada:** 2.4.1~ynh1
 
 ## Capturas de pantalla
 

README_id.md

@@ -0,0 +1,48 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# BorgWarehouse untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/borgwarehouse.svg)](https://ci-apps.yunohost.org/ci/apps/borgwarehouse/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.maintain.svg)
+
+[![Pasang BorgWarehouse dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=borgwarehouse)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang BorgWarehouse secara cepat dan mudah pada server YunoHost.*  
+> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.*
+
+## Ringkasan
+
+BorgWarhouse is a fast and modern WebUI for a BorgBackup's central repository server. 
+
+
+**Versi terkirim:** 2.4.1~ynh1
+
+## Tangkapan Layar
+
+![Tangkapan Layar pada BorgWarehouse](./doc/screenshots/screenshot.png)
+
+## Dokumentasi dan sumber daya
+
+- Website aplikasi resmi: <https://borgwarehouse.com/>
+- Dokumentasi admin resmi: <https://borgwarehouse.com/docs/admin-manual/debian-installation/>
+- Depot kode aplikasi hulu: <https://github.com/ravinou/borgwarehouse>
+- Gudang YunoHost: <https://apps.yunohost.org/app/borgwarehouse>
+- Laporkan bug: <https://github.com/YunoHost-Apps/borgwarehouse_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/borgwarehouse_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/borgwarehouse_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade borgwarehouse -u https://github.com/YunoHost-Apps/borgwarehouse_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>

README_ru.md

@@ -0,0 +1,48 @@
+<!--
+Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Он НЕ ДОЛЖЕН редактироваться вручную.
+-->
+
+# BorgWarehouse для YunoHost
+
+[![Уровень интеграции](https://dash.yunohost.org/integration/borgwarehouse.svg)](https://ci-apps.yunohost.org/ci/apps/borgwarehouse/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.maintain.svg)
+
+[![Установите BorgWarehouse с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=borgwarehouse)
+
+*[Прочтите этот README на других языках.](./ALL_README.md)*
+
+> *Этот пакет позволяет Вам установить BorgWarehouse быстро и просто на YunoHost-сервер.*  
+> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*
+
+## Обзор
+
+BorgWarhouse is a fast and modern WebUI for a BorgBackup's central repository server. 
+
+
+**Поставляемая версия:** 2.4.1~ynh1
+
+## Снимки экрана
+
+![Снимок экрана BorgWarehouse](./doc/screenshots/screenshot.png)
+
+## Документация и ресурсы
+
+- Официальный веб-сайт приложения: <https://borgwarehouse.com/>
+- Официальная документация администратора: <https://borgwarehouse.com/docs/admin-manual/debian-installation/>
+- Репозиторий кода главной ветки приложения: <https://github.com/ravinou/borgwarehouse>
+- Магазин YunoHost: <https://apps.yunohost.org/app/borgwarehouse>
+- Сообщите об ошибке: <https://github.com/YunoHost-Apps/borgwarehouse_ynh/issues>
+
+## Информация для разработчиков
+
+Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/borgwarehouse_ynh/tree/testing).
+
+Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/borgwarehouse_ynh/tree/testing --debug
+или
+sudo yunohost app upgrade borgwarehouse -u https://github.com/YunoHost-Apps/borgwarehouse_ynh/tree/testing --debug
+```
+
+**Больше информации о пакетировании приложений:** <https://yunohost.org/packaging_apps>

README_zh_Hans.md

@@ -5,7 +5,7 @@
 
 # YunoHost 上的 BorgWarehouse
 
-[![集成程度](https://dash.yunohost.org/integration/borgwarehouse.svg)](https://dash.yunohost.org/appci/app/borgwarehouse) ![工作状态](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.maintain.svg)
+[![集成程度](https://dash.yunohost.org/integration/borgwarehouse.svg)](https://ci-apps.yunohost.org/ci/apps/borgwarehouse/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/borgwarehouse.maintain.svg)
 
 [![使用 YunoHost 安装 BorgWarehouse](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=borgwarehouse)
 
@@ -19,7 +19,7 @@
 BorgWarhouse is a fast and modern WebUI for a BorgBackup's central repository server. 
 
 
-**分发版本：** 2.3.0~ynh1
+**分发版本：** 2.4.1~ynh1
 
 ## 截图
 

conf/systemd.service

@@ -13,5 +13,39 @@ Environment=PORT=__PORT__
 ExecStart=__YNH_NPM__ run start
 Restart=on-failure
 
+### Depending on specificities of your service/app, you may need to tweak these
+### .. but this should be a good baseline
+# Sandboxing options to harden security
+# Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html
+NoNewPrivileges=yes
+PrivateTmp=yes
+PrivateDevices=yes
+RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 AF_NETLINK
+RestrictNamespaces=yes
+RestrictRealtime=yes
+DevicePolicy=closed
+ProtectClock=yes
+ProtectHostname=yes
+ProtectProc=invisible
+ProtectSystem=full
+ProtectControlGroups=yes
+ProtectKernelModules=yes
+ProtectKernelTunables=yes
+LockPersonality=yes
+SystemCallArchitectures=native
+SystemCallFilter=~@clock @debug @module @mount @obsolete @reboot @setuid @swap @cpu-emulation @privileged
+
+# Denying access to capabilities that should not be relevant for webapps
+# Doc: https://man7.org/linux/man-pages/man7/capabilities.7.html
+CapabilityBoundingSet=~CAP_RAWIO CAP_MKNOD
+CapabilityBoundingSet=~CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE
+CapabilityBoundingSet=~CAP_SYS_BOOT CAP_SYS_TIME CAP_SYS_MODULE CAP_SYS_PACCT
+CapabilityBoundingSet=~CAP_LEASE CAP_LINUX_IMMUTABLE CAP_IPC_LOCK
+CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_WAKE_ALARM
+CapabilityBoundingSet=~CAP_SYS_TTY_CONFIG
+CapabilityBoundingSet=~CAP_MAC_ADMIN CAP_MAC_OVERRIDE
+CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW
+CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG
+
 [Install]
 WantedBy=multi-user.target

manifest.toml

@@ -7,7 +7,7 @@ name = "BorgWarehouse"
 description.en = "WebUI for a BorgBackup's central repository server"
 description.fr = "WebUI pour BorgBackup"
 
-version = "2.3.0~ynh2"
+version = "2.4.1~ynh1"
 
 maintainers = []
 
@@ -43,8 +43,8 @@ ram.runtime = "50M"
     [resources.sources]
 
         [resources.sources.main]
-        url = "https://github.com/ravinou/borgwarehouse/archive/refs/tags/v2.3.0.tar.gz"
+        url = "https://github.com/ravinou/borgwarehouse/archive/refs/tags/v2.4.1.tar.gz"
-        sha256 = "5b02e741ed433c78e9acc63900206c257f2fcbfa6d5810caf75acba9649d91dc"
+        sha256 = "752919780293bd34b0e1dc09c61d9a1de51a4c693947719fbb1118749da88426"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.system_user]

scripts/_common.sh

@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-nodejs_version=18
+nodejs_version=20
 ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+")
 main_domain=$(cat /etc/yunohost/current_host)
 

scripts/upgrade

@@ -9,8 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
@@ -31,14 +29,10 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=1
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
+# Download, check integrity, uncompress and patch the source from manifest.toml
-then
+ynh_setup_source --dest_dir="/home/yunohost.app/$app/app" --keep="app/.env.local app/config/users.json app/config/repo.json"
-	ynh_script_progression --message="Upgrading source files..." --weight=1
-
-	# Download, check integrity, uncompress and patch the source from manifest.toml
-	ynh_setup_source --dest_dir="/home/yunohost.app/$app/app" --keep="app/.env.local app/config/users.json app/config/repo.json"
-fi
 
 chown -R $app:www-data "/home/yunohost.app/$app/app"