1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/wikijs_ynh.git synced 2024-09-03 20:36:09 +02:00

Merge branch 'testing' into version-2

This commit is contained in:
Éric Gaspar 2023-11-18 18:24:44 +01:00
commit bd0ae4a932
5 changed files with 13 additions and 11 deletions

View file

@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Wiki.js is a copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost.
**Shipped version:** 2.5.298~ynh1
**Shipped version:** 2.5.300~ynh2
**Demo:** https://docs-beta.requarks.io/
@ -32,7 +32,7 @@ Wiki.js is a copylefted libre software, modern and powerful wiki app built on No
* Official app website: <https://wiki.js.org/>
* Official user documentation: <https://docs-beta.requarks.io/>
* Upstream app code repository: <https://github.com/Requarks/wiki>
* YunoHost documentation for this app: <https://yunohost.org/app_wikijs>
* YunoHost Store: <https://apps.yunohost.org/app/wikijs>
* Report a bug: <https://github.com/YunoHost-Apps/wikijs_ynh/issues>
## Developer info

View file

@ -19,7 +19,7 @@ Si vous navez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
Wiki.js is a copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost.
**Version incluse :** 2.5.298~ynh1
**Version incluse :** 2.5.300~ynh2
**Démo :** https://docs-beta.requarks.io/
@ -32,7 +32,7 @@ Wiki.js is a copylefted libre software, modern and powerful wiki app built on No
* Site officiel de lapp : <https://wiki.js.org/>
* Documentation officielle utilisateur : <https://docs-beta.requarks.io/>
* Dépôt de code officiel de lapp : <https://github.com/Requarks/wiki>
* Documentation YunoHost pour cette app : <https://yunohost.org/app_wikijs>
* YunoHost Store: <https://apps.yunohost.org/app/wikijs>
* Signaler un bug : <https://github.com/YunoHost-Apps/wikijs_ynh/issues>
## Informations pour les développeurs

View file

@ -16,7 +16,7 @@ source /usr/share/yunohost/helpers
#=================================================
ynh_script_progression --message="Stopping a systemd service..."
ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped wikijs service"
ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped"
#=================================================
# MODIFY URL IN NGINX CONF

View file

@ -22,7 +22,7 @@ upgrade_type=$(ynh_check_app_version_changed)
#=================================================
ynh_script_progression --message="Stopping a systemd service..."
ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped wikijs service"
ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped"
#=================================================
# ENSURE DOWNWARD COMPATIBILITY
@ -39,6 +39,8 @@ if [[ -z "$ldap_user" ]]; then
fi
ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
#=================================================
# CREATE DEDICATED USER
#=================================================