Merge pull request #103 from YunoHost-Apps/testing

Testing

ALL_README.md

@@ -1,6 +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)
-- [Leggi il “README” in italiano](README_it.md)
+- [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -9,7 +9,7 @@ It shall NOT be edited by hand.
 
 [![Install Uptime Kuma with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=uptime-kuma)
 
-*[Read this README is other languages.](./ALL_README.md)*
+*[Read this README in other languages.](./ALL_README.md)*
 
 > *This package allows you to install Uptime Kuma 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 @@ Uptime Kuma is a self-hosted monitoring tool like "Uptime Robot".
 - Certificate Info
 
 
-**Shipped version:** 1.23.11~ynh1
+**Shipped version:** 1.23.12~ynh1
 
 **Demo:** <https://demo.uptime.kuma.pet>
 

README_eu.md

@@ -0,0 +1,60 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# Uptime Kuma YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/uptime-kuma.svg)](https://dash.yunohost.org/appci/app/uptime-kuma) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/uptime-kuma.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/uptime-kuma.maintain.svg)
+
+[![Instalatu Uptime Kuma YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=uptime-kuma)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek Uptime Kuma YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+Uptime Kuma is a self-hosted monitoring tool like "Uptime Robot".
+
+### Features
+
+- Monitoring uptime for HTTP(s) / TCP / Ping / DNS Record / Push.
+- Notifications via Telegram, Discord, Gotify, Slack, Pushover, Email (SMTP)...
+- 20 second intervals
+- Multi Languages
+- Simple Status Page
+- Ping Chart
+- Certificate Info
+
+
+**Paketatutako bertsioa:** 1.23.12~ynh1
+
+**Demoa:** <https://demo.uptime.kuma.pet>
+
+## Pantaila-argazkiak
+
+![Uptime Kuma(r)en pantaila-argazkia](./doc/screenshots/example.jpg)
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://uptime.kuma.pet/>
+- Erabiltzaileen dokumentazio ofiziala: <https://github.com/louislam/uptime-kuma/wiki>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/louislam/uptime-kuma>
+- YunoHost Denda: <https://apps.yunohost.org/app/uptime-kuma>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/uptime-kuma_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/uptime-kuma_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/uptime-kuma_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade uptime-kuma -u https://github.com/YunoHost-Apps/uptime-kuma_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -28,7 +28,7 @@ Uptime Kuma est un outil de surveillance auto-hébergé comme « Uptime Robot »
 - Graphique Ping
 - Informations sur le certificat
 
-**Version incluse :** 1.23.11~ynh1
+**Version incluse :** 1.23.12~ynh1
 
 **Démo :** <https://demo.uptime.kuma.pet>
 

README_gl.md

@@ -29,7 +29,7 @@ Uptime Kuma is a self-hosted monitoring tool like "Uptime Robot".
 - Certificate Info
 
 
-**Versión proporcionada:** 1.23.11~ynh1
+**Versión proporcionada:** 1.23.12~ynh1
 
 **Demo:** <https://demo.uptime.kuma.pet>
 

README_zh_Hans.md

@@ -0,0 +1,60 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 的 Uptime Kuma
+
+[![集成程度](https://dash.yunohost.org/integration/uptime-kuma.svg)](https://dash.yunohost.org/appci/app/uptime-kuma) ![工作状态](https://ci-apps.yunohost.org/ci/badges/uptime-kuma.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/uptime-kuma.maintain.svg)
+
+[![使用 YunoHost 安装 Uptime Kuma](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=uptime-kuma)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Uptime Kuma。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+Uptime Kuma is a self-hosted monitoring tool like "Uptime Robot".
+
+### Features
+
+- Monitoring uptime for HTTP(s) / TCP / Ping / DNS Record / Push.
+- Notifications via Telegram, Discord, Gotify, Slack, Pushover, Email (SMTP)...
+- 20 second intervals
+- Multi Languages
+- Simple Status Page
+- Ping Chart
+- Certificate Info
+
+
+**分发版本：** 1.23.12~ynh1
+
+**演示：** <https://demo.uptime.kuma.pet>
+
+## 截图
+
+![Uptime Kuma 的截图](./doc/screenshots/example.jpg)
+
+## 文档与资源
+
+- 官方应用网站： <https://uptime.kuma.pet/>
+- 官方用户文档： <https://github.com/louislam/uptime-kuma/wiki>
+- 上游应用代码库： <https://github.com/louislam/uptime-kuma>
+- YunoHost 商店： <https://apps.yunohost.org/app/uptime-kuma>
+- 报告 bug： <https://github.com/YunoHost-Apps/uptime-kuma_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/uptime-kuma_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/uptime-kuma_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade uptime-kuma -u https://github.com/YunoHost-Apps/uptime-kuma_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>

doc/ADMIN.md

@@ -1,3 +1,2 @@
-- node_modules folder is backed up and shouldn't be (600Mo...)
 - This app needs a manual post-install
 - We could pre-configure mail notifications with YunoHost mail server as an improvement. See comments in file to try to do it with Curl and WebSockets or Sqlite.

manifest.toml

@@ -5,7 +5,7 @@ name = "Uptime Kuma"
 description.en = "Monitoring tool like Uptime-Robot"
 description.fr = "Outil de surveillance similaire à Uptime-Robot"
 
-version = "1.23.11~ynh1"
+version = "1.23.12~ynh1"
 
 maintainers = ["ketsapiwiq"]
 
@@ -39,14 +39,14 @@ ram.runtime = "50M"
 [resources]
     [resources.sources]
         [resources.sources.dist]
-        url = "https://github.com/louislam/uptime-kuma/releases/download/1.23.11/dist.tar.gz"
+        url = "https://github.com/louislam/uptime-kuma/releases/download/1.23.12/dist.tar.gz"
-        sha256 = "6e98ef8b7f62565ebff8cb48c3a23012b9d8044819d4f8980f99bc37bf2a468d"
+        sha256 = "049bab4b7ef11edecd30365f23036737737cfb1862eaf8f653229f7708094e2f"
         autoupdate.strategy = "latest_github_release"
         autoupdate.asset = "dist.tar.gz"
 
         [resources.sources.main]
-        url = "https://github.com/louislam/uptime-kuma/archive/refs/tags/1.23.11.tar.gz"
+        url = "https://github.com/louislam/uptime-kuma/archive/refs/tags/1.23.12.tar.gz"
-        sha256 = "7ae1f6ab320cb22436972554fce95779e16382c00adebbc5c9be33f3298593c4"
+        sha256 = "c456f274f100898225f8e50d49eadb9679fc34a4c91d0235121031eb62b70148"
         autoupdate.strategy = "latest_github_release"
         autoupdate.asset = "tarball"
 

scripts/backup

@@ -19,7 +19,7 @@ ynh_print_info --message="Declaring files to be backed up..."
 # BACKUP THE APP MAIN DIR
 #=================================================
 
-ynh_backup --src_path="$install_dir" --is_big
+ynh_backup --src_path="$install_dir"
 
 #=================================================
 # BACKUP THE NGINX CONFIGURATION

scripts/install

@@ -52,9 +52,9 @@ yunohost service add $app --description="Monitoring tool" --log="/var/log/$app/$
 ynh_script_progression --message="Installing $app dependencies..." --weight=7
 
 pushd "$install_dir"
-	ynh_use_nodejs
+ynh_use_nodejs
-	ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install --production
+ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install --omit=dev
-	ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run download-dist
+ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run download-dist
 popd
 
 #=================================================

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,16 +21,13 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=1
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
+# Download, check integrity, uncompress and patch the source from app.src
-then
+ynh_setup_source --dest_dir="$install_dir"
-	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"
 
-    # Download, check integrity, uncompress and patch the source from dist.src
+# Download, check integrity, uncompress and patch the source from dist.src
-    ynh_setup_source --dest_dir="$install_dir/dist" --source_id="dist"
+ynh_setup_source --dest_dir="$install_dir/dist" --source_id="dist"
-fi
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
@@ -66,7 +57,10 @@ ynh_script_progression --message="Upgrading $app dependencies..." --weight=7
 
 pushd "$install_dir"
 	ynh_use_nodejs
-	ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install --production
+	ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm install --omit=dev
+	ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm run download-dist
+	# Residue of old versions caching
+	ynh_secure_remove $install_dir/.cache
 popd
 
 #=================================================

tests.toml

@@ -6,4 +6,4 @@ test_format = 1.0
     # Commits to test upgrade from
     # -------------------------------
 
-    test_upgrade_from.484a6b12681415f6cc031ed3279795ce1a8b29cc.name = "Upgrade from 1.20.2"
+    test_upgrade_from.540526b8571a336beb0e8402d1b24ac86bd34d2d.name = "Upgrade from 1.23.11"