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

Merge branch 'testing' into version-2

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/updater.sh vendored
View file

@ -24,7 +24,7 @@ assets="https://github.com/Requarks/wiki/releases/download/$version/wiki-js.tar.
# Sometimes the release name starts with a "v", so let's filter it out. # Sometimes the release name starts with a "v", so let's filter it out.
# You may need more tweaks here if the upstream repository has different naming conventions. # You may need more tweaks here if the upstream repository has different naming conventions.
if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then
version=${version:1} version=${version:1}
fi fi
# Setting up the environment variables # Setting up the environment variables
@ -36,12 +36,12 @@ echo "PROCEED=false" >> $GITHUB_ENV
# Proceed only if the retrieved version is greater than the current one # Proceed only if the retrieved version is greater than the current one
if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then
echo "::warning ::No new version available" echo "::warning ::No new version available"
exit 0 exit 0
# Proceed only if a PR for this new version does not already exist # Proceed only if a PR for this new version does not already exist
elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then
echo "::warning ::A branch already exists for this update" echo "::warning ::A branch already exists for this update"
exit 0 exit 0
fi fi
#================================================= #=================================================

4
README.md
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. 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/ **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 app website: <https://wiki.js.org/>
* Official user documentation: <https://docs-beta.requarks.io/> * Official user documentation: <https://docs-beta.requarks.io/>
* Upstream app code repository: <https://github.com/Requarks/wiki> * 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> * Report a bug: <https://github.com/YunoHost-Apps/wikijs_ynh/issues>
## Developer info ## Developer info

4
README_fr.md
View file

@ -19,7 +19,7 @@ Si vous n’avez 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. 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/ **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 l’app : <https://wiki.js.org/> * Site officiel de l’app : <https://wiki.js.org/>
* Documentation officielle utilisateur : <https://docs-beta.requarks.io/> * Documentation officielle utilisateur : <https://docs-beta.requarks.io/>
* Dépôt de code officiel de l’app : <https://github.com/Requarks/wiki> * Dépôt de code officiel de l’app : <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> * Signaler un bug : <https://github.com/YunoHost-Apps/wikijs_ynh/issues>
## Informations pour les développeurs ## Informations pour les développeurs

2
scripts/change_url
View file

@ -16,7 +16,7 @@ source /usr/share/yunohost/helpers
#================================================= #=================================================
ynh_script_progression --message="Stopping a systemd service..." 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 # MODIFY URL IN NGINX CONF

4
scripts/upgrade
View file

@ -22,7 +22,7 @@ upgrade_type=$(ynh_check_app_version_changed)
#================================================= #=================================================
ynh_script_progression --message="Stopping a systemd service..." 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 # ENSURE DOWNWARD COMPATIBILITY
@ -39,6 +39,8 @@ if [[ -z "$ldap_user" ]]; then
fi fi
ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
#================================================= #=================================================
# CREATE DEDICATED USER # CREATE DEDICATED USER
#================================================= #=================================================