From 939a5ee605d4daccd9b0ae6f7620747685552e02 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 29 Aug 2022 22:34:25 +0200 Subject: [PATCH 1/3] Exterminate calling ynh_exec with wrapping quotes --- scripts/install | 4 ++-- scripts/restore | 4 ++-- scripts/upgrade | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index c7484bd..14f153e 100755 --- a/scripts/install +++ b/scripts/install @@ -63,9 +63,9 @@ ynh_app_setting_set --app=$app --key=port --value=$port #================================================= ynh_script_progression --message="Installing dependencies..." --weight=4 -ynh_exec_warn_less 'ynh_install_extra_app_dependencies --repo="https://download.mono-project.com/repo/debian stable-buster main" --package="mono-devel" --key="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"' +ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="https://download.mono-project.com/repo/debian stable-buster main" --package="mono-devel" --key="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" -ynh_exec_warn_less 'ynh_install_extra_app_dependencies --repo="https://apt.sonarr.tv/debian buster main" --package="sonarr" --key="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2009837CBFFD68F45BC180471F4F90DE2A9B4BF8"' +ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="https://apt.sonarr.tv/debian buster main" --package="sonarr" --key="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2009837CBFFD68F45BC180471F4F90DE2A9B4BF8" ynh_install_app_dependencies $pkg_dependencies diff --git a/scripts/restore b/scripts/restore index d3a4a27..c23c166 100755 --- a/scripts/restore +++ b/scripts/restore @@ -92,9 +92,9 @@ ynh_multimedia_addaccess $app ynh_script_progression --message="Reinstalling dependencies..." --weight=4 # Define and install dependencies -ynh_exec_warn_less 'ynh_install_extra_app_dependencies --repo="https://download.mono-project.com/repo/debian stable-buster main" --package="mono-devel" --key="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"' +ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="https://download.mono-project.com/repo/debian stable-buster main" --package="mono-devel" --key="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" -ynh_exec_warn_less 'ynh_install_extra_app_dependencies --repo="https://apt.sonarr.tv/debian buster main" --package="sonarr" --key="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2009837CBFFD68F45BC180471F4F90DE2A9B4BF8"' +ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="https://apt.sonarr.tv/debian buster main" --package="sonarr" --key="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2009837CBFFD68F45BC180471F4F90DE2A9B4BF8" ynh_install_app_dependencies $pkg_dependencies diff --git a/scripts/upgrade b/scripts/upgrade index ab55ef1..b486d45 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -89,9 +89,9 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Upgrading dependencies..." --weight=4 -ynh_exec_warn_less 'ynh_install_extra_app_dependencies --repo="https://download.mono-project.com/repo/debian stable-buster main" --package="mono-devel" --key="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"' +ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="https://download.mono-project.com/repo/debian stable-buster main" --package="mono-devel" --key="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" -ynh_exec_warn_less 'ynh_install_extra_app_dependencies --repo="https://apt.sonarr.tv/debian buster main" --package="sonarr" --key="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2009837CBFFD68F45BC180471F4F90DE2A9B4BF8"' +ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="https://apt.sonarr.tv/debian buster main" --package="sonarr" --key="https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2009837CBFFD68F45BC180471F4F90DE2A9B4BF8" ynh_install_app_dependencies $pkg_dependencies From 4f3d90ecbc1ca881a317e68f5e465254b3f93886 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 29 Aug 2022 22:34:58 +0200 Subject: [PATCH 2/3] Force HTTPS is handled by Yunohost core nowadays --- conf/nginx.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 1331f6f..b374ab5 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,11 +1,6 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__ { - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - proxy_pass http://127.0.0.1:__PORT____PATH__; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; From 23e870027640a8e935376c65eb05de75d0cb9ba6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 29 Aug 2022 20:35:40 +0000 Subject: [PATCH 3/3] Auto-update README --- README.md | 20 ++++++++++---------- README_fr.md | 28 ++++++++++++++++------------ 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 94580d7..9b1f944 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Sonarr for YunoHost -[![Integration level](https://dash.yunohost.org/integration/sonarr.svg)](https://dash.yunohost.org/appci/app/sonarr) ![](https://ci-apps.yunohost.org/ci/badges/sonarr.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/sonarr.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/sonarr.svg)](https://dash.yunohost.org/appci/app/sonarr) ![Working status](https://ci-apps.yunohost.org/ci/badges/sonarr.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/sonarr.maintain.svg) [![Install Sonarr with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=sonarr) *[Lire ce readme en français.](./README_fr.md)* @@ -21,10 +21,9 @@ Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS fee **Shipped version:** 3.0.6.1196~ynh2 - ## Screenshots -![](./doc/screenshots/screenshot.jpg) +![Screenshot of Sonarr](./doc/screenshots/screenshot.jpg) ## Disclaimers / important information @@ -37,21 +36,22 @@ Sonarr is a PVR for Usenet and BitTorrent users. It can monitor multiple RSS fee ## Documentation and resources -* Official app website: https://sonarr.tv -* Official admin documentation: https://wiki.servarr.com/Sonarr -* Upstream app code repository: https://github.com/Sonarr/Sonarr -* YunoHost documentation for this app: https://yunohost.org/app_sonarr -* Report a bug: https://github.com/YunoHost-Apps/sonarr_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/sonarr_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/sonarr_ynh/tree/testing --debug or sudo yunohost app upgrade sonarr -u https://github.com/YunoHost-Apps/sonarr_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index ded7be5..ab1bc7a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Sonarr pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/sonarr.svg)](https://dash.yunohost.org/appci/app/sonarr) ![](https://ci-apps.yunohost.org/ci/badges/sonarr.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/sonarr.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/sonarr.svg)](https://dash.yunohost.org/appci/app/sonarr) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/sonarr.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/sonarr.maintain.svg) [![Installer Sonarr avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=sonarr) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Sonarr rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* @@ -14,13 +18,12 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Sonarr est un PVR pour les utilisateurs Usenet et BitTorrent. Il peut surveiller plusieurs flux RSS pour les nouveaux épisodes de vos émissions préférées et les récupérer, les trier et les renommer. Il peut également être configuré pour mettre à niveau automatiquement la qualité des fichiers déjà téléchargés lorsqu'un format de meilleure qualité devient disponible. -**Version incluse :** 3.0.6.1196~ynh2 - +**Version incluse :** 3.0.6.1196~ynh2 ## Captures d'écran -![](./doc/screenshots/screenshot.jpg) +![Capture d'écran de Sonarr](./doc/screenshots/screenshot.jpg) ## Avertissements / informations importantes @@ -33,21 +36,22 @@ Sonarr est un PVR pour les utilisateurs Usenet et BitTorrent. Il peut surveiller ## Documentations et ressources -* Site officiel de l'app : https://sonarr.tv -* Documentation officielle de l'admin : https://wiki.servarr.com/Sonarr -* Dépôt de code officiel de l'app : https://github.com/Sonarr/Sonarr -* Documentation YunoHost pour cette app : https://yunohost.org/app_sonarr -* Signaler un bug : https://github.com/YunoHost-Apps/sonarr_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/sonarr_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/sonarr_ynh/tree/testing --debug ou sudo yunohost app upgrade sonarr -u https://github.com/YunoHost-Apps/sonarr_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :**