From 71ff2218359fe2140543845c30b5474e28974a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 18 Dec 2020 09:52:10 +0100 Subject: [PATCH] Testing (#2) * Fix linter warnings * Update README.md Co-authored-by: deckname <58575263+deckname@users.noreply.github.com> --- README.md | 7 +++---- README_fr.md | 7 +++---- check_process | 2 -- issue_template.md | 2 +- manifest.json | 6 +++--- scripts/install | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 2 +- 8 files changed, 14 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index b851850..cf6ea9c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Invidious for YunoHost [![Integration level](https://dash.yunohost.org/integration/invidious.svg)](https://dash.yunohost.org/appci/app/invidious) ![](https://ci-apps.yunohost.org/ci/badges/invidious.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/invidious.maintain.svg) -[![Install Invidious with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=invidious) +[![Install Invidious with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=invidious) *[Lire ce readme en français.](./README_fr.md)* @@ -23,11 +23,11 @@ Invidious is an alternative front-end for accessing YouTube videos without going ## Configuration -You can configure Invidious by modifying the configuration file `/var/www/invidious/config/config.yaml` with the help of this [documentation](https://github.com/iv-org/invidious/wiki/Configuration). +You can configure Invidious by modifying the configuration file `/var/www/invidious/config/config.yaml` with the help of this [documentation](https://github.com/iv-org/documentation/blob/master/Configuration.md). ## Documentation - * Official documentation: https://github.com/iv-org/invidious/wiki + * Official documentation: https://github.com/iv-org/documentation * YunoHost documentation: https://yunohost.org/#/app_invidious ## YunoHost specific features @@ -50,7 +50,6 @@ Invidious require a dedicated root domain, ie. invidious.domain.tld ## Links * Report a bug: https://github.com/YunoHost-Apps/invidious_ynh/issues - * App website: https://invidio.us/ * Upstream app repository: https://github.com/iv-org/invidious * YunoHost website: https://yunohost.org/ diff --git a/README_fr.md b/README_fr.md index b2d6ba7..8d9129f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Invidious pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/invidious.svg)](https://dash.yunohost.org/appci/app/invidious) ![](https://ci-apps.yunohost.org/ci/badges/invidious.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/invidious.maintain.svg) -[![Installer Invidious avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=invidious) +[![Installer Invidious avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=invidious) *[Read this readme in english.](./README.md)* @@ -23,11 +23,11 @@ Invidious est une interface permettant d'accéder aux vidéos YouTube sans passe ## Configuration -Vous pouvez configurer Invidious en modifiant le fichier de configuration `/var/www/invidious/config/config.yaml` avec l'aide de cette [documentation](https://github.com/iv-org/invidious/wiki/Configuration). +Vous pouvez configurer Invidious en modifiant le fichier de configuration `/var/www/invidious/config/config.yaml` avec l'aide de cette [documentation](https://github.com/iv-org/documentation/blob/master/Configuration.md). ## Documentation - * Documentation officielle : https://github.com/iv-org/invidious/wiki + * Documentation officielle : https://github.com/iv-org/documentation * Documentation YunoHost : https://yunohost.org/#/app_invidious_fr ## Caractéristiques spécifiques YunoHost @@ -50,7 +50,6 @@ Invidious nécessite un domaine racine dédié, par exemple. invidious.domain.tl ## Liens * Signaler un bug : https://github.com/YunoHost-Apps/invidious_ynh/issues - * Site de l'application : https://invidio.us/ * Dépôt de l'application principale : https://github.com/iv-org/invidious * Site web YunoHost : https://yunohost.org/ diff --git a/check_process b/check_process index b09a1c7..058bf1f 100644 --- a/check_process +++ b/check_process @@ -16,8 +16,6 @@ multi_instance=0 port_already_use=0 change_url=0 -;;; Levels - Level 5=auto ;;; Options Email= Notification=none \ No newline at end of file diff --git a/issue_template.md b/issue_template.md index e9917be..26cf78e 100644 --- a/issue_template.md +++ b/issue_template.md @@ -20,7 +20,7 @@ about: Create a report to help us debug, it would be nice to fill the template a - Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* - YunoHost version: x.x.x - I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* -- Are you in a special context or did you perform some particular tweaking on your YunoHost instance ?: *no / yes* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance?: *no / yes* - If yes, please explain: - Using, or trying to install package version/branch: - If upgrading, current package version: *can be found in the admin, or with `yunohost app info navidrome`* diff --git a/manifest.json b/manifest.json index 8298863..6005b1b 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Alternative front-end to YouTube", "fr": "Front-end alternatif à YouTube" }, - "version": "0.20.1~ynh1", + "version": "0.20.1~ynh2", "url": "https://invidio.us/", "license": "GPL-3.0-only", "maintainer": { @@ -48,8 +48,8 @@ "fr": "Est-ce un site public ?" }, "help": { - "en": "You must activate public site if you want to connect a client player to Navidrome. This can be changed later via the webadmin.", - "fr": "Vous devez activer site public si vous souhaitez connecter un lecteur client à Navidrome. Vous pourrez changer ceci plus tard via la webadmin." + "en": "If enabled, Invidious will be accessible by people who do not have an account. This can be changed later via the webadmin.", + "fr": "Si cette case est cochée, Invidious sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin." }, "default": true }, diff --git a/scripts/install b/scripts/install index 98036f2..84faf74 100644 --- a/scripts/install +++ b/scripts/install @@ -188,7 +188,7 @@ chmod 0644 /etc/logrotate.d/$app #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description "Invidious is an alternative front-end to YouTube" +yunohost service add $app --description="Invidious is an alternative front-end to YouTube" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index 9513bfc..2d2ea13 100644 --- a/scripts/restore +++ b/scripts/restore @@ -100,14 +100,14 @@ ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name ynh_script_progression --message="Restoring the systemd configuration..." --weight=5 ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service +systemctl enable $app.service --quiet #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "Invidious is an alternative front-end to YouTube" +yunohost service add $app --description="Invidious is an alternative front-end to YouTube" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index edff2d8..978bfe5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -150,7 +150,7 @@ chmod 0644 /etc/logrotate.d/$app #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=3 -yunohost service add $app --description "Invidious is an alternative front-end to YouTube" +yunohost service add $app --description="Invidious is an alternative front-end to YouTube" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE