From 48508661839adb4c490af50b15d19da8a96a1c1a Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 25 Apr 2020 23:14:43 +0200 Subject: [PATCH 1/3] Upgrade to 2.3.77 --- README.md | 4 +--- conf/app.src | 4 ++-- conf/config.sample.yml | 9 +++++++++ manifest.json | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 34ac191..4f08f31 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,10 @@ If you don't have YunoHost, please look at [the guide](https://yunohost.org/#/in ## Overview A copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost. -**Shipped version:** 2.2.51 +**Shipped version:** 2.3.77 ## Important points before installing -**Wiki.js is still under development, not all features are implemented yet.** - **Wiki.js** requires a dedicated **root domain**, e.g. wikijs.domain.tld ## Screenshots diff --git a/conf/app.src b/conf/app.src index adce6a2..9e5e48e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.2.51/wiki-js.tar.gz -SOURCE_SUM=4f7a0289ef92ad364cc9a75462b434785f34ad1dbc2f7006019b656ff8b9eef8 +SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.3.77/wiki-js.tar.gz +SOURCE_SUM=c416d5e02068a36bb9b4e4fd61436f094440f22d89b0bbca3ae7d89ec9cf9e50 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/config.sample.yml b/conf/config.sample.yml index b2173ee..0606f73 100644 --- a/conf/config.sample.yml +++ b/conf/config.sample.yml @@ -125,6 +125,15 @@ uploads: offline: false +# --------------------------------------------------------------------- +# High-Availability +# --------------------------------------------------------------------- +# Set to true if you have multiple concurrent instances running off the +# same DB (e.g. Kubernetes pods / load balanced instances). Leave false +# otherwise. You MUST be using PostgreSQL to use this feature. + +ha: false + # --------------------------------------------------------------------- # Data Path # --------------------------------------------------------------------- diff --git a/manifest.json b/manifest.json index e55f0bc..6fba7b7 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "An open source, modern and powerful wiki app built on Node.js, Git and Markdown.", "fr": "Un wiki moderne et open source propulsé Node.js, Git et Markdown." }, - "version": "2.2.51~ynh1", + "version": "2.3.77~ynh1", "url": "https://wiki.js.org/", "license": "AGPL-3.0-or-later", "maintainer": { From 4f660eb6ecaf40bcdf33f576a59c774a8839ccb8 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 27 Apr 2020 13:27:57 +0200 Subject: [PATCH 2/3] Update check_process --- check_process | 2 ++ 1 file changed, 2 insertions(+) diff --git a/check_process b/check_process index e372b9e..dd65b2a 100644 --- a/check_process +++ b/check_process @@ -16,6 +16,8 @@ upgrade=1 from_commit=90fb1a7cb3db812a8b2558673d5f1f22b39becec # 2.1.113 upgrade=1 from_commit=f9dd286ff1d662e4ece78364230fc2fddef721cd + # 2.2.51 + upgrade=1 from_commit=1898f27765068f49de23e7ba66b1fc23571799dc backup_restore=1 multi_instance=1 # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. From 0039313f70b8492c2c2247764fcfee488c99f0b8 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Wed, 29 Apr 2020 23:50:42 +0200 Subject: [PATCH 3/3] typo --- conf/ldap_message | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/ldap_message b/conf/ldap_message index ff76bfc..152c37a 100644 --- a/conf/ldap_message +++ b/conf/ldap_message @@ -1,5 +1,5 @@ -Wikijs was successfully installed :) -Please open https://__DOMAIN____PATH_URL__ and follow the steps to setup Wiki.js +Wiki.js was successfully installed :) +Please open https://__DOMAIN____PATH_URL__ and follow the steps to setup LDAP for Wiki.js After following the setup steps, login, create an home page, click on the upper right wheel. In the Modules / Authentication, activate the LDAP / Active Directory and apply following parameters and click Apply: @@ -15,6 +15,6 @@ Registration Allow self-registration: Yes Assign to group: Guest -When activated, users will be abble to login using ldap providing their username (not email address) and password. +When activated, users will be able to login using ldap and providing their username (not email address) and password. If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/wikijs_ynh \ No newline at end of file