diff --git a/ALL_README.md b/ALL_README.md index 3d6c579..77b7509 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,6 @@ # 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) -- [Leggi il “README” in italiano](README_it.md) diff --git a/README.md b/README.md index 6d44af3..d5f0806 100644 --- a/README.md +++ b/README.md @@ -9,14 +9,14 @@ It shall NOT be edited by hand. [![Install The Lounge with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=thelounge) -*[Read this README is other languages.](./ALL_README.md)* +*[Read this README in other languages.](./ALL_README.md)* > *This package allows you to install The Lounge 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 -Modern web IRC client designed for self-hosting +Modern web IRC client designed for self-hosting. ### Features: @@ -24,7 +24,7 @@ Modern web IRC client designed for self-hosting - Responsive interface - Multi-user support -**Shipped version:** 4.4.1~ynh2 +**Shipped version:** 4.4.3~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..c869a52 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,55 @@ + + +# The Lounge YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/thelounge.svg)](https://dash.yunohost.org/appci/app/thelounge) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/thelounge.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/thelounge.maintain.svg) + +[![Instalatu The Lounge YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=thelounge) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek The Lounge YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Modern web IRC client designed for self-hosting. + +### Features: + +- Always connected +- Responsive interface +- Multi-user support + +**Paketatutako bertsioa:** 4.4.3~ynh1 + +**Demoa:** + +## Pantaila-argazkiak + +![The Lounge(r)en pantaila-argazkia](./doc/screenshots/thelounge-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/thelounge_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/thelounge_ynh/tree/testing --debug +edo +sudo yunohost app upgrade thelounge -u https://github.com/YunoHost-Apps/thelounge_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index ff49bfe..2a4a1a6 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,7 +16,7 @@ Il NE doit PAS être modifié à la main. ## Vue d’ensemble -Client Web IRC moderne conçu pour l'auto-hébergement +Client Web IRC moderne conçu pour l'auto-hébergement. ### Caractéristiques: @@ -24,7 +24,7 @@ Client Web IRC moderne conçu pour l'auto-hébergement - Interface réactive - Support multi-utilisateurs -**Version incluse :** 4.4.1~ynh2 +**Version incluse :** 4.4.3~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 9dea4a7..df0a863 100644 --- a/README_gl.md +++ b/README_gl.md @@ -16,7 +16,7 @@ NON debe editarse manualmente. ## Vista xeral -Modern web IRC client designed for self-hosting +Modern web IRC client designed for self-hosting. ### Features: @@ -24,7 +24,7 @@ Modern web IRC client designed for self-hosting - Responsive interface - Multi-user support -**Versión proporcionada:** 4.4.1~ynh2 +**Versión proporcionada:** 4.4.3~ynh1 **Demo:** diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index d3aba6a..a61138b 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,4 +1,4 @@ -Modern web IRC client designed for self-hosting +Modern web IRC client designed for self-hosting. ### Features: diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index c4cf790..98e7f6b 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -1,4 +1,4 @@ -Client Web IRC moderne conçu pour l'auto-hébergement +Client Web IRC moderne conçu pour l'auto-hébergement. ### Caractéristiques: diff --git a/manifest.toml b/manifest.toml index 5b5d2d6..d6421a9 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "The Lounge" description.en = "Web IRC client" description.fr = "Client Web IRC" -version = "4.4.1~ynh2" +version = "4.4.3~ynh1" maintainers = ["rafi59"] @@ -20,8 +20,11 @@ code = "https://github.com/thelounge/thelounge" yunohost = ">= 11.2" architectures = "all" multi_instance = false + ldap = false + sso = false + disk = "50M" ram.build = "1500M" ram.runtime = "50M" @@ -42,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/thelounge/thelounge/archive/refs/tags/v4.4.1.tar.gz" - sha256 = "4f66e9f8df00c56166daec59793ac0f1e245be72ea3606d84c588ae8e6c097c7" + url = "https://github.com/thelounge/thelounge/archive/refs/tags/v4.4.3.tar.gz" + sha256 = "67491b81be767acfd4a99c52690e400c9f1309a703624eba849236e93492b86a" autoupdate.strategy = "latest_github_tag" [resources.ports] diff --git a/scripts/_common.sh b/scripts/_common.sh index 74b1b8e..5c6c75b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=16 +nodejs_version=18 #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index e391e14..7f1ef6c 100644 --- a/scripts/install +++ b/scripts/install @@ -43,12 +43,12 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Modifying a config file..." --weight=1 -ynh_add_config --template="../conf/config.js" --destination="$data_dir/config.js" +ynh_add_config --template="config.js" --destination="$data_dir/config.js" #================================================= # INSTALL THE LOUNGE #================================================= -ynh_script_progression --message="Installing The Lounge..." --weight=10 +ynh_script_progression --message="Installing $app..." --weight=10 pushd $install_dir ynh_use_nodejs diff --git a/scripts/remove b/scripts/remove index 899d403..fb19483 100644 --- a/scripts/remove +++ b/scripts/remove @@ -14,6 +14,7 @@ source /usr/share/yunohost/helpers #================================================= # REMOVE SERVICE INTEGRATION IN YUNOHOST #================================================= +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null @@ -22,30 +23,15 @@ then yunohost service remove $app fi -#================================================= -# STOP AND REMOVE SERVICE -#================================================= -ynh_script_progression --message="Stopping and removing the systemd service..." --weight=2 +# Remove the dedicated NGINX config +ynh_remove_nginx_config # Remove the dedicated systemd config ynh_remove_systemd_config -#================================================= -# REMOVE DEPENDENCIES -#================================================= -ynh_script_progression --message="Removing dependencies..." --weight=1 - # Remove NodeJS ynh_remove_nodejs -#================================================= -# REMOVE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 - -# Remove the dedicated NGINX config -ynh_remove_nginx_config - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index c9dcc8b..42764d5 100644 --- a/scripts/restore +++ b/scripts/restore @@ -9,15 +9,6 @@ source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers -#================================================= -# STANDARD RESTORATION STEPS -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1 - -ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -50,16 +41,13 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= # RESTORE SYSTEMD #================================================= -ynh_script_progression --message="Restoring the systemd configuration..." --weight=1 +ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 + +ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_restore_file --origin_path="/etc/systemd/system/$app.service" systemctl enable $app.service --quiet -#================================================= -# INTEGRATE SERVICE IN YUNOHOST -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 - yunohost service add $app --description="Client Web IRC" --log="/var/log/$app/$app.log" #================================================= @@ -69,13 +57,6 @@ ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action=start --log_path=systemd -#================================================= -# GENERIC FINALIZATION -#================================================= -# RELOAD NGINX -#================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 - ynh_systemd_action --service_name=nginx --action=reload #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 4c1866e..d625b24 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,32 +21,18 @@ ynh_systemd_action --service_name=$app --action=stop --log_path=systemd #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=2 -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 --full_replace=1 -fi +ynh_setup_source --dest_dir=$install_dir --full_replace=1 chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 - -# Create a dedicated NGINX config -ynh_add_nginx_config - #================================================= # UPGRADE DEPENDENCIES #================================================= ynh_script_progression --message="Upgrading dependencies..." --weight=5 -# Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= @@ -60,31 +40,24 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= # UPGRADE THE LOUNGE #================================================= +ynh_script_progression --message="Installing $app..." --weight=3 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - pushd $install_dir - ynh_use_nodejs - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH NODE_ENV=production yarn build - popd -fi +pushd $install_dir + ynh_use_nodejs + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH NODE_ENV=production yarn build +popd #================================================= -# SETUP SYSTEMD +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading systemd configuration..." --weight=2 +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 + +ynh_add_nginx_config env_path="$PATH" ynh_add_systemd_config -#================================================= -# GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 - yunohost service add $app --description="Client Web IRC" --log="/var/log/$app/$app.log" #=================================================