From ab372fd543f8a45267b1dbcf25ba4021dbb01f95 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 17 Feb 2024 12:12:29 +0100 Subject: [PATCH 1/5] Upgrade to v0.28-0 https://framagit.org/fiat-tux/hat-softwares/lstu/-/releases/0.28-0 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 91ab075..6d2fd4c 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Lstu" description.en = "URL Shortener" description.fr = "Raccourcisseur d'URL" -version = "0.26.0~ynh3" +version = "0.28-0~ynh1" maintainers = ["frju365"] @@ -50,8 +50,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://framagit.org/fiat-tux/hat-softwares/lstu/-/archive/0.26-0/lstu-0.26-0.tar.gz" - sha256 = "323c81b4cb04a97eda7cb37b2a63d16e808591fd46eb4326f6619200ce742960" + url = "https://framagit.org/fiat-tux/hat-softwares/lstu/-/archive/0.28-0/lstu-0.28-0.tar.bz2" + sha256 = "8e7e818540ade44c7ed410b0ee25a0091b2cf56bc04bdaccdeb4e5c354635546" autoupdate.strategy = "latest_gitlab_release" [resources.ports] From c7783846e4c5b8c5c6b7bd55749bc3e107b0059b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 17 Feb 2024 11:12:33 +0000 Subject: [PATCH 2/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ffa5ff6..267fc70 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Lstu means Let's Shorten That URL. -**Shipped version:** 0.26.0~ynh3 +**Shipped version:** 0.28-0~ynh1 **Demo:** https://lstu.fr diff --git a/README_fr.md b/README_fr.md index dba2cf2..c025557 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Raccourcisseur d'URL -**Version incluse :** 0.26.0~ynh3 +**Version incluse :** 0.28-0~ynh1 **Démo :** https://lstu.fr From 7b3101ad4c76f3093d40890e897522a871892c23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 13 Apr 2024 22:20:47 +0200 Subject: [PATCH 3/5] cleaning --- conf/nginx.conf | 1 + manifest.toml | 4 ++-- scripts/install | 2 +- scripts/upgrade | 21 ++++++--------------- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 4939bf4..211b4cd 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -6,6 +6,7 @@ location __PATH__/ { proxy_pass http://127.0.0.1:__PORT__; + proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/manifest.toml b/manifest.toml index 6d2fd4c..248c4d6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -50,8 +50,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://framagit.org/fiat-tux/hat-softwares/lstu/-/archive/0.28-0/lstu-0.28-0.tar.bz2" - sha256 = "8e7e818540ade44c7ed410b0ee25a0091b2cf56bc04bdaccdeb4e5c354635546" + url = "https://framagit.org/fiat-tux/hat-softwares/lstu/-/archive/0.28-0/lstu-0.28-0.tar.gz" + sha256 = "bb6531dbbc67800b818147fa0758b3581f4a8bf0267537f4ba598334c0c7ab3b" autoupdate.strategy = "latest_gitlab_release" [resources.ports] diff --git a/scripts/install b/scripts/install index 075417f..b720dc3 100644 --- a/scripts/install +++ b/scripts/install @@ -58,7 +58,7 @@ yunohost service add $app --log="/var/log/$app.log" --log="/var/www/$app/log/pro #================================================= ynh_script_progression --message="Adding a configuration file..." -ynh_add_config --template="../conf/lstu.conf.ldap" --destination="$install_dir/lstu.conf" +ynh_add_config --template="lstu.conf.ldap" --destination="$install_dir/lstu.conf" #================================================= # INSTALL LSTU diff --git a/scripts/upgrade b/scripts/upgrade index 0af045f..f84f38a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,12 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -27,14 +21,10 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="lstu.conf" -fi +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir" --keep="lstu.conf" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -46,14 +36,15 @@ chown -R $app:www-data "$install_dir" #================================================= #ynh_script_progression --message="Updating a configuration file..." -#ynh_add_config --template="../conf/lstu.conf.ldap" --destination="$install_dir/lstu.conf" +#ynh_add_config --template="lstu.conf.ldap" --destination="$install_dir/lstu.conf" #================================================= # BUILD LSU #================================================= -ynh_script_progression --message="Building lstu..." +ynh_script_progression --message="Building $app..." pushd $install_dir + ynh_secure_remove --file="$install_dir/local" carton install --deployment --without=sqlite --without=mysql popd From 7c36166b167db83adb5fae792c8b97a677cfa367 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 13 Apr 2024 20:20:52 +0000 Subject: [PATCH 4/5] Auto-update READMEs --- ALL_README.md | 7 +++++++ README.md | 28 +++++++++++++------------- README_eu.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 32 +++++++++++++++--------------- README_gl.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 187 insertions(+), 30 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_eu.md create mode 100644 README_gl.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..a01b345 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,7 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Irakurri README euskaraz](README_eu.md) +- [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 267fc70..014dc03 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Install Lstu with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lstu) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install Lstu 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.* +> *This package allows you to install Lstu 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.* ## Overview @@ -21,7 +21,7 @@ Lstu means Let's Shorten That URL. **Shipped version:** 0.28-0~ynh1 -**Demo:** https://lstu.fr +**Demo:** ## Screenshots @@ -29,22 +29,22 @@ Lstu means Let's Shorten That URL. ## Documentation and resources -* Official app website: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/lstu_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/lstu_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/lstu_ynh/tree/testing --debug or sudo yunohost app upgrade lstu -u https://github.com/YunoHost-Apps/lstu_ynh/tree/testing --debug ``` -**More info regarding app packaging:** \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..f1cc76f --- /dev/null +++ b/README_eu.md @@ -0,0 +1,50 @@ + + +# Lstu YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/lstu.svg)](https://dash.yunohost.org/appci/app/lstu) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/lstu.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/lstu.maintain.svg) + +[![Instalatu Lstu YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lstu) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Lstu YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Lstu means Let's Shorten That URL. + + +**Paketatutako bertsioa:** 0.28-0~ynh1 + +**Demoa:** + +## Pantaila-argazkiak + +![Lstu(r)en pantaila-argazkia](./doc/screenshots/LSTU_screenshot.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/lstu_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/lstu_ynh/tree/testing --debug +edo +sudo yunohost app upgrade lstu -u https://github.com/YunoHost-Apps/lstu_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index c025557..0870e0b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # Lstu pour YunoHost @@ -9,19 +9,19 @@ It shall NOT be edited by hand. [![Installer Lstu avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lstu) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer Lstu rapidement et simplement sur un serveur YunoHost. -Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* +> *Ce package vous permet d’installer Lstu rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble Raccourcisseur d'URL -**Version incluse :** 0.28-0~ynh1 +**Version incluse :** 0.28-0~ynh1 -**Démo :** https://lstu.fr +**Démo :** ## Captures d’écran @@ -29,22 +29,22 @@ Raccourcisseur d'URL ## Documentations et ressources -* Site officiel de l’app : -* Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Documentation officielle de l’admin : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/lstu_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/lstu_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/lstu_ynh/tree/testing --debug ou sudo yunohost app upgrade lstu -u https://github.com/YunoHost-Apps/lstu_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..09d088f --- /dev/null +++ b/README_gl.md @@ -0,0 +1,50 @@ + + +# Lstu para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/lstu.svg)](https://dash.yunohost.org/appci/app/lstu) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/lstu.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/lstu.maintain.svg) + +[![Instalar Lstu con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lstu) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar Lstu de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +Lstu means Let's Shorten That URL. + + +**Versión proporcionada:** 0.28-0~ynh1 + +**Demo:** + +## Capturas de pantalla + +![Captura de pantalla de Lstu](./doc/screenshots/LSTU_screenshot.png) + +## Documentación e recursos + +- Web oficial da app: +- Documentación oficial para admin: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/lstu_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/lstu_ynh/tree/testing --debug +ou +sudo yunohost app upgrade lstu -u https://github.com/YunoHost-Apps/lstu_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..f8b57c5 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,50 @@ + + +# YunoHost 的 Lstu + +[![集成程度](https://dash.yunohost.org/integration/lstu.svg)](https://dash.yunohost.org/appci/app/lstu) ![工作状态](https://ci-apps.yunohost.org/ci/badges/lstu.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/lstu.maintain.svg) + +[![使用 YunoHost 安装 Lstu](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lstu) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Lstu。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +Lstu means Let's Shorten That URL. + + +**分发版本：** 0.28-0~ynh1 + +**演示：** + +## 截图 + +![Lstu 的截图](./doc/screenshots/LSTU_screenshot.png) + +## 文档与资源 + +- 官方应用网站： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/lstu_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/lstu_ynh/tree/testing --debug +或 +sudo yunohost app upgrade lstu -u https://github.com/YunoHost-Apps/lstu_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** From f1ee1c706c73a811236a97c435dbc16c5ceef096 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Mon, 29 Apr 2024 20:26:31 +0200 Subject: [PATCH 5/5] fix upgrade --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index b720dc3..e036420 100644 --- a/scripts/install +++ b/scripts/install @@ -66,7 +66,7 @@ ynh_add_config --template="lstu.conf.ldap" --destination="$install_dir/lstu.conf ynh_script_progression --message="Installing Lstu..." pushd $install_dir - carton install --deployment --without=sqlite --without=mysql + carton install --without=sqlite --without=mysql popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index f84f38a..6b9a2f1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -45,7 +45,7 @@ ynh_script_progression --message="Building $app..." pushd $install_dir ynh_secure_remove --file="$install_dir/local" - carton install --deployment --without=sqlite --without=mysql + carton install --without=sqlite --without=mysql popd #=================================================