From 201af711103374b0ff65464eb7b465ed9d177fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 11 Apr 2024 19:04:00 +0200 Subject: [PATCH 1/7] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index d698ae3..c91db63 100644 --- a/manifest.toml +++ b/manifest.toml @@ -13,7 +13,7 @@ maintainers = ["eric_G"] license = "Apache-2.0" website = "https://etherpad.org/" demo = "https://video.etherpad.com/" -admindoc = "http://etherpad.org/doc/v1.9.3" +admindoc = "https://etherpad.org/doc/v2.0.2/" code = "https://github.com/ether/etherpad-lite" [integration] From a0c401889fe2f28519f4feb2a9124c4368350d94 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 11 Apr 2024 17:04:06 +0000 Subject: [PATCH 2/7] Auto-update READMEs --- README.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9939697..64e943c 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ If you want to install Etherpad with plugins and mysql database: https://github. ## Documentation and resources - Official app website: -- Official admin documentation: +- Official admin documentation: - Upstream app code repository: - YunoHost Store: - Report a bug: diff --git a/README_eu.md b/README_eu.md index bf09d1b..2e49d26 100644 --- a/README_eu.md +++ b/README_eu.md @@ -33,7 +33,7 @@ If you want to install Etherpad with plugins and mysql database: https://github. ## Dokumentazioa eta baliabideak - Aplikazioaren webgune ofiziala: -- Administratzaileen dokumentazio ofiziala: +- Administratzaileen dokumentazio ofiziala: - Jatorrizko aplikazioaren kode-gordailua: - YunoHost Denda: - Eman errore baten berri: diff --git a/README_fr.md b/README_fr.md index 14cb281..96e856b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -33,7 +33,7 @@ Si vous souhaitez installer Etherpad avec les plugins et la base de données mys ## Documentations et ressources - Site officiel de l’app : -- Documentation officielle de l’admin : +- Documentation officielle de l’admin : - Dépôt de code officiel de l’app : - YunoHost Store : - Signaler un bug : diff --git a/README_gl.md b/README_gl.md index 4ca7310..9add8b4 100644 --- a/README_gl.md +++ b/README_gl.md @@ -33,7 +33,7 @@ If you want to install Etherpad with plugins and mysql database: https://github. ## Documentación e recursos - Web oficial da app: -- Documentación oficial para admin: +- Documentación oficial para admin: - Repositorio de orixe do código: - Tenda YunoHost: - Informar dun problema: diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 4211574..7c26c9c 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -33,7 +33,7 @@ If you want to install Etherpad with plugins and mysql database: https://github. ## 文档与资源 - 官方应用网站： -- 官方管理文档： +- 官方管理文档： - 上游应用代码库： - YunoHost 商店： - 报告 bug： From 3739c30fc15136eee815693e9f9aa3f56a6db933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 11 Apr 2024 19:09:09 +0200 Subject: [PATCH 3/7] cleaning --- scripts/install | 5 ----- scripts/remove | 5 ----- scripts/restore | 2 -- scripts/upgrade | 17 ++--------------- 4 files changed, 2 insertions(+), 27 deletions(-) diff --git a/scripts/install b/scripts/install index b1d938b..0a0f018 100644 --- a/scripts/install +++ b/scripts/install @@ -30,7 +30,6 @@ ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db" #================================================= ynh_script_progression --message="Setting up source files..." --weight=1 -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir=$install_dir chmod -R o-rwx "$install_dir" @@ -41,13 +40,10 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Configuring a systemd service..." --weight=4 -# Create a dedicated systemd config ynh_add_systemd_config -# Create a dedicated NGINX config ynh_add_nginx_config -# Use logrotate to manage application logfile(s) ynh_use_logrotate yunohost service add $app --description="Collaborative editor" --log="/var/log/$app/$app.log" @@ -93,7 +89,6 @@ popd #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=6 -# Start a systemd service ynh_systemd_action --service_name=$app --action=restart --log_path=systemd --line_match="Your Etherpad version is" #================================================= diff --git a/scripts/remove b/scripts/remove index 22c2052..1a7e93b 100644 --- a/scripts/remove +++ b/scripts/remove @@ -16,27 +16,22 @@ source /usr/share/yunohost/helpers #================================================= 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 then ynh_script_progression --message="Removing $app service integration..." --weight=2 yunohost service remove $app fi -# Remove the dedicated systemd config ynh_remove_systemd_config -# Remove the app-specific logrotate config ynh_remove_logrotate ynh_remove_nodejs ynh_redis_remove_db "$redis_db" -# Remove the dedicated NGINX config ynh_remove_nginx_config -# Remove the log files ynh_secure_remove --file="/var/log/$app" #================================================= diff --git a/scripts/restore b/scripts/restore index 4f93b85..52de706 100644 --- a/scripts/restore +++ b/scripts/restore @@ -16,7 +16,6 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -# Restore permissions on app files chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -31,7 +30,6 @@ chown $app:$app "$install_dir/credentials.json" #================================================= ynh_script_progression --message="Reinstalling dependencies..." --weight=7 -# Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version pushd $install_dir diff --git a/scripts/upgrade b/scripts/upgrade index 8e61188..5bf3b4d 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 #================================================= @@ -53,13 +47,9 @@ fi #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=1 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=1 - - ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="settings.json credentials.json" -fi +ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="settings.json credentials.json" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -69,15 +59,12 @@ chown -R $app:www-data "$install_dir" #================================================= ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=3 -# Create a dedicated NGINX config ynh_add_nginx_config ynh_install_nodejs --nodejs_version=$nodejs_version -# Create a dedicated systemd config ynh_add_systemd_config -# Use logrotate to manage app-specific logfile(s) ynh_use_logrotate --non-append yunohost service add $app --description="Collaborative editor" --log="/var/log/$app/$app.log" From b1e9e8c35dec90aab0e14a10a4b61455583dfb21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 11 Apr 2024 19:09:40 +0200 Subject: [PATCH 4/7] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index c91db63..927cf23 100644 --- a/manifest.toml +++ b/manifest.toml @@ -2,8 +2,8 @@ packaging_format = 2 id = "etherpad" name = "Etherpad" -description.en = "Online editor providing collaborative editing in real-time" -description.fr = "Éditeur en ligne fournissant l'édition collaborative en temps réel" +description.en = "Collaborative editing in real-time" +description.fr = "Édition collaborative en temps réel" version = "2.0.2~ynh1" From b9658f9f0bbfa133639464c9fadefa1014515733 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 30 Apr 2024 03:32:27 +0200 Subject: [PATCH 5/7] Upgrade to v2.0.3 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 927cf23..8b26ec8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Etherpad" description.en = "Collaborative editing in real-time" description.fr = "Édition collaborative en temps réel" -version = "2.0.2~ynh1" +version = "2.0.3~ynh1" maintainers = ["eric_G"] @@ -63,8 +63,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/ether/etherpad-lite/archive/refs/tags/2.0.2.tar.gz" - sha256 = "5b5e47dbe7b07c3cafd8830780408f25141231b62f44ce9aa066329ed3223b4e" + url = "https://github.com/ether/etherpad-lite/archive/refs/tags/2.0.3.tar.gz" + sha256 = "6dc19addc8280806590f9a82d4426a88a8ef77c7841f99f97a50d6aa6c9ecc1a" autoupdate.strategy = "latest_github_tag" [resources.ports] From 35419f05abe2ee7034bd86a37967d84f97135916 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 30 Apr 2024 01:32:30 +0000 Subject: [PATCH 6/7] Auto-update READMEs --- README.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 64e943c..99ba42d 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented. If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh", -**Shipped version:** 2.0.2~ynh1 +**Shipped version:** 2.0.3~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 2e49d26..812b63f 100644 --- a/README_eu.md +++ b/README_eu.md @@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented. If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh", -**Paketatutako bertsioa:** 2.0.2~ynh1 +**Paketatutako bertsioa:** 2.0.3~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 96e856b..00285ae 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ Attention, la sauvegarde et la restauration de la base de données Redis ne sont Si vous souhaitez installer Etherpad avec les plugins et la base de données mysql : https://github.com/YunoHost-Apps/etherpad_mypads_ynh", -**Version incluse :** 2.0.2~ynh1 +**Version incluse :** 2.0.3~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 9add8b4..442625d 100644 --- a/README_gl.md +++ b/README_gl.md @@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented. If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh", -**Versión proporcionada:** 2.0.2~ynh1 +**Versión proporcionada:** 2.0.3~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 7c26c9c..35c596a 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -22,7 +22,7 @@ Be aware, Redis database backup and restore is not fully implemented. If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh", -**分发版本：** 2.0.2~ynh1 +**分发版本：** 2.0.3~ynh1 **演示：** From 00eb604dd00ebe63ae773639f309975b4660fdfa Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 8 May 2024 20:26:02 +0000 Subject: [PATCH 7/7] Auto-update READMEs --- README_zh_Hans.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 35c596a..c38ac7c 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -3,7 +3,7 @@ 请勿手动编辑。 --> -# YunoHost 的 Etherpad +# YunoHost 上的 Etherpad [![集成程度](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![工作状态](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg)