From b7248221f90cbbe311da4cc41dab7bb11755b268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 10 Aug 2020 18:02:41 +0200 Subject: [PATCH 1/5] Update manifest.json - minor typo --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 1a00d66..1fc0018 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "alltube", "packaging_format": 1, "description": { - "en": "A web interface for Youtube-dl", - "fr": "Un interface web pour Youtube-dl" + "en": "A Web interface for Youtube-dl", + "fr": "Une interface Web pour Youtube-dl" }, "version": "2.3.0~ynh2", "url": "http://alltubedownload.net/", From 9c4bbc9e9ef768daa0b86247314db14b6829280f Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 5 Dec 2020 11:03:02 +0100 Subject: [PATCH 2/5] Fix --- README.md | 8 +++----- README_fr.md | 10 ++++------ conf/nginx.conf | 1 - issue_template.md | 6 +++--- manifest.json | 4 ++-- scripts/change_url | 14 +++++++------- scripts/install | 8 ++++---- scripts/remove | 6 +++--- scripts/restore | 4 ++-- scripts/upgrade | 8 ++++---- 10 files changed, 32 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index b7641fd..bc54bf1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# AllTube app for YunoHost +# AllTube for YunoHost [![Integration level](https://dash.yunohost.org/integration/alltube.svg)](https://dash.yunohost.org/appci/app/alltube) ![](https://ci-apps.yunohost.org/ci/badges/alltube.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/alltube.maintain.svg) [![Install AllTube with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=alltube) @@ -23,8 +23,7 @@ AllTube is a HTML GUI for Youtube-dl. ## Configuration -How to configure this app: -> Edit config.yml file via SSH. +How to configure this app: Edit `config.yml` file via SSH. ## Documentation @@ -49,8 +48,7 @@ There is no user account in the app. --- -Developer info ----------------- +## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/alltube_ynh/tree/testing). diff --git a/README_fr.md b/README_fr.md index e7d9122..aa8f99f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,4 +1,4 @@ -# AllTube app pour YunoHost +# AllTube pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/alltube.svg)](https://dash.yunohost.org/appci/app/alltube) ![](https://ci-apps.yunohost.org/ci/badges/alltube.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/alltube.maintain.svg) [![Installer AllTube avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=alltube) @@ -24,8 +24,7 @@ Alltube est une IHM web pour Youtube-dl. ## Configuration -Pour configurer Alltube : -> Edit config.yml file via SSH. +Pour configurer Alltube : éditez le fichier `config.yml` via SSH. ## Documentation @@ -37,7 +36,7 @@ Pas de compte utilisateur dans l'application #### Architectures supportées -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/alltube%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/alltube/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/alltube%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/alltube/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/alltube%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/alltube/) ## Liens @@ -49,8 +48,7 @@ Pas de compte utilisateur dans l'application --- -Informations pour les développeurs ----------------- +## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/alltube_ynh/tree/testing). diff --git a/conf/nginx.conf b/conf/nginx.conf index 1821bdb..7ade319 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -33,7 +33,6 @@ location __PATH__/ { text/xml xml; application/x-web-app-manifest+json webapp; } -### End of PHP configuration part # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; diff --git a/issue_template.md b/issue_template.md index 5d80eee..f8cbe81 100644 --- a/issue_template.md +++ b/issue_template.md @@ -7,7 +7,7 @@ about: Create a report to help us debug, it would be nice to fill the template a **How to post a meaningful bug report** 1. *Read this whole template first.* 2. *Determine if you are on the right place:* - - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change url...), you are on the right place!* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* - *Otherwise, the issue may be due to alltube itself. Refer to its documentation or repository for help.* - *If you have a doubt, post here, we will figure it out together.* 3. *Delete the italic comments as you write over them below, and remove this guide.* @@ -34,8 +34,8 @@ about: Create a report to help us debug, it would be nice to fill the template a - *If you used the webadmin, please perform the equivalent command from the CLI first.* - *If the error occurs in your browser, explain what you did:* 1. *Go to '...'* - 2. *Click on '....'* - 3. *Scroll down to '....'* + 2. *Click on '...'* + 3. *Scroll down to '...'* 4. *See error* **Expected behavior** diff --git a/manifest.json b/manifest.json index 1fc0018..7b31eb2 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "alltube", "packaging_format": 1, "description": { - "en": "A Web interface for Youtube-dl", - "fr": "Une interface Web pour Youtube-dl" + "en": "Web interface for Youtube-dl", + "fr": "Interface Web pour Youtube-dl" }, "version": "2.3.0~ynh2", "url": "http://alltubedownload.net/", diff --git a/scripts/change_url b/scripts/change_url index 5ab0a27..802c159 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -50,23 +50,23 @@ fi #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating nginx web server configuration..." --weight=50 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=50 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf -# Change the path in the nginx config file +# Change the path in the NGINX config file if [ $change_path -eq 1 ] then - # Make a backup of the original nginx config file if modified + # Make a backup of the original NGINX config file if modified ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for nginx helper + # Set global variables for NGINX helper domain="$old_domain" path_url="$new_path" - # Create a dedicated nginx config + # Create a dedicated NGINX config ynh_add_nginx_config fi -# Change the domain for nginx +# Change the domain for NGINX if [ $change_domain -eq 1 ] then # Delete file checksum for the old conf file location @@ -81,7 +81,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/install b/scripts/install index 3b1446a..4768273 100755 --- a/scripts/install +++ b/scripts/install @@ -70,9 +70,9 @@ ynh_setup_source --dest_dir="$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." --weight=2 +ynh_script_progression --message="Configuring NGINX web server..." --weight=2 -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -86,7 +86,7 @@ ynh_system_user_create --username=$app #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring php-fpm..." --weight=1 +ynh_script_progression --message="Configuring PHP-FPM..." --weight=1 # Create a dedicated php-fpm config ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" @@ -130,7 +130,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/remove b/scripts/remove index de12dfd..74c109f 100755 --- a/scripts/remove +++ b/scripts/remove @@ -40,15 +40,15 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." --weight=5 +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=5 -# Remove the dedicated nginx config +# Remove the dedicated NGINX config ynh_remove_nginx_config #================================================= # REMOVE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Removing php-fpm configuration..." --weight=5 +ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=5 # Remove the dedicated php-fpm config ynh_remove_fpm_config diff --git a/scripts/restore b/scripts/restore index c55c4d3..b210137 100755 --- a/scripts/restore +++ b/scripts/restore @@ -44,7 +44,7 @@ test ! -d $final_path \ #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the nginx configuration..." +ynh_script_progression --message="Restoring the NGINX configuration..." ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -97,7 +97,7 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading nginx web server and php-fpm..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=1 ynh_systemd_action --service_name=php$phpversion-fpm --action=reload ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index a746d11..af65865 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -79,9 +79,9 @@ fi #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=2 +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 #================================================= @@ -102,7 +102,7 @@ ynh_system_user_create --username=$app #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading php-fpm configuration..." --weight=1 +ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated php-fpm config ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" @@ -148,7 +148,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload From 8b08b57d807df345c5bba60f6c8647c74ae64064 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 5 Dec 2020 11:10:35 +0100 Subject: [PATCH 3/5] Fix --- check_process | 18 ++++-------------- manifest.json | 10 +++++----- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/check_process b/check_process index 1ed1ed5..320140b 100644 --- a/check_process +++ b/check_process @@ -10,27 +10,17 @@ setup_nourl=0 setup_private=1 setup_public=1 - upgrade=1 from_commit=1ad6db7eca1264ccd3cf92537aefca891878f095 + upgrade=1 + upgrade=1 from_commit=419e1bb416a9542ddbdf4b8a4135db7faad244bc backup_restore=1 multi_instance=1 incorrect_path=1 port_already_use=0 change_url=1 -;;; Levels - Level 1=auto - Level 2=auto - Level 3=auto - Level 4=0 - Level 5=auto - Level 6=auto - Level 7=auto - Level 8=0 - Level 9=0 - Level 10=0 ;;; Options Email=plopoyop@gmail.com Notification=none ;;; Upgrade options - ; commit=1ad6db7eca1264ccd3cf92537aefca891878f095 - name=Tue Apr 16 20:49:40 2019 +0200 add upgrade script + ; commit=419e1bb416a9542ddbdf4b8a4135db7faad244bc + name=Merge pull request #4 from YunoHost-Apps/update-to-2.2.1 manifest_arg=domain=DOMAIN&path=PATH&is_public=1& diff --git a/manifest.json b/manifest.json index 7b31eb2..50f6ebd 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name": "Alltube", + "name": "AllTube", "id": "alltube", "packaging_format": 1, "description": { @@ -26,8 +26,8 @@ "name": "domain", "type": "domain", "ask": { - "en": "Choose a domain name for Alltube", - "fr": "Choisissez un nom de domaine pour Alltube" + "en": "Choose a domain name for AllTube", + "fr": "Choisissez un nom de domaine pour AllTube" }, "example": "example.com" }, @@ -35,8 +35,8 @@ "name": "path", "type": "path", "ask": { - "en": "Choose a path for Alltube", - "fr": "Choisissez un chemin pour Alltube" + "en": "Choose a path for AllTube", + "fr": "Choisissez un chemin pour AllTube" }, "example": "/alltube", "default": "/alltube" From 74bd5ca248f5fb24fe0af399a30a92dbeefce4b8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 5 Dec 2020 11:12:52 +0100 Subject: [PATCH 4/5] Update README_fr.md --- README_fr.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README_fr.md b/README_fr.md index aa8f99f..aea81c0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -9,7 +9,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* ## Vue d'ensemble -Alltube est une IHM web pour Youtube-dl. +AllTube est une IHM web pour Youtube-dl. **Version incluse:** 2.3.0 @@ -21,10 +21,9 @@ Alltube est une IHM web pour Youtube-dl. * [Démo officielle](https://alltubedownload.net/) - ## Configuration -Pour configurer Alltube : éditez le fichier `config.yml` via SSH. +Pour configurer AllTube : éditez le fichier `config.yml` via SSH. ## Documentation From e9d12266eb3e3c04aaafae8fbbb60f058f560862 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 5 Dec 2020 12:04:11 +0100 Subject: [PATCH 5/5] Update check_process --- check_process | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index 320140b..6af41cc 100644 --- a/check_process +++ b/check_process @@ -11,7 +11,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=419e1bb416a9542ddbdf4b8a4135db7faad244bc + upgrade=1 from_commit=f172ccd39cb043c72fe214cb15ea2db53c9f0325 backup_restore=1 multi_instance=1 incorrect_path=1 @@ -21,6 +21,6 @@ Email=plopoyop@gmail.com Notification=none ;;; Upgrade options - ; commit=419e1bb416a9542ddbdf4b8a4135db7faad244bc - name=Merge pull request #4 from YunoHost-Apps/update-to-2.2.1 + ; commit=f172ccd39cb043c72fe214cb15ea2db53c9f0325 + name=Merge pull request #12 from ericgaspar/patch-1 manifest_arg=domain=DOMAIN&path=PATH&is_public=1&