Merge pull request #29 from YunoHost-Apps/testing

Testing
2024-09-03 19:36:23 +02:00 · 2024-09-02 15:23:12 +02:00 · 2024-09-02 15:23:12 +02:00 · 64752691a5
commit 64752691a5
parent 442065f5cf 248ddb362b
20 changed files with 127 additions and 159 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,3 @@
 *~
 *.sw[op]
+.DS_Store
--- a/ALL_README.md
+++ b/ALL_README.md
@ -6,4 +6,5 @@
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
 - [Baca README dalam bahasa bahasa Indonesia](README_id.md)
+- [Прочитать README на русский](README_ru.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)
--- a/README.md
+++ b/README.md
@ -30,7 +30,7 @@ Self-hosted Speed Test for HTML5 and more. Easy setup, examples, configurable, m
 - Multiple Points of Test (optional)


-**Shipped version:** 5.4.1~ynh1
+**Shipped version:** 5.4.1~ynh2

 **Demo:** <https://librespeed.org>

--- a/README_es.md
+++ b/README_es.md
@ -30,7 +30,7 @@ Self-hosted Speed Test for HTML5 and more. Easy setup, examples, configurable, m
 - Multiple Points of Test (optional)


-**Versión actual:** 5.4.1~ynh1
+**Versión actual:** 5.4.1~ynh2

 **Demo:** <https://librespeed.org>

--- a/README_eu.md
+++ b/README_eu.md
@ -30,7 +30,7 @@ Self-hosted Speed Test for HTML5 and more. Easy setup, examples, configurable, m
 - Multiple Points of Test (optional)


-**Paketatutako bertsioa:** 5.4.1~ynh1
+**Paketatutako bertsioa:** 5.4.1~ynh2

 **Demoa:** <https://librespeed.org>

--- a/README_fr.md
+++ b/README_fr.md
@ -28,7 +28,7 @@ Test de vitesse auto-hébergé pour HTML5 et plus. Configuration facile, exemple
 - Partage des résultats (facultatif)
 - Plusieurs points de test (facultatif)

-**Version incluse :** 5.4.1~ynh1
+**Version incluse :** 5.4.1~ynh2

 **Démo :** <https://librespeed.org>

--- a/README_gl.md
+++ b/README_gl.md
@ -30,7 +30,7 @@ Self-hosted Speed Test for HTML5 and more. Easy setup, examples, configurable, m
 - Multiple Points of Test (optional)


-**Versión proporcionada:** 5.4.1~ynh1
+**Versión proporcionada:** 5.4.1~ynh2

 **Demo:** <https://librespeed.org>

--- a/README_id.md
+++ b/README_id.md
@ -30,7 +30,7 @@ Self-hosted Speed Test for HTML5 and more. Easy setup, examples, configurable, m
 - Multiple Points of Test (optional)


-**Versi terkirim:** 5.4.1~ynh1
+**Versi terkirim:** 5.4.1~ynh2

 **Demo:** <https://librespeed.org>

--- a/README_ru.md
+++ b/README_ru.md
@ -0,0 +1,62 @@
+<!--
+Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Он НЕ ДОЛЖЕН редактироваться вручную.
+-->
+
+# LibreSpeed для YunoHost
+
+[![Уровень интеграции](https://dash.yunohost.org/integration/librespeed.svg)](https://ci-apps.yunohost.org/ci/apps/librespeed/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/librespeed.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/librespeed.maintain.svg)
+
+[![Установите LibreSpeed с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=librespeed)
+
+*[Прочтите этот README на других языках.](./ALL_README.md)*
+
+> *Этот пакет позволяет Вам установить LibreSpeed быстро и просто на YunoHost-сервер.*  
+> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*
+
+## Обзор
+
+Self-hosted Speed Test for HTML5 and more. Easy setup, examples, configurable, mobile friendly. Supports PHP, Node, Multiple servers, and more.
+
+### Features
+
+- Download
+- Upload
+- Ping
+- Jitter
+- IP Address, ISP, distance from server (optional)
+- Telemetry (optional)
+- Results sharing (optional)
+- Multiple Points of Test (optional)
+
+
+**Поставляемая версия:** 5.4.1~ynh2
+
+**Демо-версия:** <https://librespeed.org>
+
+## Снимки экрана
+
+![Снимок экрана LibreSpeed](./doc/screenshots/screenshot.png)
+
+## Документация и ресурсы
+
+- Официальный веб-сайт приложения: <https://librespeed.org>
+- Официальная документация пользователя: <https://github.com/librespeed/speedtest/wiki>
+- Официальная документация администратора: <https://github.com/librespeed/speedtest/wiki>
+- Репозиторий кода главной ветки приложения: <https://github.com/librespeed/speedtest>
+- Магазин YunoHost: <https://apps.yunohost.org/app/librespeed>
+- Сообщите об ошибке: <https://github.com/YunoHost-Apps/librespeed_ynh/issues>
+
+## Информация для разработчиков
+
+Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/librespeed_ynh/tree/testing).
+
+Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/librespeed_ynh/tree/testing --debug
+или
+sudo yunohost app upgrade librespeed -u https://github.com/YunoHost-Apps/librespeed_ynh/tree/testing --debug
+```
+
+**Больше информации о пакетировании приложений:** <https://yunohost.org/packaging_apps>
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@ -30,7 +30,7 @@ Self-hosted Speed Test for HTML5 and more. Easy setup, examples, configurable, m
 - Multiple Points of Test (optional)


-**分发版本：** 5.4.1~ynh1
+**分发版本：** 5.4.1~ynh2

 **演示：** <https://librespeed.org>

--- a/conf/extra_php-fpm.conf
+++ b/conf/extra_php-fpm.conf
@ -1,4 +0,0 @@
-; Additional php.ini defines, specific to this pool of workers.
-
-php_admin_value[upload_max_filesize] = 256M
-php_admin_value[post_max_size] = 256M
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@ -12,7 +12,7 @@ location __PATH__/ {
  try_files $uri $uri/ /index.php;
  location ~ [^/]\.php(/|$) {
    fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-    fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
+    fastcgi_pass unix:/var/run/php/php__PHP_VERSION__-fpm-__APP__.sock;
    fastcgi_index index.php;
    include fastcgi_params;
    fastcgi_param REMOTE_USER $remote_user;
--- a/manifest.toml
+++ b/manifest.toml
@ -5,7 +5,7 @@ name = "LibreSpeed"
 description.en = "Very lightweight Speedtest"
 description.fr = "Test de vitesse de connexion très léger"

-version = "5.4.1~ynh1"
+version = "5.4.1~ynh2"

 maintainers = ["Augustin Rungeard"]

@ -18,7 +18,8 @@ userdoc = "https://github.com/librespeed/speedtest/wiki"
 code = "https://github.com/librespeed/speedtest"

 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.29"
+helpers_version = "2.1"
 architectures = "all"
 multi_instance = true

@ -64,6 +65,7 @@ ram.runtime = "50M"
    [resources.system_user]

    [resources.install_dir]
+    group = "www-data:r-x"

    [resources.permissions]
    main.url = "/"
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@ -1,17 +1,5 @@
 #!/bin/bash

 #=================================================
-# COMMON VARIABLES
-#=================================================
-
-#=================================================
-# PERSONAL HELPERS
-#=================================================
-
-#=================================================
-# EXPERIMENTAL HELPERS
-#=================================================
-
-#=================================================
-# FUTURE OFFICIAL HELPERS
+# COMMON VARIABLES AND CUSTOM HELPERS
 #=================================================
--- a/scripts/backup
+++ b/scripts/backup
@ -1,47 +1,33 @@
 #!/bin/bash

-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers

-#=================================================
-# DECLARE DATA AND CONF FILES TO BACKUP
-#=================================================
-ynh_print_info --message="Declaring files to be backed up..."
+ynh_print_info "Declaring files to be backed up..."

 #=================================================
 # BACKUP THE APP MAIN DIR
 #=================================================

-ynh_backup --src_path="$install_dir"
+ynh_backup "$install_dir"

 #=================================================
 # BACKUP THE NGINX CONFIGURATION
 #=================================================

-ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"

-#=================================================
-# BACKUP THE PHP-FPM CONFIGURATION
-#=================================================
-
-ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
+ynh_backup "/etc/php/$php_version/fpm/pool.d/$app.conf"

 #=================================================
 # BACKUP THE MYSQL DATABASE
 #=================================================
-ynh_print_info --message="Backing up the MySQL database..."
+ynh_print_info "Backing up the MySQL database..."

-ynh_mysql_dump_db --database="$db_name" > db.sql
+ynh_mysql_dump_db > db.sql

 #=================================================
 # END OF SCRIPT
 #=================================================

-ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
+ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."
--- a/scripts/change_url
+++ b/scripts/change_url
@ -1,23 +1,17 @@
 #!/bin/bash

-#=================================================
-# GENERIC STARTING
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers

 #=================================================
 # MODIFY URL IN NGINX CONF
 #=================================================
-ynh_script_progression --message="Updating NGINX web server configuration..." --time --weight=1
+ynh_script_progression "Updating NGINX web server configuration..."

-ynh_change_url_nginx_config
+ynh_config_change_url_nginx

 #=================================================
 # END OF SCRIPT
 #=================================================

-ynh_script_progression --message="Change of URL completed for $app" --time --last
+ynh_script_progression "Change of URL completed for $app"
--- a/scripts/install
+++ b/scripts/install
@ -1,50 +1,38 @@
 #!/bin/bash

-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers

-ynh_app_setting_set --app="$app" --key=password --value="$password"
+ynh_app_setting_set --key=php_upload_max_filesize --value=256M
+
+ynh_app_setting_set --key=password --value="$password"

 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-ynh_script_progression --message="Setting up source files..." --weight=2
+ynh_script_progression "Setting up source files..."

-# Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"

-chown -R $app:www-data $install_dir
-chmod o-rwx $install_dir
-
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=3
+ynh_script_progression "Configuring NGINX web server..."

-# Create a dedicated NGINX config
-ynh_add_nginx_config
+ynh_config_add_nginx

-# Create a dedicated PHP-FPM config
-ynh_add_fpm_config
+ynh_config_add_phpfpm

-ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < "$install_dir/results/telemetry_mysql.sql"
+ynh_mysql_db_shell < "$install_dir/results/telemetry_mysql.sql"

 #=================================================
 # CONFIGURE LIBRESPEED
 #=================================================
-ynh_script_progression --message="Configuring $app..." --weight=3
+ynh_script_progression "Configuring $app..."

-ynh_add_config --template="telemetry_settings.php" --destination="$install_dir/results/telemetry_settings.php"
-chmod 650 "$install_dir/results/telemetry_settings.php"
-chown $app:www-data "$install_dir/results/telemetry_settings.php"
+ynh_config_add --template="telemetry_settings.php" --destination="$install_dir/results/telemetry_settings.php"

-ynh_add_config --template="example-singleServer-full.html" --destination="$install_dir/index.html"
+ynh_config_add --template="example-singleServer-full.html" --destination="$install_dir/index.html"
 chmod 650 "$install_dir/index.html"
 chown $app:www-data "$install_dir/index.html"

@ -52,4 +40,4 @@ chown $app:www-data "$install_dir/index.html"
 # END OF SCRIPT
 #=================================================

-ynh_script_progression --message="Installation of $app completed" --last
+ynh_script_progression "Installation of $app completed"
--- a/scripts/remove
+++ b/scripts/remove
@ -1,27 +1,19 @@
 #!/bin/bash

-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers

 #=================================================
 # REMOVE NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
+ynh_script_progression "Removing NGINX web server configuration..."

-# Remove the dedicated NGINX config
-ynh_remove_nginx_config
+ynh_config_remove_nginx

-# Remove the dedicated PHP-FPM config
-ynh_remove_fpm_config
+ynh_config_remove_phpfpm

 #=================================================
 # END OF SCRIPT
 #=================================================

-ynh_script_progression --message="Removal of $app completed" --last
+ynh_script_progression "Removal of $app completed"
--- a/scripts/restore
+++ b/scripts/restore
@ -1,55 +1,41 @@
 #!/bin/bash

-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
-# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers

 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================
-ynh_script_progression --message="Restoring the app main directory..." --weight=2
+ynh_script_progression "Restoring the app main directory..."

-ynh_restore_file --origin_path="$install_dir"
-
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
+ynh_restore "$install_dir"

 #=================================================
 # RESTORE THE MYSQL DATABASE
 #=================================================
-ynh_script_progression --message="Restoring the MySQL database..." --weight=1
+ynh_script_progression "Restoring the MySQL database..."

-ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
+ynh_mysql_db_shell < ./db.sql

 #=================================================
 # RESTORE SYSTEM CONFIGURATIONS
 #=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
-#=================================================
-ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1
+ynh_script_progression "Restoring system configurations related to $app..."

-ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
+ynh_restore "/etc/php/$php_version/fpm/pool.d/$app.conf"

-ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf"

-#=================================================
-# GENERIC FINALIZATION
 #=================================================
 # RELOAD NGINX AND PHP-FPM
 #=================================================
-ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=2
+ynh_script_progression "Reloading NGINX web server and PHP-FPM..."

-ynh_systemd_action --service_name=php$phpversion-fpm --action=reload
-ynh_systemd_action --service_name=nginx --action=reload
+ynh_systemctl --service=php$php_version-fpm --action=reload
+ynh_systemctl --service=nginx --action=reload

 #=================================================
 # END OF SCRIPT
 #=================================================

-ynh_script_progression --message="Restoration completed for $app" --last
+ynh_script_progression "Restoration completed for $app"
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -1,67 +1,39 @@
 #!/bin/bash

-#=================================================
-# GENERIC START
-#=================================================
-# IMPORT GENERIC HELPERS
-#=================================================
-
 source _common.sh
 source /usr/share/yunohost/helpers

-#=================================================
-# CHECK VERSION
-#=================================================
-
-upgrade_type=$(ynh_check_app_version_changed)
+ynh_app_setting_set_default --key=php_upload_max_filesize --value=256M

 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression "Upgrading source files..."

-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-	ynh_script_progression --message="Upgrading source files..." --weight=2
-
-	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir" --keep="results/telemetry_settings.php index.html"
-fi
-
-chmod -R o-rwx "$install_dir"
-chown -R $app:www-data "$install_dir"
+ynh_setup_source --dest_dir="$install_dir" --keep="results/telemetry_settings.php index.html"

 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
+ynh_script_progression "Upgrading NGINX web server configuration..."

-# Create a dedicated NGINX config
-ynh_add_nginx_config
+ynh_config_add_nginx

-# Create a dedicated PHP-FPM config
-ynh_add_fpm_config
+ynh_config_add_phpfpm

-#=================================================
-# SPECIFIC UPGRADE
 #=================================================
 # CONFIGURE LIBRESPEED
 #=================================================
+ynh_script_progression "Reconfiguring LibreSpeed..."

-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-    ynh_script_progression --message="Reconfiguring LibreSpeed..."
+ynh_config_add --template="telemetry_settings.php" --destination="$install_dir/results/telemetry_settings.php"
    
-    ynh_add_config --template="telemetry_settings.php" --destination="$install_dir/results/telemetry_settings.php"
-    chmod 650 "$install_dir/results/telemetry_settings.php"
-    chown $app:www-data "$install_dir/results/telemetry_settings.php"
-
-    ynh_add_config --template="example-singleServer-full.html" --destination="$install_dir/index.html"
-    chmod 650 "$install_dir/index.html"
-    chown $app:www-data "$install_dir/index.html"
-fi
+ynh_config_add --template="example-singleServer-full.html" --destination="$install_dir/index.html"
+chmod 650 "$install_dir/index.html"
+chown $app:www-data "$install_dir/index.html"

 #=================================================
 # END OF SCRIPT
 #=================================================

-ynh_script_progression --message="Upgrade of $app completed" --last
+ynh_script_progression "Upgrade of $app completed"