Merge pull request #15 from YunoHost-Apps/testing

Testing
2024-09-03 18:06:12 +02:00 · 2020-12-05 14:21:28 +01:00 · 2020-12-05 14:21:28 +01:00 · c08421ab34
commit c08421ab34
parent f172ccd39c 336813314a
11 changed files with 42 additions and 58 deletions
--- 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).

--- 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)
@ -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,11 +21,9 @@ Alltube est une IHM web pour Youtube-dl.

 * [Démo officielle](https://alltubedownload.net/)

-
 ## Configuration

-Pour configurer Alltube :
-> Edit config.yml file via SSH.
+Pour configurer AllTube : éditez le fichier `config.yml` via SSH.

 ## Documentation

@ -37,7 +35,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 +47,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).

--- a/18
+++ b/18
@ -10,27 +10,17 @@
 		setup_nourl=0
 		setup_private=1
 		setup_public=1
-		upgrade=1	from_commit=1ad6db7eca1264ccd3cf92537aefca891878f095
+		upgrade=1
+		upgrade=1	from_commit=f172ccd39cb043c72fe214cb15ea2db53c9f0325
 		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=f172ccd39cb043c72fe214cb15ea2db53c9f0325
+		name=Merge pull request #12 from ericgaspar/patch-1
 		manifest_arg=domain=DOMAIN&path=PATH&is_public=1&
--- 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;
--- 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**
--- a/manifest.json
+++ b/manifest.json
@ -1,10 +1,10 @@
 {
-    "name": "Alltube",
+    "name": "AllTube",
    "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/",
@ -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"
--- 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

--- 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

--- 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
--- 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
--- 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