From fb0cadc8ca883dca167df88728916dfead5c4431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 20 May 2024 16:41:20 +0200 Subject: [PATCH 1/7] Use standard redis helpers --- manifest.toml | 2 +- scripts/_common.sh | 39 --------------------------------------- 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/manifest.toml b/manifest.toml index 4a46ff3..0b47718 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://docs.joinpeertube.org" code = "https://github.com/Chocobozzz/PeerTube" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.12" architectures = "all" multi_instance = false diff --git a/scripts/_common.sh b/scripts/_common.sh index 55ef851..eb16b4e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -17,45 +17,6 @@ db_suffix="$(echo $app | sed 's/peertube//g')" # EXPERIMENTAL HELPERS #================================================= -# get the first available redis database -# -# usage: ynh_redis_get_free_db -# | returns: the database number to use -ynh_redis_get_free_db() { - local result max db - result=$(redis-cli INFO keyspace) - - # get the num - max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+") - - db=0 - # default Debian setting is 15 databases - for i in $(seq 0 "$max") - do - if ! echo "$result" | grep -q "db$i" - then - db=$i - break 1 - fi - db=-1 - done - - test "$db" -eq -1 && ynh_die --message="No available Redis databases..." - - echo "$db" -} - -# Create a master password and set up global settings -# Please always call this script in install and restore scripts -# -# usage: ynh_redis_remove_db database -# | arg: database - the database to erase -ynh_redis_remove_db() { - local db=$1 - redis-cli -n "$db" flushall -} - - #================================================= # FUTURE OFFICIAL HELPERS #================================================= From aaa8efd5ff612426edd043aaec84edee02d632fb Mon Sep 17 00:00:00 2001 From: Mateusz <2871798+orhtej2@users.noreply.github.com> Date: Wed, 3 Jul 2024 22:25:47 +0200 Subject: [PATCH 2/7] Disable stupid corepack download prompt. --- scripts/install | 6 +++--- scripts/upgrade | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index eeab8bc..fe9142b 100644 --- a/scripts/install +++ b/scripts/install @@ -59,9 +59,9 @@ ynh_script_progression --message="Building Yarn dependencies..." pushd "$install_dir" ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn config set network-timeout 300000 - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --production --pure-lockfile - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 yarn config set network-timeout 300000 + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 yarn install --production --pure-lockfile + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 yarn cache clean popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 9b0875c..513490e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -122,9 +122,9 @@ ynh_script_progression --message="Building Yarn dependencies..." pushd "$install_dir" ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn config set network-timeout 300000 - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install --production --pure-lockfile - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 yarn config set network-timeout 300000 + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 yarn install --production --pure-lockfile + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 yarn cache clean popd #================================================= From a50ecac7bc3d81ce5c6fcde8b39701fcfd040851 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 3 Jul 2024 20:25:27 +0000 Subject: [PATCH 3/7] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 1756b9f..12e197b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # PeerTube for YunoHost -[![Integration level](https://dash.yunohost.org/integration/peertube.svg)](https://dash.yunohost.org/appci/app/peertube) ![Working status](https://ci-apps.yunohost.org/ci/badges/peertube.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/peertube.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/peertube.svg)](https://ci-apps.yunohost.org/ci/apps/peertube/) ![Working status](https://ci-apps.yunohost.org/ci/badges/peertube.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/peertube.maintain.svg) [![Install PeerTube with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=peertube) diff --git a/README_es.md b/README_es.md index c4e2f94..0badd50 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # PeerTube para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/peertube.svg)](https://dash.yunohost.org/appci/app/peertube) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/peertube.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/peertube.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/peertube.svg)](https://ci-apps.yunohost.org/ci/apps/peertube/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/peertube.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/peertube.maintain.svg) [![Instalar PeerTube con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=peertube) diff --git a/README_eu.md b/README_eu.md index 897d3b0..21f6634 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ 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) +[![Integrazio maila](https://dash.yunohost.org/integration/peertube.svg)](https://ci-apps.yunohost.org/ci/apps/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) diff --git a/README_fr.md b/README_fr.md index 8cc4174..8c1ab2a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # PeerTube pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/peertube.svg)](https://dash.yunohost.org/appci/app/peertube) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/peertube.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/peertube.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/peertube.svg)](https://ci-apps.yunohost.org/ci/apps/peertube/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/peertube.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/peertube.maintain.svg) [![Installer PeerTube avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=peertube) diff --git a/README_gl.md b/README_gl.md index 5471d83..e46d725 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # PeerTube para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/peertube.svg)](https://dash.yunohost.org/appci/app/peertube) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/peertube.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/peertube.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/peertube.svg)](https://ci-apps.yunohost.org/ci/apps/peertube/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/peertube.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/peertube.maintain.svg) [![Instalar PeerTube con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=peertube) diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 5dd99a9..a7cc426 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # 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) +[![集成程度](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) [![使用 YunoHost 安装 PeerTube](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=peertube) From 997644cff3652b95227f34414717a7aab5b1bfee Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Mon, 15 Jul 2024 17:52:35 +0200 Subject: [PATCH 4/7] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 0e35fa8..7df3dd4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -70,7 +70,7 @@ ram.runtime = "1G" api.protected = true [resources.apt] - packages = "ffmpeg, postgresql, postgresql-contrib" + packages = "ffmpeg, postgresql, postgresql-contrib, redis-server" extras.yarn.repo = "deb https://dl.yarnpkg.com/debian/ stable main" extras.yarn.key = "https://dl.yarnpkg.com/debian/pubkey.gpg" From 57ce35700db738e5042dd60d60cdb1fb8aaf104a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 17 Jul 2024 03:40:18 +0200 Subject: [PATCH 5/7] Upgrade sources - `main` v6.2.0: https://github.com/Chocobozzz/PeerTube/releases/tag/v6.2.0 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 7df3dd4..c326672 100644 --- 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.1.0~ynh2" +version = "6.2.0~ynh1" maintainers = ["yalh76"] @@ -42,8 +42,8 @@ ram.runtime = "1G" [resources] [resources.sources.main] - url = "https://github.com/Chocobozzz/PeerTube/releases/download/v6.1.0/peertube-v6.1.0.tar.xz" - sha256 = "7e5d1d0f5c49620ac83602e5b9ebc2f985dc05b110551cde9e2c17094f366733" + url = "https://github.com/Chocobozzz/PeerTube/releases/download/v6.2.0/peertube-v6.2.0.tar.xz" + sha256 = "2d737bca3919a98bd82143130d57c8306c2933c82f11d14c3c43909ad48be95f" autoupdate.strategy = "latest_github_release" autoupdate.asset = "^peertube-v.*\\.tar\\.xz$" From aba45ff3a0cab27cfdda9d19c91a523778caab1c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 17 Jul 2024 01:40:20 +0000 Subject: [PATCH 6/7] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 12e197b..d0197cf 100644 --- 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.1.0~ynh2 +**Shipped version:** 6.2.0~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 0badd50..e38177e 100644 --- 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.1.0~ynh2 +**Versión actual:** 6.2.0~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 21f6634..4eb1f40 100644 --- 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.1.0~ynh2 +**Paketatutako bertsioa:** 6.2.0~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 8c1ab2a..9445ff6 100644 --- 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.1.0~ynh2 +**Version incluse :** 6.2.0~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index e46d725..ff51a8e 100644 --- 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.1.0~ynh2 +**Versión proporcionada:** 6.2.0~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index a7cc426..47103a1 100644 --- 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.1.0~ynh2 +**分发版本：** 6.2.0~ynh1 **演示：** From 339b88ad46c5c6efe99bd309fdc8bd9ada03eb79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 18 Jul 2024 13:24:17 +0200 Subject: [PATCH 7/7] Update remove --- scripts/remove | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/remove b/scripts/remove index 72a9966..92c5fa1 100644 --- a/scripts/remove +++ b/scripts/remove @@ -30,9 +30,6 @@ ynh_remove_nginx_config # Remove metapackage and its dependencies ynh_remove_nodejs -# Remove the log files -ynh_secure_remove --file="/var/log/$app" - #================================================= # END OF SCRIPT #=================================================