From fd6d541c22464ad5aca2cc10c30d7756349b4dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 4 Mar 2022 10:56:48 +0100 Subject: [PATCH] Testing (#82) --- README.md | 2 +- README_fr.md | 2 +- conf/config.yml | 6 ++++-- manifest.json | 6 +++++- scripts/_common.sh | 2 +- scripts/change_url | 4 ++-- scripts/install | 6 ++++++ scripts/upgrade | 4 +++- 8 files changed, 23 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 72ce012..78da945 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,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:** 22.02.25~ynh1 +**Shipped version:** 22.03.03~ynh1 **Demo:** https://invidious.site/ diff --git a/README_fr.md b/README_fr.md index 69630ef..a4f71fc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,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 :** 22.02.25~ynh1 +**Version incluse :** 22.03.03~ynh1 **Démo :** https://invidious.site/ diff --git a/conf/config.yml b/conf/config.yml index aa15ae2..2276ac5 100644 --- a/conf/config.yml +++ b/conf/config.yml @@ -293,8 +293,10 @@ captcha_enabled: __CAPTCHA_ENABLED__ ## Accepted values: an array of strings ## Default: [""] ## -#admins: [""] +admins: ["__ADMIN__"] +## Email provided to users for bug reports +admin_email: __EMAIL__ # ----------------------------- # Background jobs @@ -708,7 +710,7 @@ default_user_preferences: ## 720p, 480p, 360p, 240p, 144p, worst ## Default: auto ## - quality_dash: auto + #quality_dash: auto ## ## Default video playback speed. diff --git a/manifest.json b/manifest.json index 5913b69..0c000fa 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Alternative front-end to YouTube", "fr": "Front-end alternatif à YouTube" }, - "version": "22.02.25~ynh1", + "version": "22.03.03~ynh1", "url": "https://invidio.us/", "upstream": { "license": "GPL-3.0-only", @@ -32,6 +32,10 @@ "name": "domain", "type": "domain" }, + { + "name": "admin", + "type": "user" + }, { "name": "is_public", "type": "boolean", diff --git a/scripts/_common.sh b/scripts/_common.sh index 29056b7..333fab2 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -version_commit=081fd541afc9b2f9b821e0f8f4c66dda0839295c +version_commit=bdfe317e20c9cc5d9e972e51d995faf59b86197d # dependencies used by the app pkg_dependencies="apt-transport-https libssl-dev libxml2-dev libyaml-dev libgmp-dev libreadline-dev postgresql librsvg2-bin imagemagick libsqlite3-dev zlib1g-dev libevent-dev pkg-config libpcre3-dev" diff --git a/scripts/change_url b/scripts/change_url index b8d5cfd..345af2a 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -70,7 +70,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" #================================================= # MODIFY URL IN NGINX CONF @@ -108,7 +108,7 @@ fi #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=3 -ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index a5ab054..7d6b492 100644 --- a/scripts/install +++ b/scripts/install @@ -27,6 +27,8 @@ domain=$YNH_APP_ARG_DOMAIN path_url="/" is_public=$YNH_APP_ARG_IS_PUBLIC language=$YNH_APP_ARG_LANGUAGE +admin=$YNH_APP_ARG_ADMIN +email=$(ynh_user_get_info --username=$admin --key=mail) app=$YNH_APP_INSTANCE_NAME @@ -53,6 +55,8 @@ ynh_script_progression --message="Storing installation settings..." --weight=2 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=language --value=$language +ynh_app_setting_set --app=$app --key=admin --value=$admin +ynh_app_setting_set --app=$app --key=email --value=$email ynh_app_setting_set --app=$app --key=registration_enabled --value=$registration_enabled ynh_app_setting_set --app=$app --key=login_enabled --value=$login_enabled ynh_app_setting_set --app=$app --key=captcha_enabled --value=$captcha_enabled @@ -197,6 +201,8 @@ then ynh_permission_update --permission="main" --add="visitors" fi +ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true" + #================================================= # RELOAD NGINX #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ee39f4a..83f78e2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,11 +19,13 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) +admin=$(ynh_app_setting_get --app=$app --key=admin) port=$(ynh_app_setting_get --app=$app --key=port) language=$(ynh_app_setting_get --app=$app --key=language) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) +email=$(ynh_app_setting_get --app=$app --key=email) registration_enabled=$(ynh_app_setting_get --app=$app --key=registration_enabled) login_enabled=$(ynh_app_setting_get --app=$app --key=login_enabled) @@ -129,7 +131,7 @@ chown -R $app:www-data "$final_path" #================================================= ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #=================================================