Testing (#128)

* Update demo URL (#126) * Auto-update READMEs * [autopatch] Automatic patch attempt for helpers 2.1 (#127) * [autopatch] Automatic patch attempt for helpers 2.1 * cleaning --------- Co-authored-by: Yunohost-Bot <> Co-authored-by: Éric Gaspar <[email protected]> * Update manifest.toml * Auto-update READMEs --------- Co-authored-by: Marie <[email protected]> Co-authored-by: yunohost-bot <[email protected]> Co-authored-by: YunoHost Bot <[email protected]>
YunoHost-Apps · Sep 1, 2024 · e9ff45b · e9ff45b
1 parent fa0cf58
commit e9ff45b
Show file tree

Hide file tree

Showing 21 changed files with 191 additions and 286 deletions.
diff --git a/ALL_README.md b/ALL_README.md
@@ -5,4 +5,6 @@
 - [Irakurri README euskaraz](README_eu.md)
 - [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)
diff --git a/README.md b/README.md
@@ -21,9 +21,9 @@ Upload, manage and share photos like from a native application.
 Lychee comes with everything you need and all your photos are stored securely.
 
 
-**Shipped version:** 5.5.1~ynh1
+**Shipped version:** 5.5.1~ynh2
 
-**Demo:** <https://lycheeorg.github.io/demo/>
+**Demo:** <https://lychee-demo.fly.dev/landing>
 
 ## Screenshots
 

diff --git a/README_es.md b/README_es.md
@@ -21,9 +21,9 @@ Upload, manage and share photos like from a native application.
 Lychee comes with everything you need and all your photos are stored securely.
 
 
-**Versión actual:** 5.5.1~ynh1
+**Versión actual:** 5.5.1~ynh2
 
-**Demo:** <https://lycheeorg.github.io/demo/>
+**Demo:** <https://lychee-demo.fly.dev/landing>
 
 ## Capturas
 

diff --git a/README_eu.md b/README_eu.md
@@ -21,9 +21,9 @@ Upload, manage and share photos like from a native application.
 Lychee comes with everything you need and all your photos are stored securely.
 
 
-**Paketatutako bertsioa:** 5.5.1~ynh1
+**Paketatutako bertsioa:** 5.5.1~ynh2
 
-**Demoa:** <https://lycheeorg.github.io/demo/>
+**Demoa:** <https://lychee-demo.fly.dev/landing>
 
 ## Pantaila-argazkiak
 

diff --git a/README_fr.md b/README_fr.md
@@ -21,9 +21,9 @@ Téléchargez, gérez et partagez des photos comme à partir d'une application n
 Lychee est livré avec tout ce dont vous avez besoin et toutes vos photos sont stockées en toute sécurité.
 
 
-**Version incluse :** 5.5.1~ynh1
+**Version incluse :** 5.5.1~ynh2
 
-**Démo :** <https://lycheeorg.github.io/demo/>
+**Démo :** <https://lychee-demo.fly.dev/landing>
 
 ## Captures d’écran
 

diff --git a/README_gl.md b/README_gl.md
@@ -21,9 +21,9 @@ Upload, manage and share photos like from a native application.
 Lychee comes with everything you need and all your photos are stored securely.
 
 
-**Versión proporcionada:** 5.5.1~ynh1
+**Versión proporcionada:** 5.5.1~ynh2
 
-**Demo:** <https://lycheeorg.github.io/demo/>
+**Demo:** <https://lychee-demo.fly.dev/landing>
 
 ## Capturas de pantalla
 

diff --git a/README_id.md b/README_id.md
@@ -0,0 +1,52 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# Lychee untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/lychee.svg)](https://ci-apps.yunohost.org/ci/apps/lychee/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/lychee.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/lychee.maintain.svg)
+
+[![Pasang Lychee dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lychee)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang Lychee secara cepat dan mudah pada server YunoHost.*  
+> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.*
+
+## Ringkasan
+
+Lychee is a free photo-management tool, which runs on your server or web-space.  
+Upload, manage and share photos like from a native application.  
+Lychee comes with everything you need and all your photos are stored securely.
+
+
+**Versi terkirim:** 5.5.1~ynh2
+
+**Demo:** <https://lychee-demo.fly.dev/landing>
+
+## Tangkapan Layar
+
+![Tangkapan Layar pada Lychee](./doc/screenshots/screenshot.jpg)
+
+## Dokumentasi dan sumber daya
+
+- Website aplikasi resmi: <https://lycheeorg.github.io/>
+- Dokumentasi admin resmi: <https://lycheeorg.github.io/docs/>
+- Depot kode aplikasi hulu: <https://github.com/LycheeOrg/Lychee>
+- Gudang YunoHost: <https://apps.yunohost.org/app/lychee>
+- Laporkan bug: <https://github.com/YunoHost-Apps/lychee_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/lychee_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/lychee_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade lychee -u https://github.com/YunoHost-Apps/lychee_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>
diff --git a/README_ru.md b/README_ru.md
@@ -0,0 +1,52 @@
+<!--
+Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Он НЕ ДОЛЖЕН редактироваться вручную.
+-->
+
+# Lychee для YunoHost
+
+[![Уровень интеграции](https://dash.yunohost.org/integration/lychee.svg)](https://ci-apps.yunohost.org/ci/apps/lychee/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/lychee.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/lychee.maintain.svg)
+
+[![Установите Lychee с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lychee)
+
+*[Прочтите этот README на других языках.](./ALL_README.md)*
+
+> *Этот пакет позволяет Вам установить Lychee быстро и просто на YunoHost-сервер.*  
+> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*
+
+## Обзор
+
+Lychee is a free photo-management tool, which runs on your server or web-space.  
+Upload, manage and share photos like from a native application.  
+Lychee comes with everything you need and all your photos are stored securely.
+
+
+**Поставляемая версия:** 5.5.1~ynh2
+
+**Демо-версия:** <https://lychee-demo.fly.dev/landing>
+
+## Снимки экрана
+
+![Снимок экрана Lychee](./doc/screenshots/screenshot.jpg)
+
+## Документация и ресурсы
+
+- Официальный веб-сайт приложения: <https://lycheeorg.github.io/>
+- Официальная документация администратора: <https://lycheeorg.github.io/docs/>
+- Репозиторий кода главной ветки приложения: <https://github.com/LycheeOrg/Lychee>
+- Магазин YunoHost: <https://apps.yunohost.org/app/lychee>
+- Сообщите об ошибке: <https://github.com/YunoHost-Apps/lychee_ynh/issues>
+
+## Информация для разработчиков
+
+Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/lychee_ynh/tree/testing).
+
+Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/lychee_ynh/tree/testing --debug
+или
+sudo yunohost app upgrade lychee -u https://github.com/YunoHost-Apps/lychee_ynh/tree/testing --debug
+```
+
+**Больше информации о пакетировании приложений:** <https://yunohost.org/packaging_apps>
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
@@ -21,9 +21,9 @@ Upload, manage and share photos like from a native application.
 Lychee comes with everything you need and all your photos are stored securely.
 
 
-**分发版本：** 5.5.1~ynh1
+**分发版本：** 5.5.1~ynh2
 
-**演示：** <https://lycheeorg.github.io/demo/>
+**演示：** <https://lychee-demo.fly.dev/landing>
 
 ## 截图
 

diff --git a/conf/extra_php-fpm.conf b/conf/extra_php-fpm.conf
@@ -1,7 +1,5 @@
 ; Additional php.ini defines, specific to this pool of workers.
 
-php_admin_value[upload_max_filesize] = 1G
-php_admin_value[post_max_size] = 1G
 php_admin_value[max_execution_time] = 200
 php_admin_value[upload_max_size] = 1G
 php_admin_value[memory_limit]= 256M

diff --git a/conf/nginx.conf b/conf/nginx.conf
@@ -16,7 +16,7 @@ location ^~ __PATH__/ {
       rewrite ^__PATH__/?(.*)$ __PATH__/index.php?/$1 last;
       break;
     }
-    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;

diff --git a/config_panel.toml.example b/config_panel.toml.example
diff --git a/manifest.toml b/manifest.toml
@@ -5,19 +5,20 @@ name = "Lychee"
 description.en = "Photo-management-system to manage and share photos"
 description.fr = "Système de gestion de photos pour gérer et partager des photos"
 
-version = "5.5.1~ynh1"
+version = "5.5.1~ynh2"
 
 maintainers = []
 
 [upstream]
 license = "MIT"
 website = "https://lycheeorg.github.io/"
-demo = "https://lycheeorg.github.io/demo/"
+demo = "https://lychee-demo.fly.dev/landing"
 admindoc = "https://lycheeorg.github.io/docs/"
 code = "https://github.com/LycheeOrg/Lychee"
 
 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.29"
+helpers_version = "2.1"
 architectures = ["arm64", "amd64"]
 multi_instance = true
 
@@ -54,6 +55,7 @@ ram.runtime = "50M"
     allow_email = true
 
     [resources.install_dir]
+    group = "www-data:r-x"
 
     [resources.data_dir]
     subdirs = ["uploads/big", "uploads/import", "uploads/medium", "uploads/raw", "uploads/small", "uploads/thumb"]

diff --git a/scripts/_common.sh b/scripts/_common.sh
@@ -1,20 +1,7 @@
 #!/bin/bash
 
 #=================================================
-# COMMON VARIABLES
+# COMMON VARIABLES AND CUSTOM HELPERS
 #=================================================
 
-# Composer version
-YNH_COMPOSER_VERSION="2.7.7"
-
-#=================================================
-# PERSONAL HELPERS
-#=================================================
-
-#=================================================
-# EXPERIMENTAL HELPERS
-#=================================================
-
-#=================================================
-# FUTURE OFFICIAL HELPERS
-#=================================================
+composer_version="2.7.7"
diff --git a/scripts/backup b/scripts/backup
@@ -1,51 +1,39 @@
 #!/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 DATA DIR
 #=================================================
 
-ynh_backup --src_path="$data_dir" --is_big
+ynh_backup "$data_dir"
 
 #=================================================
 # SYSTEM CONFIGURATION
 #=================================================
 
-ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
+ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
 
-ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
+ynh_backup "/etc/php/$php_version/fpm/pool.d/$app.conf"
 
-#=================================================
-# SPECIFIC BACKUP
 #=================================================
 # 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)."
diff --git 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..." --weight=3
+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" --last
+ynh_script_progression "Change of URL completed for $app"