Merge pull request #8 from YunoHost-Apps/testing

Testing
2024-09-03 18:36:18 +02:00 · 2024-06-18 09:03:19 +02:00 · 2024-06-18 09:03:19 +02:00 · f7ee3d2933
commit f7ee3d2933
parent b89ec78aaf 074b8501ce
13 changed files with 194 additions and 68 deletions
--- a/ALL_README.md
+++ b/ALL_README.md
@ -1,6 +1,8 @@
 # All available README files by language

 - [Read the README in English](README.md)
+- [Lea el README en español](README_es.md)
+- [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
- [Leggi il “README” in italiano](README_it.md)
+- [阅读中文（简体）的 README](README_zh_Hans.md)
--- a/README.md
+++ b/README.md
@ -9,7 +9,7 @@ It shall NOT be edited by hand.

 [![Install GitList with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=gitlist)

-*[Read this README is other languages.](./ALL_README.md)*
+*[Read this README in other languages.](./ALL_README.md)*

 > *This package allows you to install GitList quickly and simply on a YunoHost server.*  
 > *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.*
@ -29,7 +29,7 @@ GitList is an elegant and modern web interface for interacting with multiple git
 - Repository statistics


-**Shipped version:** 2.0.0~ynh4
+**Shipped version:** 2.0.0~ynh5

 ## Screenshots

--- a/README_es.md
+++ b/README_es.md
@ -0,0 +1,58 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# GitList para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/gitlist.svg)](https://dash.yunohost.org/appci/app/gitlist) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/gitlist.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/gitlist.maintain.svg)
+
+[![Instalar GitList con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=gitlist)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarGitList rapidamente y simplement en un servidor YunoHost.*  
+> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
+
+## Descripción general
+
+GitList is an elegant and modern web interface for interacting with multiple git repositories. It allows you to browse repositories using your favorite browser, viewing files under different revisions, commit history, diffs. It also generates RSS/Atom feeds for each repository, allowing you to stay up-to-date with the latest changes anytime, anywhere.
+
+### Features
+
+- Multiple repository support
+- Multiple branch support
+- Multiple tag support
+- Commit history, blame, diff
+- RSS/Atom feeds
+- Syntax highlighting via CodeMirror or Ace
+- Repository statistics
+
+
+**Versión actual:** 2.0.0~ynh5
+
+## Capturas
+
+![Captura de GitList](./doc/screenshots/screenshot.png)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://gitlist.org/>
+- Documentación administrador oficial: <https://github.com/klaussilveira/gitlist/wiki>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/klaussilveira/gitlist>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/gitlist>
+- Reportar un error: <https://github.com/YunoHost-Apps/gitlist_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/gitlist_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/gitlist_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade gitlist -u https://github.com/YunoHost-Apps/gitlist_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>
--- a/README_eu.md
+++ b/README_eu.md
@ -0,0 +1,58 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# GitList YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/gitlist.svg)](https://dash.yunohost.org/appci/app/gitlist) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/gitlist.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/gitlist.maintain.svg)
+
+[![Instalatu GitList YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=gitlist)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek GitList YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+GitList is an elegant and modern web interface for interacting with multiple git repositories. It allows you to browse repositories using your favorite browser, viewing files under different revisions, commit history, diffs. It also generates RSS/Atom feeds for each repository, allowing you to stay up-to-date with the latest changes anytime, anywhere.
+
+### Features
+
+- Multiple repository support
+- Multiple branch support
+- Multiple tag support
+- Commit history, blame, diff
+- RSS/Atom feeds
+- Syntax highlighting via CodeMirror or Ace
+- Repository statistics
+
+
+**Paketatutako bertsioa:** 2.0.0~ynh5
+
+## Pantaila-argazkiak
+
+![GitList(r)en pantaila-argazkia](./doc/screenshots/screenshot.png)
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://gitlist.org/>
+- Administratzaileen dokumentazio ofiziala: <https://github.com/klaussilveira/gitlist/wiki>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/klaussilveira/gitlist>
+- YunoHost Denda: <https://apps.yunohost.org/app/gitlist>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/gitlist_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/gitlist_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/gitlist_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade gitlist -u https://github.com/YunoHost-Apps/gitlist_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>
--- a/README_fr.md
+++ b/README_fr.md
@ -28,7 +28,7 @@ GitList est une interface Web élégante et moderne permettant d'interagir avec
 - Mise en évidence de la syntaxe via CodeMirror ou Ace
 - Statistiques du référentiel

-**Version incluse :** 2.0.0~ynh4
+**Version incluse :** 2.0.0~ynh5

 ## Captures d’écran

--- a/README_gl.md
+++ b/README_gl.md
@ -29,7 +29,7 @@ GitList is an elegant and modern web interface for interacting with multiple git
 - Repository statistics


-**Versión proporcionada:** 2.0.0~ynh4
+**Versión proporcionada:** 2.0.0~ynh5

 ## Capturas de pantalla

--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@ -0,0 +1,58 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 上的 GitList
+
+[![集成程度](https://dash.yunohost.org/integration/gitlist.svg)](https://dash.yunohost.org/appci/app/gitlist) ![工作状态](https://ci-apps.yunohost.org/ci/badges/gitlist.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/gitlist.maintain.svg)
+
+[![使用 YunoHost 安装 GitList](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=gitlist)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 GitList。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+GitList is an elegant and modern web interface for interacting with multiple git repositories. It allows you to browse repositories using your favorite browser, viewing files under different revisions, commit history, diffs. It also generates RSS/Atom feeds for each repository, allowing you to stay up-to-date with the latest changes anytime, anywhere.
+
+### Features
+
+- Multiple repository support
+- Multiple branch support
+- Multiple tag support
+- Commit history, blame, diff
+- RSS/Atom feeds
+- Syntax highlighting via CodeMirror or Ace
+- Repository statistics
+
+
+**分发版本：** 2.0.0~ynh5
+
+## 截图
+
+![GitList 的截图](./doc/screenshots/screenshot.png)
+
+## 文档与资源
+
+- 官方应用网站： <https://gitlist.org/>
+- 官方管理文档： <https://github.com/klaussilveira/gitlist/wiki>
+- 上游应用代码库： <https://github.com/klaussilveira/gitlist>
+- YunoHost 商店： <https://apps.yunohost.org/app/gitlist>
+- 报告 bug： <https://github.com/YunoHost-Apps/gitlist_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/gitlist_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/gitlist_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade gitlist -u https://github.com/YunoHost-Apps/gitlist_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>
--- a/config_panel.toml.example
+++ b/config_panel.toml.example
--- a/doc/ADMIN_fr.md
+++ b/doc/ADMIN_fr.md
@ -1 +1 @@
-Répertoires Git par défaut : `__DATA_DIR__`
+Répertoires Git par défaut : `__DATA_DIR__` (this can be changed in the `__INSTALL_DIR__config.yaml` file)
--- a/manifest.toml
+++ b/manifest.toml
@ -5,9 +5,9 @@ name = "GitList"
 description.en = "Elegant and modern git repository viewer"
 description.fr = "Visualiseur de référentiel git élégant et moderne"

-version = "2.0.0~ynh4"
+version = "2.0.0~ynh5"

-maintainers = ["eric_G"]
+maintainers = []

 [upstream]
 license = "BSD-3-Clause"
@ -19,8 +19,11 @@ code = "https://github.com/klaussilveira/gitlist"
 yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
+
 ldap = false
+
 sso = false
+
 disk = "50M"
 ram.build = "150M"
 ram.runtime = "50M"
@ -38,7 +41,7 @@ ram.runtime = "50M"
        url = "https://github.com/klaussilveira/gitlist/releases/download/2.0.0/gitlist-2.0.0.zip"
        sha256 = "06df38598c7e6f8ceb62e09efc0849960dc8f8e4a8a6f4719624c82e5a21fdf7"
        in_subdir = false
-        autoupdate.strategy = "latest_github_tag"
+        autoupdate.strategy = "latest_github_releases"

    [resources.system_user]

@ -50,4 +53,4 @@ ram.runtime = "50M"
    main.url = "/"

    [resources.apt]
-    packages = "php8.2-fpm, php8.2-dom, git"
+    packages = "php8.3-fpm, php8.3-dom, git"
--- a/scripts/backup
+++ b/scripts/backup
@ -33,10 +33,6 @@ ynh_backup --src_path="$data_dir" --is_big

 ynh_backup --src_path="/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"

 #=================================================
--- a/scripts/install
+++ b/scripts/install
@ -9,22 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers

-#=================================================
-# RETRIEVE ARGUMENTS FROM THE MANIFEST
-#=================================================
-
-fpm_footprint="low"
-fpm_free_footprint=0
-fpm_usage="low"
-
-#=================================================
-# STORE SETTINGS FROM MANIFEST
-#=================================================
-
-ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
-ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint
-ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@ -42,7 +26,7 @@ chown -R $app:www-data "$install_dir"
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=1

 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --usage=$fpm_usage --footprint=$fpm_footprint
+ynh_add_fpm_config

 # Create a dedicated NGINX config
 ynh_add_nginx_config
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -9,46 +9,13 @@
 source _common.sh
 source /usr/share/yunohost/helpers

-#=================================================
-# CHECK VERSION
-#=================================================
-
-upgrade_type=$(ynh_check_app_version_changed)
-
-#=================================================
-# ENSURE DOWNWARD COMPATIBILITY
-#=================================================
-ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
-
-# If fpm_footprint doesn't exist, create it
-if [ -z "${fpm_footprint:-}" ]; then
-    fpm_footprint=low
-    ynh_app_setting_set --app=$app --key=fpm_footprint --value=$fpm_footprint
-fi
-
-# If fpm_free_footprint doesn't exist, create it
-if [ -z "${fpm_free_footprint:-}" ]; then
-    fpm_free_footprint=0
-    ynh_app_setting_set --app=$app --key=fpm_free_footprint --value=$fpm_free_footprint
-fi
-
-# If fpm_usage doesn't exist, create it
-if [ -z "${fpm_usage:-}" ]; then
-    fpm_usage=low
-    ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage
-fi
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
-
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
 ynh_script_progression --message="Upgrading source files..." --weight=1

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

 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
@ -59,7 +26,7 @@ chown -R $app:www-data "$install_dir"
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1

 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --phpversion=$phpversion --usage=$fpm_usage --footprint=$fpm_footprint
+ynh_add_fpm_config

 # Create a dedicated NGINX config
 ynh_add_nginx_config