Merge pull request #55 from YunoHost-Apps/testing

Automated testing -> master

ALL_README.md

@@ -5,4 +5,5 @@
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
+- [Baca README dalam bahasa bahasa Indonesia](README_id.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Calckey for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/calckey.svg)](https://dash.yunohost.org/appci/app/calckey) ![Working status](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/calckey.svg)](https://ci-apps.yunohost.org/ci/apps/calckey/) ![Working status](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg)
 
 [![Install Calckey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey)
 

README_es.md

@@ -5,7 +5,7 @@ No se debe editar a mano.
 
 # Calckey para Yunohost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/calckey.svg)](https://dash.yunohost.org/appci/app/calckey) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/calckey.svg)](https://ci-apps.yunohost.org/ci/apps/calckey/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg)
 
 [![Instalar Calckey con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey)
 

README_eu.md

@@ -5,7 +5,7 @@ EZ editatu eskuz.
 
 # Calckey YunoHost-erako
 
-[![Integrazio maila](https://dash.yunohost.org/integration/calckey.svg)](https://dash.yunohost.org/appci/app/calckey) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg)
+[![Integrazio maila](https://dash.yunohost.org/integration/calckey.svg)](https://ci-apps.yunohost.org/ci/apps/calckey/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg)
 
 [![Instalatu Calckey YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey)
 

README_fr.md

@@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
 
 # Calckey pour YunoHost
 
-[![Niveau d’intégration](https://dash.yunohost.org/integration/calckey.svg)](https://dash.yunohost.org/appci/app/calckey) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/calckey.svg)](https://ci-apps.yunohost.org/ci/apps/calckey/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg)
 
 [![Installer Calckey avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey)
 

README_gl.md

@@ -5,7 +5,7 @@ NON debe editarse manualmente.
 
 # Calckey para YunoHost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/calckey.svg)](https://dash.yunohost.org/appci/app/calckey) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/calckey.svg)](https://ci-apps.yunohost.org/ci/apps/calckey/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg)
 
 [![Instalar Calckey con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey)
 

README_id.md

@@ -0,0 +1,59 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# Calckey untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/calckey.svg)](https://ci-apps.yunohost.org/ci/apps/calckey/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg)
+
+[![Pasang Calckey dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang Calckey secara cepat dan mudah pada server YunoHost.*  
+> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.*
+
+## Ringkasan
+
+
+A greatly enhanced fork of Misskey with better UI/UX, security, features, and more! https://i.calckey.cloud/
+
+
+    Calckey is based off of Misskey, a powerful microblogging server on ActivityPub with features such as emoji reactions, a customizable web UI, rich chatting, and much more!
+    Calckey adds many quality of life changes and bug fixes for users and instance admins alike.
+   
+
+
+**Versi terkirim:** 13.1.4.1~ynh1
+
+**Demo:** <https://i.calckey.cloud/>
+
+## Tangkapan Layar
+
+![Tangkapan Layar pada Calckey](./doc/screenshots/screenshot-calckey.png)
+
+## :red_circle: Antifitur
+
+- **Upstream not maintained**: Calckey has been replaced by Firefish, install that new app instead. A migration procedure is being developed for existing instances.
+
+## Dokumentasi dan sumber daya
+
+- Website aplikasi resmi: <https://i.calckey.cloud/>
+- Depot kode aplikasi hulu: <https://codeberg.org/calckey/calckey>
+- Gudang YunoHost: <https://apps.yunohost.org/app/calckey>
+- Laporkan bug: <https://github.com/YunoHost-Apps/calckey_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/calckey_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/calckey_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade calckey -u https://github.com/YunoHost-Apps/calckey_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>

README_zh_Hans.md

@@ -5,7 +5,7 @@
 
 # YunoHost 上的 Calckey
 
-[![集成程度](https://dash.yunohost.org/integration/calckey.svg)](https://dash.yunohost.org/appci/app/calckey) ![工作状态](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg)
+[![集成程度](https://dash.yunohost.org/integration/calckey.svg)](https://ci-apps.yunohost.org/ci/apps/calckey/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg)
 
 [![使用 YunoHost 安装 Calckey](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey)
 

manifest.toml

@@ -20,7 +20,7 @@ deprecated-software.en = "Calckey has been replaced by Firefish, install that ne
 deprecated-software.fr = "Calckey a été remplacée par Firefish, installez plutôt cette nouvelle application. Une procédure de migration est en cours de développement pour les instances existantes."
 
 [integration]
-yunohost = ">= 11.2.12"
+yunohost = ">= 11.2.20"
 architectures = "all"
 multi_instance = false
 ldap = "not_relevant"
@@ -31,9 +31,7 @@ ram.runtime = "2G"
 
 [install]
     [install.domain]
-    # this is a generic question - ask strings are automatically handled by Yunohost's core
     type = "domain"
-    full_domain = true
 
     [install.init_main_permission]
     help.en = "If enabled, Calckey will be accessible by people who do not have an account. This can be changed later via the webadmin."
@@ -58,7 +56,7 @@ ram.runtime = "2G"
     main.default = 3020
 
     [resources.apt]
-    packages = "ffmpeg, postgresql, build-essential"
+    packages = "ffmpeg, postgresql, build-essential, redis-server"
 
     [resources.database]
     type = "postgresql"

scripts/backup

@@ -23,23 +23,13 @@ ynh_print_info --message="Declaring files to be backed up..."
 ynh_backup --src_path="$install_dir"
 
 #=================================================
-# BACKUP THE NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
 
 ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# SPECIFIC BACKUP
-#=================================================
-# BACKUP LOGROTATE
-#=================================================
-
 ynh_backup --src_path="/etc/logrotate.d/$app"
 
-#=================================================
-# BACKUP SYSTEMD
-#=================================================
-
 ynh_backup --src_path="/etc/systemd/system/$app.service"
 
 #=================================================

scripts/install

@@ -9,16 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# RETRIEVE ARGUMENTS FROM THE MANIFEST
-#=================================================
-
-
-
-#=================================================
-# STANDARD MODIFICATIONS
-#=================================================
-
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================

scripts/remove

@@ -9,7 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-
 #=================================================
 # STANDARD REMOVE
 #=================================================
@@ -23,58 +22,20 @@ then
 	yunohost service remove $app
 fi
 
-#=================================================
-# STOP AND REMOVE SERVICE
-#=================================================
-ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1
-
 # Remove the dedicated systemd config
 ynh_remove_systemd_config
 
-#=================================================
-# REMOVE LOGROTATE CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing logrotate configuration..." --weight=1
-
 # Remove the app-specific logrotate config
 ynh_remove_logrotate
 
-#=================================================
-# REMOVE THE REDIS DATABASE
-#=================================================
-ynh_script_progression --message="Removing the redis database..." --weight=1
-
 ynh_redis_remove_db "$redis_db"
 
-#=================================================
-# REMOVE NGINX CONFIGURATION
-#=================================================
-ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
-
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# REMOVE DEPENDENCIES
-#=================================================
-ynh_script_progression --message="Removing dependencies..." --weight=1
-
 # Remove metapackage and its dependencies
 ynh_remove_nodejs
 
-#=================================================
-# SPECIFIC REMOVE
-#=================================================
-# REMOVE VARIOUS FILES
-#=================================================
-
-# Remove the log files
-ynh_secure_remove --file="/var/log/$app"
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/restore

@@ -10,10 +10,6 @@
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# STANDARD RESTORATION STEPS
-#=================================================
-
 #=================================================
 # RESTORE THE APP MAIN DIR
 #=================================================

scripts/upgrade

@@ -9,7 +9,6 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-
 #=================================================
 # CHECK VERSION
 #=================================================
@@ -32,12 +31,7 @@ fi
 ynh_script_progression --message="Stopping a systemd service..." --weight=1
 
 # Stop service before backup, to not loose message in case of failed upgrade and restore
-ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped"
-
-#=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1
+ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd 
 
 #=================================================
 # STANDARD UPGRADE STEPS
@@ -137,7 +131,7 @@ yunohost service add $app --description="A interplanetary blogging platform" --l
 #=================================================
 ynh_script_progression --message="Starting a systemd service..." --weight=1
 
-ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="All workers started"
+ynh_systemd_action --service_name=$app --action="start" --log_path=systemd 
 
 
 #=================================================