diff --git a/ALL_README.md b/ALL_README.md index a01b345..152f2e7 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,7 @@ # 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) diff --git a/README.md b/README.md index ad7a9b4..014dc03 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ It shall NOT be edited by hand. Lstu means Let's Shorten That URL. -**Shipped version:** 0.26.0~ynh3 +**Shipped version:** 0.28-0~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..5994810 --- /dev/null +++ b/README_es.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 funcional](https://ci-apps.yunohost.org/ci/badges/lstu.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/lstu.maintain.svg) + +[![Instalar Lstu con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=lstu) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarLstu 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 + +Lstu means Let's Shorten That URL. + + +**Versión actual:** 0.28-0~ynh1 + +**Demo:** + +## Capturas + +![Captura de Lstu](./doc/screenshots/LSTU_screenshot.png) + +## Documentaciones y recursos + +- Sitio web oficial: +- Documentación administrador oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## Información para desarrolladores + +Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/lstu_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/lstu_ynh/tree/testing --debug +o +sudo yunohost app upgrade lstu -u https://github.com/YunoHost-Apps/lstu_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_eu.md b/README_eu.md index ced49db..f1cc76f 100644 --- a/README_eu.md +++ b/README_eu.md @@ -19,7 +19,7 @@ EZ editatu eskuz. Lstu means Let's Shorten That URL. -**Paketatutako bertsioa:** 0.26.0~ynh3 +**Paketatutako bertsioa:** 0.28-0~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index ae82764..0870e0b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main. Raccourcisseur d'URL -**Version incluse :** 0.26.0~ynh3 +**Version incluse :** 0.28-0~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 3f0c2e6..09d088f 100644 --- a/README_gl.md +++ b/README_gl.md @@ -19,7 +19,7 @@ NON debe editarse manualmente. Lstu means Let's Shorten That URL. -**Versión proporcionada:** 0.26.0~ynh3 +**Versión proporcionada:** 0.28-0~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 23275f6..65f6c78 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -3,7 +3,7 @@ 请勿手动编辑。 --> -# YunoHost 的 Lstu +# 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) @@ -19,7 +19,7 @@ Lstu means Let's Shorten That URL. -**分发版本：** 0.26.0~ynh3 +**分发版本：** 0.28-0~ynh1 **演示：** 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 03f3ac3..c6c4307 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"] @@ -49,8 +49,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.gz" + sha256 = "bb6531dbbc67800b818147fa0758b3581f4a8bf0267537f4ba598334c0c7ab3b" autoupdate.strategy = "latest_gitlab_release" [resources.ports] diff --git a/scripts/install b/scripts/install index 075417f..e036420 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 @@ -66,7 +66,7 @@ ynh_add_config --template="../conf/lstu.conf.ldap" --destination="$install_dir/l 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 0af045f..6b9a2f1 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,15 +36,16 @@ 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 - carton install --deployment --without=sqlite --without=mysql + ynh_secure_remove --file="$install_dir/local" + carton install --without=sqlite --without=mysql popd #=================================================