From dd92fd4d9fc39f6aceaae4cd0bb5d96898798547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 13 Jun 2023 12:01:25 +0200 Subject: [PATCH 1/7] Testing (#126) * Fix * Preserve config file and protect it * Fix permissions * Fix * Fix * fix * Update README.md (#28) .yml iso .yaml file * Fix * Update install * [autopatch] Update issue and PR templates (#32) Co-authored-by: Yunohost-Bot <> * [autopatch] Update issue and PR templates (#33) Co-authored-by: Yunohost-Bot <> * Fix * Fix * Update install * Auto-update README * Update install * Fix * Update _common.sh * Fix * Auto-update README * Fix * Fix * Create change_url * Fix * Update nginx.conf * Update check_process * Auto-update README * Auto-update README * upgrade crystal * Auto-update README * Update restore * Update upgrade * Update upgrade * Revert "Update upgrade" This reverts commit f533eb02cb99848aadab99afeb3ee5134073fab4. * Update upgrade * Update check_process * Add limitations * Auto-update README * New config file (#44) * Add config * Update check_process * From git commit (#46) * from commit * Fix doc link * Auto-update README * Update upgrade * Update config.yml * Update manifest.json * Auto-update README * Version bump (#54) * upgrade * Update restore * Add description * Auto-update README * config.yml may not exist during upgrade (#58) * Update systemd.service * Update manifest.json * Update manifest.json * Auto-update README * Reorder * Update _common.sh * Fix * Update Crystal (#63) * Update Crystal * Update install * Fix * Update _common.sh * Update _common.sh * 4.3 * Auto-update README * Upgrade * Auto-update README * Config panel (#72) * Add config panel * Update _common.sh * Fix * Auto-update README * upgrade to upstream * Auto-update README * Update _common.sh * Update manifest.json * Auto-update README * Update _common.sh * Update manifest.json * Auto-update README * Bugfix #77 by replace "shards" command (#79) * Bugfix #77 by "shards install" with "--production" See: https://github.com/iv-org/invidious/issues/2918#issuecomment-1048146335 * Upgrade to upstream * Auto-update README * Update check_process * 22.03.03 * Auto-update README * Add admin (#74) * Add admin * add email * Auto-update README * Fix * Update upgrade * Update _common.sh * Update _common.sh * Update manifest.json * Auto-update README * Fix * Update install * Fix * Fix * Auto-update README * Update upgrade * Revert "Update upgrade" This reverts commit a1dce069b4968f00bbaa59bc09ac0ecc9a37fcdb. * upgrade to upstream * Auto-update README * Upgrade to upstream * Auto-update README * upgrade to upstream * Auto-update README * Update _common.sh * Auto-update README * Upgrade to upstream * Auto-update README * upgrade * Auto-update README * Update _common.sh * Update manifest.json * Auto-update README * Auto-update README * Auto-update README * Upgrade to upstream * Auto-update README * Upgrade to upstream * Revert "Upgrade to upstream" This reverts commit dc91a2696e197755cfa6a002350f59c9f850db6a. * Update _common.sh * Update manifest.json * Auto-update README * Upgrade to upstream * Auto-update README * upgrade to upstream * Auto-update README * Upgrade to upstream * Auto-update README * Upgrade to upstream * Auto-update README * Upgrade * Auto-update README * Upgrade to upstream * Auto-update README * Auto-update README * Upgrade to upstream * Auto-update README * Fix * Auto-update README * Fix * Update to upstream * Auto-update README * Update install * Update install * Update install * Auto-update README * Update install * Update install * Update install * Update install * Update install * Update install * Update install * Update install * upgrade to upstream * Auto-update README * Update upgrade * Version 2 (#112) * v2 * v2 * Auto-update README * Update manifest.toml Co-authored-by: Alexandre Aubin * Update install * fix * Update manifest.toml * Fix * Fix * Auto-update README * Update manifest.toml * Update manifest.toml * Update tests.toml * Update upgrade * Fix --------- Co-authored-by: yunohost-bot Co-authored-by: Alexandre Aubin * Update install * Update _common.sh * remove Crystal * Auto-update README * cleaning * upgrade to upstream * Update manifest.toml * Auto-update README * fix * Update _common.sh * Update manifest.toml * Auto-update README * update * Auto-update README * 04.05.23 * Auto-update README * cleaning * Update nginx.conf * Update config.yml * Update _common.sh * Update manifest.toml * Auto-update README * Update install * Update install * Sql (#123) * Auto-update README * Update install * fix * fix * Delete .DS_Store * Update install * Update install * Update install * Update install * Update config.yml * Update DESCRIPTION_fr.md * Auto-update README * Update manifest.toml * Auto-update README * Update install * Update install --------- Co-authored-by: yunohost-bot * cleaning * Update upgrade * fix * update to upstream * Auto-update README * upgrade * Auto-update README --------- Co-authored-by: clavelc <25869334+clavelc@users.noreply.github.com> Co-authored-by: YunoHost Bot Co-authored-by: Yunohost-Bot <> Co-authored-by: Alexandre Aubin Co-authored-by: Jens Diemer Co-authored-by: yunohost-bot Co-authored-by: yalh76 --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 5 ++--- scripts/_common.sh | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ef08513..de3d6e0 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ In addition to constituting an advantage in terms of confidentiality (the data d - Ability to subscribe to channels without creating a Google account -**Shipped version:** 03.06.23~ynh1 +**Shipped version:** 12.06.23~ynh1 **Demo:** https://invidious.site/ diff --git a/README_fr.md b/README_fr.md index b78c111..503120a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ En plus de constituer un avantage sur le plan de la confidentialité (les donné - Possibilité d'afficher les commentaires Reddit plutôt que les commentaires YouTube, - Possibilité de s'abonner aux chaines sans créer de compte Google -**Version incluse :** 03.06.23~ynh1 +**Version incluse :** 12.06.23~ynh1 **Démo :** https://invidious.site/ diff --git a/manifest.toml b/manifest.toml index 4178de3..1f1714a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Invidious" description.en = "Alternative front-end to YouTube" description.fr = "Front-end alternatif à YouTube" -version = "03.06.23~ynh1" +version = "12.06.23~ynh1" maintainers = ["eric_G"] @@ -17,7 +17,7 @@ code = "https://github.com/iv-org/invidious" website = "https://invidio.us/" [integration] -yunohost = ">= 11.1.19" +yunohost = ">= 11.1.20" architectures = ["amd64"] multi_instance = false ldap = false @@ -56,7 +56,6 @@ ram.runtime = "50M" [resources.permissions] main.url = "/" - api.url = "/api" api.show_tile = false api.allowed = ["visitors"] diff --git a/scripts/_common.sh b/scripts/_common.sh index 9d76894..3f8056f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -version_commit=042ad1f2662503c123ba1dd415e5ed3d9ddc3cc0 +version_commit=e6f5fcbc4b7eab7bdeee1a1d2586334f34f50af7 #================================================= # PERSONAL HELPERS From 8127ed198d128fa461a5e7780e89a0973e6e9e82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 2 Aug 2023 18:22:16 +0200 Subject: [PATCH 2/7] bump --- manifest.toml | 4 ++-- scripts/_common.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 1f1714a..4005ab6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Invidious" description.en = "Alternative front-end to YouTube" description.fr = "Front-end alternatif à YouTube" -version = "12.06.23~ynh1" +version = "02.08.23~ynh1" maintainers = ["eric_G"] @@ -17,7 +17,7 @@ code = "https://github.com/iv-org/invidious" website = "https://invidio.us/" [integration] -yunohost = ">= 11.1.20" +yunohost = ">= 11.2" architectures = ["amd64"] multi_instance = false ldap = false diff --git a/scripts/_common.sh b/scripts/_common.sh index 3f8056f..45945b6 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -version_commit=e6f5fcbc4b7eab7bdeee1a1d2586334f34f50af7 +version_commit=d956b1826e15da6cfcd9a1531b0f1e6ef577dd10 #================================================= # PERSONAL HELPERS From d37dd36d566cc17c57c621f4f8e7df2b5fbed987 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 2 Aug 2023 16:22:21 +0000 Subject: [PATCH 3/7] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index de3d6e0..a484289 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ In addition to constituting an advantage in terms of confidentiality (the data d - Ability to subscribe to channels without creating a Google account -**Shipped version:** 12.06.23~ynh1 +**Shipped version:** 02.08.23~ynh1 **Demo:** https://invidious.site/ diff --git a/README_fr.md b/README_fr.md index 503120a..8dd3249 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ En plus de constituer un avantage sur le plan de la confidentialité (les donné - Possibilité d'afficher les commentaires Reddit plutôt que les commentaires YouTube, - Possibilité de s'abonner aux chaines sans créer de compte Google -**Version incluse :** 12.06.23~ynh1 +**Version incluse :** 02.08.23~ynh1 **Démo :** https://invidious.site/ From 931bdff1a010005ce3854c9ac1dd4767e17e06c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 2 Aug 2023 18:23:14 +0200 Subject: [PATCH 4/7] Update config.yml --- conf/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.yml b/conf/config.yml index 82b32bf..5ab0d23 100644 --- a/conf/config.yml +++ b/conf/config.yml @@ -84,7 +84,7 @@ external_port: 443 ## Accepted values: a valid IPv4 or IPv6 address. ## default: 0.0.0.0 (listen on all interfaces) ## -host_binding: 0.0.0.0 +host_binding: 127.0.0.1 ## ## Domain name under which this instance is hosted. This is From 008d06d814956d1db0b86fdd253599a02e154990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 2 Aug 2023 18:24:15 +0200 Subject: [PATCH 5/7] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 4005ab6..cccc945 100644 --- a/manifest.toml +++ b/manifest.toml @@ -43,7 +43,7 @@ ram.runtime = "50M" [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" - type = "string" + type = "select" choices = ["de", "en-US", "es", "fr", "it", "nl", "pt-PT"] default = "fr" From 0faa4bf42eb0952f75bcfe15535a1573f8194d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 2 Aug 2023 18:26:31 +0200 Subject: [PATCH 6/7] Update change_url --- scripts/change_url | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/change_url b/scripts/change_url index 7e14c62..fb0e118 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -25,6 +25,16 @@ ynh_script_progression --message="Updating NGINX web server configuration..." -- ynh_change_url_nginx_config +#================================================= +# MODIFY A CONFIG FILE +#================================================= +ynh_script_progression --message="Modifying a config file..." --weight=1 + +ynh_add_config --template="../conf/config.yml" --destination="$install_dir/config/config.yml" + +chmod 600 $install_dir/config/config.yml +chown $app:$app "$install_dir/config/config.yml" + #================================================= # GENERIC FINALISATION #================================================= From 5d6ce57e6947307cdebdbef80ff7a12717d7c6fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 2 Aug 2023 18:27:39 +0200 Subject: [PATCH 7/7] Update upgrade --- scripts/upgrade | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 51c498e..0dd72ee 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -101,10 +101,12 @@ yunohost service add $app --description="Invidious is an alternative front-end t #================================================= # MODIFY A CONFIG FILE #================================================= -ynh_script_progression --message="Modifying a config file..." +ynh_script_progression --message="Modifying a config file..." --weight=1 ynh_add_config --template="../conf/config.yml" --destination="$install_dir/config/config.yml" + chmod 600 $install_dir/config/config.yml +chown $app:$app "$install_dir/config/config.yml" #================================================= # START SYSTEMD SERVICE