Merge pull request #430 from YunoHost-Apps/testing

ALL_README.md

@@ -1,6 +1,7 @@
 # All available README files by language
 
 - [Read the README in English](README.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 PeerTube with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=peertube)
 
-*[Read this README is other languages.](./ALL_README.md)*
+*[Read this README in other languages.](./ALL_README.md)*
 
 > *This package allows you to install PeerTube 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.*
@@ -19,7 +19,7 @@ It shall NOT be edited by hand.
 PeerTube is a decentralized and federated video hosting software. To publish videos, the user must register with a host (called an instance). Each host has its own conditions of use (storage space per user, moderation rules, themes, etc.). Thanks to WebTorrent, if several people view the same video, fragments of it are exchanged between people so as not to overload the instance. Decentralized: Each instance can follow one or more other PeerTube instances in order to allow its users to view their videos. Federated: Via the ActivityPub protocol, Peertube can interact with other software that is part of the Fediverse, such as Mastodon for example.
 
 
-**Shipped version:** 6.0.3~ynh1
+**Shipped version:** 6.0.4~ynh1
 
 **Demo:** <http://peertube.cpy.re>
 

README_eu.md

@@ -0,0 +1,50 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# PeerTube YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/peertube.svg)](https://dash.yunohost.org/appci/app/peertube) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/peertube.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/peertube.maintain.svg)
+
+[![Instalatu PeerTube YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=peertube)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek PeerTube YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+PeerTube is a decentralized and federated video hosting software. To publish videos, the user must register with a host (called an instance). Each host has its own conditions of use (storage space per user, moderation rules, themes, etc.). Thanks to WebTorrent, if several people view the same video, fragments of it are exchanged between people so as not to overload the instance. Decentralized: Each instance can follow one or more other PeerTube instances in order to allow its users to view their videos. Federated: Via the ActivityPub protocol, Peertube can interact with other software that is part of the Fediverse, such as Mastodon for example.
+
+
+**Paketatutako bertsioa:** 6.0.4~ynh1
+
+**Demoa:** <http://peertube.cpy.re>
+
+## Pantaila-argazkiak
+
+![PeerTube(r)en pantaila-argazkia](./doc/screenshots/screenshot1.jpg)
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://joinpeertube.org/fr>
+- Administratzaileen dokumentazio ofiziala: <https://docs.joinpeertube.org>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/Chocobozzz/PeerTube>
+- YunoHost Denda: <https://apps.yunohost.org/app/peertube>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/peertube_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/peertube_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/peertube_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade peertube -u https://github.com/YunoHost-Apps/peertube_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main.
 PeerTube est un logiciel décentralisé et fédéré d’hébergement de vidéos. Pour publier des vidéos, l’utilisateur doit s’inscrire chez un hébergeur (nommé instance). Chaque hébergeur possède ses conditions d’utilisation (espace de stockage par utilisateur, règles de modération, thématiques, etc.). Grâce à WebTorrent, si plusieurs personnes consultent une même vidéo, des fragments de celle-ci sont échangés entre les personnes afin de ne pas surcharger l’instance. Décentralisé : Chaque instance peut suivre une ou plusieurs autres instances PeerTube afin de permettre à ses utilisateurs de visionner les vidéos de celles-ci. Fédéré : Via le protocole ActivityPub, Peertube peut interagir avec d’autres logiciels qui font partie du Fediverse, comme Mastodon par exemple.
 
 
-**Version incluse :** 6.0.3~ynh1
+**Version incluse :** 6.0.4~ynh1
 
 **Démo :** <http://peertube.cpy.re>
 

README_gl.md

@@ -19,7 +19,7 @@ NON debe editarse manualmente.
 PeerTube is a decentralized and federated video hosting software. To publish videos, the user must register with a host (called an instance). Each host has its own conditions of use (storage space per user, moderation rules, themes, etc.). Thanks to WebTorrent, if several people view the same video, fragments of it are exchanged between people so as not to overload the instance. Decentralized: Each instance can follow one or more other PeerTube instances in order to allow its users to view their videos. Federated: Via the ActivityPub protocol, Peertube can interact with other software that is part of the Fediverse, such as Mastodon for example.
 
 
-**Versión proporcionada:** 6.0.3~ynh1
+**Versión proporcionada:** 6.0.4~ynh1
 
 **Demo:** <http://peertube.cpy.re>
 

README_zh_Hans.md

@@ -0,0 +1,50 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 的 PeerTube
+
+[![集成程度](https://dash.yunohost.org/integration/peertube.svg)](https://dash.yunohost.org/appci/app/peertube) ![工作状态](https://ci-apps.yunohost.org/ci/badges/peertube.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/peertube.maintain.svg)
+
+[![使用 YunoHost 安装 PeerTube](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=peertube)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 PeerTube。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+PeerTube is a decentralized and federated video hosting software. To publish videos, the user must register with a host (called an instance). Each host has its own conditions of use (storage space per user, moderation rules, themes, etc.). Thanks to WebTorrent, if several people view the same video, fragments of it are exchanged between people so as not to overload the instance. Decentralized: Each instance can follow one or more other PeerTube instances in order to allow its users to view their videos. Federated: Via the ActivityPub protocol, Peertube can interact with other software that is part of the Fediverse, such as Mastodon for example.
+
+
+**分发版本：** 6.0.4~ynh1
+
+**演示：** <http://peertube.cpy.re>
+
+## 截图
+
+![PeerTube 的截图](./doc/screenshots/screenshot1.jpg)
+
+## 文档与资源
+
+- 官方应用网站： <https://joinpeertube.org/fr>
+- 官方管理文档： <https://docs.joinpeertube.org>
+- 上游应用代码库： <https://github.com/Chocobozzz/PeerTube>
+- YunoHost 商店： <https://apps.yunohost.org/app/peertube>
+- 报告 bug： <https://github.com/YunoHost-Apps/peertube_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/peertube_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/peertube_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade peertube -u https://github.com/YunoHost-Apps/peertube_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>

conf/systemd.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=PeerTube daemon
+Description=PeerTube: video streaming platform
 After=network.target postgresql.service redis-server.service
 
 [Service]

manifest.toml

@@ -5,7 +5,7 @@ name = "PeerTube"
 description.en = "Federated video streaming platform using P2P directly in the web browser"
 description.fr = "Plateforme fédéralisé de diffusion vidéo par P2P directement dans le navigateur"
 
-version = "6.0.3~ynh1"
+version = "6.0.4~ynh1"
 
 maintainers = ["yalh76"]
 
@@ -42,9 +42,10 @@ ram.runtime = "1G"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/Chocobozzz/PeerTube/releases/download/v6.0.3/peertube-v6.0.3.tar.xz"
-        sha256 = "9a88899a4777c340df41e763ecdf8656edf3ef75f54b4de9be05aa309697a211"
-        autoupdate.strategy = "latest_github_tag"
+        url = "https://github.com/Chocobozzz/PeerTube/releases/download/v6.0.4/peertube-v6.0.4.tar.xz"
+        sha256 = "efa2aba3837c9fc0ff2303f29b061efaa02988fe15414edc7211e02c58540e53"
+        autoupdate.strategy = "latest_github_release"
+        autoupdate.asset = "^peertube-v.*\\.tar\\.xz$"
 
     [resources.ports]
     main.default = 8095

scripts/_common.sh

@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-nodejs_version=18
+nodejs_version=20
 
 # Obtain the (empty string), __2, __3, cf the DB suffix in production.yaml...
 db_suffix="$(echo $app | sed 's/peertube//g')"

scripts/install

@@ -36,7 +36,7 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 #=================================================
 # CREATE A POSTGRESQL DATABASE
 #=================================================
-ynh_script_progression --message="Initializing postgresql modules..."
+ynh_script_progression --message="Initializing PostgreSQL modules..."
 
 ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS unaccent;" --database=$db_name
 ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS pg_trgm;" --database=$db_name
@@ -76,6 +76,7 @@ ynh_add_nginx_config
 ynh_add_systemd_config
 
 mkdir -p "/var/log/$app"
+touch "/var/log/$app/peertube.log"
 chown -R $app:$app "/var/log/$app"
 
 # Use logrotate to manage application logfile(s)

scripts/restore

@@ -56,6 +56,7 @@ ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable $app.service --quiet
 
 mkdir -p "/var/log/$app"
+touch "/var/log/$app/peertube.log"
 chown -R $app:$app "/var/log/$app"
 ynh_restore_file --origin_path="/etc/logrotate.d/$app"
 

scripts/upgrade

@@ -107,6 +107,7 @@ ynh_add_nginx_config
 ynh_add_systemd_config
 
 mkdir -p "/var/log/$app"
+touch "/var/log/$app/peertube.log"
 chown -R $app:$app "/var/log/$app"
 
 # Use logrotate to manage app-specific logfile(s)