Merge pull request #28 from YunoHost-Apps/testing

ALL_README.md

@@ -1,6 +1,8 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
+- [Lee 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)
-- [Leggi il “README” in italiano](README_it.md)
+- [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -9,7 +9,7 @@ It shall NOT be edited by hand.
 
 [![Install Lidarr with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lidarr)
 
-*[Read this README is other languages.](./ALL_README.md)*
+*[Read this README in other languages.](./ALL_README.md)*
 
 > *This package allows you to install Lidarr quickly and simply on a YunoHost server.*  
 > *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.*
@@ -18,7 +18,7 @@ It shall NOT be edited by hand.
 
 Music collection manager for Usenet and BitTorrent users
 
-**Shipped version:** 1.3.5.3530~ynh3
+**Shipped version:** 2.3.3.4204~ynh1
 
 ## Screenshots
 

README_es.md

@@ -0,0 +1,47 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Lidarr para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/lidarr.svg)](https://dash.yunohost.org/appci/app/lidarr) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/lidarr.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/lidarr.maintain.svg)
+
+[![Instalar Lidarr con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lidarr)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarLidarr rapidamente y simplement en un servidor YunoHost.*  
+> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
+
+## Descripción general
+
+Music collection manager for Usenet and BitTorrent users
+
+**Versión actual:** 2.3.3.4204~ynh1
+
+## Capturas
+
+![Captura de Lidarr](./doc/screenshots/screenshot.jpg)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://lidarr.audio>
+- Documentación administrador oficial: <https://wiki.servarr.com/Lidarr>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/Lidarr/Lidarr>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/lidarr>
+- Reportar un error: <https://github.com/YunoHost-Apps/lidarr_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/lidarr_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/lidarr_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade lidarr -u https://github.com/YunoHost-Apps/lidarr_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_eu.md

@@ -0,0 +1,47 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# Lidarr YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/lidarr.svg)](https://dash.yunohost.org/appci/app/lidarr) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/lidarr.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/lidarr.maintain.svg)
+
+[![Instalatu Lidarr YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lidarr)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek Lidarr YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+Music collection manager for Usenet and BitTorrent users
+
+**Paketatutako bertsioa:** 2.3.3.4204~ynh1
+
+## Pantaila-argazkiak
+
+![Lidarr(r)en pantaila-argazkia](./doc/screenshots/screenshot.jpg)
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://lidarr.audio>
+- Administratzaileen dokumentazio ofiziala: <https://wiki.servarr.com/Lidarr>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/Lidarr/Lidarr>
+- YunoHost Denda: <https://apps.yunohost.org/app/lidarr>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/lidarr_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/lidarr_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/lidarr_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade lidarr -u https://github.com/YunoHost-Apps/lidarr_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main.
 
 Music collection manager for Usenet and BitTorrent users
 
-**Version incluse :** 1.3.5.3530~ynh3
+**Version incluse :** 2.3.3.4204~ynh1
 
 ## Captures d’écran
 

README_gl.md

@@ -18,7 +18,7 @@ NON debe editarse manualmente.
 
 Music collection manager for Usenet and BitTorrent users
 
-**Versión proporcionada:** 1.3.5.3530~ynh3
+**Versión proporcionada:** 2.3.3.4204~ynh1
 
 ## Capturas de pantalla
 

README_zh_Hans.md

@@ -0,0 +1,47 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 上的 Lidarr
+
+[![集成程度](https://dash.yunohost.org/integration/lidarr.svg)](https://dash.yunohost.org/appci/app/lidarr) ![工作状态](https://ci-apps.yunohost.org/ci/badges/lidarr.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/lidarr.maintain.svg)
+
+[![使用 YunoHost 安装 Lidarr](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lidarr)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Lidarr。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+Music collection manager for Usenet and BitTorrent users
+
+**分发版本：** 2.3.3.4204~ynh1
+
+## 截图
+
+![Lidarr 的截图](./doc/screenshots/screenshot.jpg)
+
+## 文档与资源
+
+- 官方应用网站： <https://lidarr.audio>
+- 官方管理文档： <https://wiki.servarr.com/Lidarr>
+- 上游应用代码库： <https://github.com/Lidarr/Lidarr>
+- YunoHost 商店： <https://apps.yunohost.org/app/lidarr>
+- 报告 bug： <https://github.com/YunoHost-Apps/lidarr_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/lidarr_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/lidarr_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade lidarr -u https://github.com/YunoHost-Apps/lidarr_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>

conf/config.xml

@@ -6,7 +6,12 @@
   <UrlBase>__PATH__</UrlBase>
   <BindAddress>127.0.0.1</BindAddress>
   <ApiKey>__API_KEY__</ApiKey>
-  <AuthenticationMethod>None</AuthenticationMethod>
+  <AuthenticationMethod>External</AuthenticationMethod>
   <UpdateMechanism>BuiltIn</UpdateMechanism>
   <Branch>main</Branch>
-</Config>
+  <InstanceName>__APP__</InstanceName>
+  <AuthenticationRequired>Enabled</AuthenticationRequired>
+  <LaunchBrowser>False</LaunchBrowser>
+  <SslCertPath></SslCertPath>
+  <SslCertPassword></SslCertPassword>
+</Config>

conf/systemd.service

@@ -13,5 +13,35 @@ TimeoutStopSec=20
 KillMode=process
 Restart=always
 
+# Sandboxing options to harden security
+# Depending on specificities of your service/app, you may need to tweak these
+# .. but this should be a good baseline
+# 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
+RestrictNamespaces=yes
+RestrictRealtime=yes
+DevicePolicy=closed
+ProtectSystem=full
+ProtectControlGroups=yes
+ProtectKernelModules=yes
+ProtectKernelTunables=yes
+LockPersonality=yes
+SystemCallFilter=~@clock @debug @module @mount @obsolete @reboot @setuid @swap
+
+# 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

@@ -5,7 +5,7 @@ name = "Lidarr"
 description.en = "Music collection manager for Usenet and BitTorrent users"
 description.fr = "Gestionnaire de discothèque pour utilisateurs de Usenet et BitTorrent"
 
-version = "1.3.5.3530~ynh3"
+version = "2.3.3.4204~ynh1"
 
 maintainers = ["tituspijean"]
 
@@ -41,14 +41,14 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        arm64.url = "https://github.com/Lidarr/Lidarr/releases/download/v1.3.5.3530/Lidarr.master.1.3.5.3530.linux-core-arm64.tar.gz"
+        arm64.url = "https://github.com/Lidarr/Lidarr/releases/download/v2.3.3.4204/Lidarr.master.2.3.3.4204.linux-core-arm64.tar.gz"
-        arm64.sha256 = "c4c4696e0dfb43d5484628a8cb79144b4d0cd33c424f51b8dfda4d59d8127ba0"
+        arm64.sha256 = "8925d7c7cf48ecf8f69c0b9aa47c09b486e58fe4c3addfe4f4e8812bc404c528"
-        amd64.url = "https://github.com/Lidarr/Lidarr/releases/download/v1.3.5.3530/Lidarr.master.1.3.5.3530.linux-core-x64.tar.gz"
+        amd64.url = "https://github.com/Lidarr/Lidarr/releases/download/v2.3.3.4204/Lidarr.master.2.3.3.4204.linux-core-x64.tar.gz"
-        amd64.sha256 = "0e976c83de76870deb6b6e3f44479d7e6fd2ddc3a871f4abc63479bc63bf6f91"
+        amd64.sha256 = "ba55a0f41843aff445138b1f5c67fe8bd5b42a93982a3b64e3da81788c08f5d5"
-        armhf.url = "https://github.com/Lidarr/Lidarr/releases/download/v1.3.5.3530/Lidarr.master.1.3.5.3530.linux-core-arm.tar.gz"
+        armhf.url = "https://github.com/Lidarr/Lidarr/releases/download/v2.3.3.4204/Lidarr.master.2.3.3.4204.linux-core-arm.tar.gz"
-        armhf.sha256 = "764fb0c756c6c8f4d4ea4156158e37ae0e68fca234989051fdfe533d3e3ae93c"
+        armhf.sha256 = "9e5b0b44827f564e7e9affb8e6b7f933ed1fec4aed58ff8ab9a1b25352546fbb"
-        i386.url = "https://github.com/Lidarr/Lidarr/releases/download/v1.3.5.3530/Lidarr.master.1.3.5.3530.linux-core-x86.tar.gz"
+        i386.url = "https://github.com/Lidarr/Lidarr/releases/download/v2.3.3.4204/Lidarr.master.2.3.3.4204.linux-core-x86.tar.gz"
-        i386.sha256 = "5b531cfe81b8688c1f34fcebee35b67ee72ee3c7afc2b616cd5514eb7fee9823"
+        i386.sha256 = "611dbfdb0c737b33a875ee66aab67f5026a3cf8edeb9721c849f1a7d7dc6c5a4"
 
         autoupdate.strategy = "latest_github_release"
         autoupdate.asset.amd64 = ".*linux-core-x64.tar.gz"

scripts/change_url

@@ -31,6 +31,11 @@ ynh_change_url_nginx_config
 # UPDATE CONFIGURATION FILE
 #=================================================
 
+# Add newline at end of file if required
+if [ -e "$data_dir/config.xml" ]; then
+    sed -i -e '$a\' "$data_dir/config.xml"
+fi
+
 ynh_add_config --template="../conf/config.xml" --destination="$data_dir/config.xml"
 
 chmod 750 "$data_dir/config.xml"

scripts/upgrade

@@ -60,6 +60,11 @@ yunohost service add $app --description="Lidarr daemon" --log="$data_dir/logs/li
 #=================================================
 ynh_script_progression --message="Updating the configuration file.." --weight=1
 
+# Add newline at end of file if required
+if [ -e "$data_dir/config.xml" ]; then
+    sed -i -e '$a\' "$data_dir/config.xml"
+fi
+
 ynh_add_config --template="../conf/config.xml" --destination="$data_dir/config.xml"
 
 chmod 400 "$data_dir/config.xml"
@@ -76,4 +81,9 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --l
 # END OF SCRIPT
 #=================================================
 
+# Let's wait a bit for migrations to happen
+if [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
+    sleep 5
+fi
+
 ynh_script_progression --message="Upgrade of $app completed" --last