Merge branch 'testing' into pr/58

2024-09-03 20:26:34 +02:00 · 2024-08-31 15:56:25 +02:00 · 2024-08-31 15:56:25 +02:00 · 119f4537e7
commit 119f4537e7
parent bab9d59ebb 5dd048d8f5
10 changed files with 109 additions and 32 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,3 @@
+*~
+*.sw[op]
+.DS_Store
--- a/ALL_README.md
+++ b/ALL_README.md
@ -5,4 +5,6 @@
 - [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_ru.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)
--- a/README_id.md
+++ b/README_id.md
@ -0,0 +1,49 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# TiddlyWiki untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/tiddlywiki.svg)](https://ci-apps.yunohost.org/ci/apps/tiddlywiki/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.maintain.svg)
+
+[![Pasang TiddlyWiki dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=tiddlywiki)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang TiddlyWiki 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
+
+TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable WikiText.
+
+**Versi terkirim:** 5.3.5~ynh1
+
+**Demo:** <https://tiddlywiki.com/>
+
+## Tangkapan Layar
+
+![Tangkapan Layar pada TiddlyWiki](./doc/screenshots/screenshot.png)
+
+## Dokumentasi dan sumber daya
+
+- Website aplikasi resmi: <https://tiddlywiki.com/>
+- Dokumentasi admin resmi: <https://tiddlywiki.com/>
+- Depot kode aplikasi hulu: <https://github.com/Jermolene/TiddlyWiki5>
+- Gudang YunoHost: <https://apps.yunohost.org/app/tiddlywiki>
+- Laporkan bug: <https://github.com/YunoHost-Apps/tiddlywiki_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade tiddlywiki -u https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>
--- a/README_ru.md
+++ b/README_ru.md
@ -0,0 +1,49 @@
+<!--
+Важно: этот README был автоматически сгенерирован <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Он НЕ ДОЛЖЕН редактироваться вручную.
+-->
+
+# TiddlyWiki для YunoHost
+
+[![Уровень интеграции](https://dash.yunohost.org/integration/tiddlywiki.svg)](https://ci-apps.yunohost.org/ci/apps/tiddlywiki/) ![Состояние работы](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.status.svg) ![Состояние сопровождения](https://ci-apps.yunohost.org/ci/badges/tiddlywiki.maintain.svg)
+
+[![Установите TiddlyWiki с YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=tiddlywiki)
+
+*[Прочтите этот README на других языках.](./ALL_README.md)*
+
+> *Этот пакет позволяет Вам установить TiddlyWiki быстро и просто на YunoHost-сервер.*  
+> *Если у Вас нет YunoHost, пожалуйста, посмотрите [инструкцию](https://yunohost.org/install), чтобы узнать, как установить его.*
+
+## Обзор
+
+TiddlyWiki is a complete interactive wiki in JavaScript. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable WikiText.
+
+**Поставляемая версия:** 5.3.5~ynh1
+
+**Демо-версия:** <https://tiddlywiki.com/>
+
+## Снимки экрана
+
+![Снимок экрана TiddlyWiki](./doc/screenshots/screenshot.png)
+
+## Документация и ресурсы
+
+- Официальный веб-сайт приложения: <https://tiddlywiki.com/>
+- Официальная документация администратора: <https://tiddlywiki.com/>
+- Репозиторий кода главной ветки приложения: <https://github.com/Jermolene/TiddlyWiki5>
+- Магазин YunoHost: <https://apps.yunohost.org/app/tiddlywiki>
+- Сообщите об ошибке: <https://github.com/YunoHost-Apps/tiddlywiki_ynh/issues>
+
+## Информация для разработчиков
+
+Пришлите Ваш запрос на слияние в [ветку `testing`](https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing).
+
+Чтобы попробовать ветку `testing`, пожалуйста, сделайте что-то вроде этого:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing --debug
+или
+sudo yunohost app upgrade tiddlywiki -u https://github.com/YunoHost-Apps/tiddlywiki_ynh/tree/testing --debug
+```
+
+**Больше информации о пакетировании приложений:** <https://yunohost.org/packaging_apps>
--- a/conf/systemd.service
+++ b/conf/systemd.service
@ -7,7 +7,7 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
-Environment=PATH=PATH=__PATH_WITH_NODEJS__
+Environment=PATH=__PATH_WITH_NODEJS__
 Environment=NODE_ENV=production
 ExecStart=__NODEJS_DIR__/node tiddlywiki ++languages/__LANGUAGE__ __DATA_DIR__ --listen port=__PORT__
 Restart=always
--- a/manifest.toml
+++ b/manifest.toml
@ -18,7 +18,7 @@ code = "https://github.com/Jermolene/TiddlyWiki5"
 fund = "https://opencollective.com/tiddlywiki"

 [integration]
-yunohost = ">= 11.2.18"
+yunohost = ">= 11.2.29"
 helpers_version = "2.1"
 architectures = "all"
 multi_instance = true
--- a/scripts/install
+++ b/scripts/install
@ -15,23 +15,18 @@ ynh_nodejs_install
 #=================================================
 ynh_script_progression "Setting up source files..."

-# Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"

-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir"
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir"
 #=================================================
 # SYSTEM CONFIGURATION
 #=================================================
 ynh_script_progression "Adding system configurations related to $app..."

-# Create a dedicated NGINX config
 ynh_config_add_nginx

-# Create a dedicated systemd config
 ynh_config_add_systemd

-yunohost service add $app --description="A non-linear personal web notebook" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Non-linear personal web notebook" --log="/var/log/$app/$app.log"

 #=================================================
 # ADD A CONFIGURATION
@ -41,8 +36,7 @@ ynh_script_progression "Configuring $app..."
 if [ ! -f $data_dir/tiddlywiki.info ]
 then
 	pushd $install_dir
-
-		ynh_hide_warnings ynh_exec_as_app node_load_PATH ./tiddlywiki.js $data_dir --init server
+		ynh_hide_warnings ynh_exec_as_app --preserve-env=PATH ./tiddlywiki.js $data_dir --init server
 	popd
 fi

@ -51,7 +45,6 @@ fi
 #=================================================
 ynh_script_progression "Starting $app's systemd service..."

-# Start a systemd service
 ynh_systemctl --service=$app --action="start" --log_path="systemd" --wait_until="Serving on"

 #=================================================
--- a/scripts/remove
+++ b/scripts/remove
@ -5,23 +5,17 @@ source /usr/share/yunohost/helpers

 #=================================================
 # REMOVE SYSTEM CONFIGURATIONS
-#=================================================
-# REMOVE SYSTEMD SERVICE
-
 #=================================================
 ynh_script_progression "Removing system configurations related to $app..."

-# Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
 if ynh_hide_warnings yunohost service status $app >/dev/null
 then
 	ynh_script_progression "Removing $app service integration..."
 	yunohost service remove $app
 fi

-# Remove the dedicated systemd config
 ynh_config_remove_systemd

-# Remove the dedicated NGINX config
 ynh_config_remove_nginx

 ynh_nodejs_remove
--- a/scripts/restore
+++ b/scripts/restore
@ -1,6 +1,5 @@
 #!/bin/bash

-# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers

@ -11,8 +10,6 @@ ynh_script_progression "Restoring the app main directory..."

 ynh_restore "$install_dir"

-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir"
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir"
 #=================================================
 # RESTORE THE DATA DIRECTORY
 #=================================================
@ -22,21 +19,16 @@ ynh_restore "$data_dir"

 chown -R $app:www-data "$data_dir"

-#=================================================
-# SPECIFIC RESTORATION
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================
 ynh_script_progression "Reinstalling dependencies..."

-# Install Nodejs
 ynh_nodejs_install

 #=================================================
 # RESTORE SYSTEM CONFIGURATIONS
 #=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
-#=================================================
 ynh_script_progression "Restoring system configurations related to $app..."

 ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf"
@ -44,7 +36,7 @@ ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf"
 ynh_restore "/etc/systemd/system/$app.service"
 systemctl enable $app.service --quiet

-yunohost service add $app --description="A non-linear personal web notebook" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Non-linear personal web notebook" --log="/var/log/$app/$app.log"

 #=================================================
 # RELOAD NGINX AND PHP-FPM OR THE APP SERVICE
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -15,11 +15,8 @@ ynh_systemctl --service=$app --action="stop"
 #=================================================
 ynh_script_progression "Upgrading source files..."

-# Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir" --full_replace

-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir"
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir"
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
@ -32,13 +29,11 @@ ynh_nodejs_install
 #=================================================
 ynh_script_progression "Upgrading system configurations related to $app..."

-# Create a dedicated NGINX config
 ynh_config_add_nginx

-# Create a dedicated systemd config
 ynh_config_add_systemd

-yunohost service add $app --description="A non-linear personal web notebook" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Non-linear personal web notebook" --log="/var/log/$app/$app.log"

 #=================================================
 # START SYSTEMD SERVICE