YunoHost-Apps · ericgaspar · Sep 29, 2024 · Sep 29, 2024 · Sep 29, 2024 · Sep 29, 2024
diff --git a/ALL_README.md b/ALL_README.md
@@ -6,4 +6,6 @@
 - [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)
+- [Lees de README in het Nederlands](README_nl.md)
+- [Прочитать README на русский](README_ru.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)
diff --git a/README.md b/README.md
@@ -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.2.1~ynh1
+**Shipped version:** 6.3.1~ynh1
 
 **Demo:** <http://peertube.cpy.re>
 

diff --git a/README_es.md b/README_es.md
@@ -19,7 +19,7 @@ No se debe editar a mano.
 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 actual:** 6.2.1~ynh1
+**Versión actual:** 6.3.1~ynh1
 
 **Demo:** <http://peertube.cpy.re>
 
@@ -37,7 +37,7 @@ PeerTube is a decentralized and federated video hosting software. To publish vid
 
 ## Información para desarrolladores
 
-Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/peertube_ynh/tree/testing
+Por favor enviar sus correcciones a la [rama `testing`](https://github.com/YunoHost-Apps/peertube_ynh/tree/testing).
 
 Para probar la rama `testing`, sigue asÍ:
 

diff --git a/README_eu.md b/README_eu.md
@@ -19,7 +19,7 @@ EZ editatu eskuz.
 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.2.1~ynh1
+**Paketatutako bertsioa:** 6.3.1~ynh1
 
 **Demoa:** <http://peertube.cpy.re>
 

diff --git a/README_fr.md b/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.2.1~ynh1
+**Version incluse :** 6.3.1~ynh1
 
 **Démo :** <http://peertube.cpy.re>
 

diff --git a/README_gl.md b/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.2.1~ynh1
+**Versión proporcionada:** 6.3.1~ynh1
 
 **Demo:** <http://peertube.cpy.re>
 

diff --git a/README_id.md b/README_id.md
@@ -19,7 +19,7 @@ Ini TIDAK boleh diedit dengan tangan.
 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 terkirim:** 6.2.1~ynh1
+**Versi terkirim:** 6.3.1~ynh1
 
 **Demo:** <http://peertube.cpy.re>
 

diff --git a/README_nl.md b/README_nl.md
@@ -0,0 +1,50 @@
+<!--
+NB: Deze README is automatisch gegenereerd door <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Hij mag NIET handmatig aangepast worden.
+-->
+
+# PeerTube voor Yunohost
+
+[![Integratieniveau](https://dash.yunohost.org/integration/peertube.svg)](https://ci-apps.yunohost.org/ci/apps/peertube/) ![Mate van functioneren](https://ci-apps.yunohost.org/ci/badges/peertube.status.svg) ![Onderhoudsstatus](https://ci-apps.yunohost.org/ci/badges/peertube.maintain.svg)
+
+[![PeerTube met Yunohost installeren](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=peertube)
+
+*[Deze README in een andere taal lezen.](./ALL_README.md)*
+
+> *Met dit pakket kun je PeerTube snel en eenvoudig op een YunoHost-server installeren.*  
+> *Als je nog geen YunoHost hebt, lees dan [de installatiehandleiding](https://yunohost.org/install), om te zien hoe je 'm installeert.*
+
+## Overzicht
+
+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.
+
+
+**Geleverde versie:** 6.3.1~ynh1
+
+**Demo:** <http://peertube.cpy.re>
+
+## Schermafdrukken
+
+![Schermafdrukken van PeerTube](./doc/screenshots/screenshot1.jpg)
+
+## Documentatie en bronnen
+
+- Officiele website van de app: <https://joinpeertube.org/fr>
+- Officiele beheerdersdocumentatie: <https://docs.joinpeertube.org>
+- Upstream app codedepot: <https://github.com/Chocobozzz/PeerTube>
+- YunoHost-store: <https://apps.yunohost.org/app/peertube>
+- Meld een bug: <https://github.com/YunoHost-Apps/peertube_ynh/issues>
+
+## Ontwikkelaarsinformatie
+
+Stuur je pull request alsjeblieft naar de [`testing`-branch](https://github.com/YunoHost-Apps/peertube_ynh/tree/testing).
+
+Om de `testing`-branch uit te proberen, ga als volgt te werk:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/peertube_ynh/tree/testing --debug
+of
+sudo yunohost app upgrade peertube -u https://github.com/YunoHost-Apps/peertube_ynh/tree/testing --debug
+```
+
+**Verdere informatie over app-packaging:** <https://yunohost.org/packaging_apps>
diff --git a/README_ru.md b/README_ru.md
@@ -0,0 +1,50 @@
+<!--
+Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Он НЕ ДОЛЖЕН редактироваться вручную.
+-->
+
+# PeerTube для YunoHost
+
+[![Уровень интеграции](https://dash.yunohost.org/integration/peertube.svg)](https://ci-apps.yunohost.org/ci/apps/peertube/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/peertube.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/peertube.maintain.svg)
+
+[![Установите PeerTube с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=peertube)
+
+*[Прочтите этот README на других языках.](./ALL_README.md)*
+
+> *Этот пакет позволяет Вам установить PeerTube быстро и просто на YunoHost-сервер.*  
+> *Если у Вас нет 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.3.1~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>
+- Сообщите об ошибке: <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>
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
@@ -19,7 +19,7 @@
 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.2.1~ynh1
+**分发版本：** 6.3.1~ynh1
 
 **演示：** <http://peertube.cpy.re>
 

diff --git a/manifest.toml b/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.2.1~ynh1"
+version = "6.3.1~ynh1"
 
 maintainers = [ ]
 
@@ -42,8 +42,8 @@ ram.runtime = "1G"
 
 [resources]
         [resources.sources.main]
-        url = "https://github.com/Chocobozzz/PeerTube/releases/download/v6.2.1/peertube-v6.2.1.tar.xz"
-        sha256 = "7ac1843b3d10d94f447bc4af818be60cb9a0a200b17ac9e777ccfd11a13721cc"
+        url = "https://github.com/Chocobozzz/PeerTube/releases/download/v6.3.1/peertube-v6.3.1.tar.xz"
+        sha256 = "654036b4cefd773ee40d01a7b2b65e95d892297958b3e1719d9e31dd09149853"
         autoupdate.strategy = "latest_github_release"
         autoupdate.asset = "^peertube-v.*\\.tar\\.xz$"
 

diff --git a/scripts/_common.sh b/scripts/_common.sh
@@ -8,15 +8,3 @@ nodejs_version=20
 
 # Obtain the (empty string), __2, __3, cf the DB suffix in production.yaml...
 db_suffix="$(echo $app | sed 's/peertube//g')"
-
-#=================================================
-# PERSONAL HELPERS
-#=================================================
-
-#=================================================
-# EXPERIMENTAL HELPERS
-#=================================================
-
-#=================================================
-# FUTURE OFFICIAL HELPERS
-#=================================================
diff --git a/scripts/backup b/scripts/backup
@@ -1,12 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 

diff --git a/scripts/install b/scripts/install
@@ -1,11 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers
 
@@ -46,7 +40,6 @@ ynh_psql_execute_as_root --sql="CREATE EXTENSION IF NOT EXISTS pg_trgm;" --datab
 #=================================================
 ynh_script_progression --message="Setting up source files..."
 
-# Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"
 
 chmod -R o-rwx "$install_dir"
@@ -69,17 +62,14 @@ popd
 #=================================================
 ynh_script_progression --message="Adding system configurations..."
 
-# Create a dedicated NGINX config
 ynh_add_nginx_config
 
-# Create a dedicated systemd 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)
 ynh_use_logrotate
 
 yunohost service add $app --description="Federated video streaming platform" --log="/var/log/$app/$app.log" --needs_exposed_ports $port_rtmp

diff --git a/scripts/remove b/scripts/remove
@@ -6,28 +6,20 @@ source /usr/share/yunohost/helpers
 #=================================================
 # REMOVE SYSTEM CONFIGURATIONS
 #=================================================
-# REMOVE SYSTEMD SERVICE 
-#=================================================
 ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
-if ynh_exec_warn_less yunohost service status $app >/dev/null
-then
-	ynh_script_progression --message="Removing $app service integration..."
+if ynh_exec_warn_less yunohost service status $app >/dev/null; then
 	yunohost service remove $app
 fi
 
-# Remove the dedicated systemd config
 ynh_remove_systemd_config
 
-# Remove the app-specific logrotate config
 ynh_remove_logrotate
 
 ynh_redis_remove_db "$redis_db"
 
-# Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-# Remove metapackage and its dependencies
 ynh_remove_nodejs
 
 #=================================================

diff --git a/scripts/restore b/scripts/restore
@@ -1,12 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 

diff --git a/scripts/upgrade b/scripts/upgrade
@@ -1,11 +1,5 @@
 #!/bin/bash
 
-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers
 
@@ -74,15 +68,10 @@ fi
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..."
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-	ynh_script_progression --message="Upgrading source files..."
-
-	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --full_replace=1 --dest_dir="$install_dir" \
+ynh_setup_source --dest_dir="$install_dir" --full_replace=1 \
 		--keep="config/production.yaml config/local-production.json config/local.yaml"
-fi
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
@@ -149,6 +138,13 @@ pushd "$install_dir"
 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_CONFIG_DIR="$install_dir/config" NODE_ENV=production $ynh_npm run plugin:install -- --npm-name peertube-plugin-livechat
 popd
 
+#=================================================
+# START SYSTEMD SERVICE
+#=================================================
+ynh_script_progression --message="Starting systemd service..."
+
+ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="HTTP server listening on 127.0.0.1"
+
 #=================================================
 # PEERTUBE UPGRADE MIGRATION SCRIPT
 #=================================================
@@ -174,12 +170,12 @@ if ynh_compare_current_package_version --comparison lt --version 5.0.0~ynh1; the
 	popd
 fi
 
-#=================================================
-# START SYSTEMD SERVICE
-#=================================================
-ynh_script_progression --message="Starting systemd service..."
-
-ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="HTTP server listening on 127.0.0.1"
+if ynh_compare_current_package_version --comparison lt --version 6.3.0~ynh1; then
+	ynh_script_progression --message="Running Peertube 6.3.0 migration script..."
+	pushd "$install_dir"
+		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_CONFIG_DIR="$install_dir/config" NODE_ENV=production $ynh_node dist/scripts/migrations/peertube-6.3.js
+	popd
+fi
 
 #=================================================
 # END OF SCRIPT