1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/peertube_ynh.git synced 2024-09-03 19:56:29 +02:00

Merge pull request #282 from YunoHost-Apps/testing

Testing
This commit is contained in:
Alexandre Aubin 2021-12-11 16:12:42 +01:00 committed by GitHub
commit 0f77bb6e74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 12 additions and 43 deletions

View file

@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Video streaming platform using P2P directly in the web browser, connected to a federated network
**Shipped version:** 3.4.1~ynh2
**Shipped version:** 3.4.1~ynh3
**Demo:** http://peertube.cpy.re
@ -61,7 +61,6 @@ By watching a video, you help the hosting provider to broadcast it by becoming a
## Documentation and resources
* Official app website: https://joinpeertube.org/fr/
* Official user documentation: https://yunohost.org/#/app_peertube
* Official admin documentation: https://docs.joinpeertube.org/
* Upstream app code repository: https://github.com/Chocobozzz/PeerTube/
* YunoHost documentation for this app: https://yunohost.org/app_peertube

View file

@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Plateforme de diffusion vidéo par P2P directement dans le navigateur, et connectée à un réseau fédéralisé
**Version incluse :** 3.4.1~ynh2
**Version incluse :** 3.4.1~ynh3
**Démo :** http://peertube.cpy.re
@ -67,7 +67,6 @@ En regardant une vidéo, vous aidez l'hébergeur à la diffuser en devenant vous
## Documentations et ressources
* Site officiel de l'app : https://joinpeertube.org/fr/
* Documentation officielle utilisateur : https://yunohost.org/#/app_peertube
* Documentation officielle de l'admin : https://docs.joinpeertube.org/
* Dépôt de code officiel de l'app : https://github.com/Chocobozzz/PeerTube/
* Documentation YunoHost pour cette app : https://yunohost.org/app_peertube

View file

@ -3,5 +3,4 @@ SOURCE_SUM=dd7357529826beb071a86e6f76bc2eb99b0d6481a71566db1cb2f6cf8a4a6305
SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.xz
SOURCE_IN_SUBDIR=true
SOURCE_FILENAME=
SOURCE_EXTRACT=true

View file

@ -26,9 +26,6 @@ location = /api/v1/videos/upload-resumable {
}
location / {
if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent;
}
try_files /dev/null @api;

View file

@ -6,14 +6,13 @@
"en": "Video streaming platform using P2P directly in the web browser, connected to a federated network",
"fr": "Plateforme de diffusion vidéo par P2P directement dans le navigateur, et connectée à un réseau fédéralisé"
},
"version": "3.4.1~ynh2",
"version": "3.4.1~ynh3",
"url": "https://github.com/Chocobozzz/PeerTube",
"upstream": {
"license": "AGPL-3.0-only",
"website": "https://joinpeertube.org/fr/",
"demo": "http://peertube.cpy.re",
"admindoc": "https://docs.joinpeertube.org/",
"userdoc": "https://yunohost.org/#/app_peertube",
"code": "https://github.com/Chocobozzz/PeerTube/"
},
"license": "AGPL-3.0-only",
@ -27,7 +26,7 @@
}
],
"requirements": {
"yunohost": ">= 4.2.0"
"yunohost": ">= 4.3.0"
},
"multi_instance": false,
"services": [
@ -37,13 +36,11 @@
"install" : [
{
"name": "domain",
"type": "domain",
"example": "example.com"
"type": "domain"
},
{
"name": "admin",
"type": "user",
"example": "johndoe"
"type": "user"
},
{
"name": "is_public",

View file

@ -5,9 +5,9 @@
#=================================================
# dependencies used by the app
pkg_dependencies="ffmpeg postgresql postgresql-contrib openssl g++ redis-server redis-tools mailutils apt-transport-https"
pkg_dependencies="ffmpeg postgresql postgresql-contrib openssl g++ mailutils apt-transport-https"
NODEJS_VERSION=14
NODEJS_VERSION=16
#=================================================
# PERSONAL HELPERS

View file

@ -85,14 +85,7 @@ ynh_script_progression --message="Installing dependencies..."
ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
# Install dependencies
ynh_install_app_dependencies $pkg_dependencies
# Install ffmpeg from backports for Debian Jessie and from main for others
if [ "$(lsb_release --codename --short)" == "jessie" ]; then
ynh_install_extra_app_dependencies --repo="deb http://httpredir.debian.org/debian jessie-backports main" --package="ffmpeg"
else
ynh_add_app_dependencies --package="ffmpeg"
fi
ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
# Install Yarn
ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"

View file

@ -42,8 +42,7 @@ datadir=$(ynh_app_setting_get --app=$app --key=datadir)
#=================================================
ynh_script_progression --message="Validating restoration parameters..."
test ! -d $final_path \
|| ynh_die --message="There is already a directory: $final_path "
test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
#=================================================
# STANDARD RESTORATION STEPS
@ -97,14 +96,7 @@ ynh_script_progression --message="Reinstalling dependencies..."
ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
# Install dependencies
ynh_install_app_dependencies $pkg_dependencies
# Install ffmpeg from backports for Debian Jessie and from main for others
if [ "$(lsb_release --codename --short)" == "jessie" ]; then
ynh_install_extra_app_dependencies --repo="deb http://httpredir.debian.org/debian jessie-backports main" --package="ffmpeg"
else
ynh_add_app_dependencies --package="ffmpeg"
fi
ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
# Install Yarn
ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"

View file

@ -193,14 +193,7 @@ ynh_script_progression --message="Upgrading dependencies..."
ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
# Install dependencies
ynh_install_app_dependencies $pkg_dependencies
# Install ffmpeg from backports for Debian Jessie and from main for others
if [ "$(lsb_release --codename --short)" == "jessie" ]; then
ynh_install_extra_app_dependencies --repo="deb http://httpredir.debian.org/debian jessie-backports main" --package="ffmpeg"
else
ynh_add_app_dependencies --package="ffmpeg"
fi
ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
# Install Yarn
ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"