diff --git a/README.md b/README.md index 3a24609..caa02ac 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/README_fr.md b/README_fr.md index abcffe1..2a97b77 100644 --- a/README_fr.md +++ b/README_fr.md @@ -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 diff --git a/conf/app.src b/conf/app.src index 70ce977..41733d4 100644 --- a/conf/app.src +++ b/conf/app.src @@ -3,5 +3,4 @@ SOURCE_SUM=dd7357529826beb071a86e6f76bc2eb99b0d6481a71566db1cb2f6cf8a4a6305 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.xz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= SOURCE_EXTRACT=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 7acd1e7..fab5c24 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -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; diff --git a/manifest.json b/manifest.json index 863dafc..84d1978 100644 --- a/manifest.json +++ b/manifest.json @@ -13,7 +13,6 @@ "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", diff --git a/scripts/_common.sh b/scripts/_common.sh index d6aa49f..5e43880 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -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 diff --git a/scripts/restore b/scripts/restore index e353cd5..5fbf9b6 100644 --- a/scripts/restore +++ b/scripts/restore @@ -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