diff --git a/README.md b/README.md index dfd11f2..3b5e458 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ An open source, modern and powerful wiki app built on Node.js, Git and Markdown **Wiki.js** require a dedicated **root domain**, eg. wikijs.domain.tld -**Shipped version:** 2.0.0-beta.115 +**Shipped version:** 2.0.0-beta.148 ## Screenshots diff --git a/conf/app.src b/conf/app.src index f3c1f2f..17a0cad 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.0.0-beta.115/wiki-js.tar.gz -SOURCE_SUM=b5ea2cc98ad9e096916dacaafbdd44439dedbba925a07ba26955fe0475e6d1b5 +SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.0.0-beta.148/wiki-js.tar.gz +SOURCE_SUM=c8659cf57ea0b582aedc23c3c476a6d70603313834134bc8dbc7be2831e3e2c9 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 0522400..1f0b734 100644 --- a/conf/config.sample.yml +++ b/conf/config.sample.yml @@ -2,7 +2,7 @@ # Wiki.js - CONFIGURATION # ####################################################################### # Full documentation + examples: -# https://docs.requarks.io/wiki/install +# https://docs-beta.requarks.io/install # --------------------------------------------------------------------- # Port the server should listen to @@ -15,7 +15,7 @@ port: __PORT__ # --------------------------------------------------------------------- # Supported Database Engines: # - postgres = PostgreSQL 9.5 or later -# - mysql = MySQL 5.7.8 +# - mysql = MySQL 8.0 or later (5.7.8 partially supported, refer to docs) # - mariadb = MariaDB 10.2.7 or later # - mssql = MS SQL Server 2012 or later # - sqlite = SQLite 3.9 or later @@ -70,6 +70,15 @@ ssl: # Set to false to disable (default: 80): redirectNonSSLPort: 80 +# --------------------------------------------------------------------- +# Database Pool Options +# --------------------------------------------------------------------- +# Refer to https://github.com/vincit/tarn.js for all possible options + +pool: + # min: 2 + # max: 10 + # --------------------------------------------------------------------- # IP address the server should listen to # --------------------------------------------------------------------- @@ -83,3 +92,15 @@ bindIP: 0.0.0.0 # Possible values: error, warn, info (default), verbose, debug, silly logLevel: info + +# --------------------------------------------------------------------- +# Upload Limits +# --------------------------------------------------------------------- +# If you're using a reverse-proxy in front of Wiki.ks, you must also +# change your proxy upload limits! + +uploads: + # Maximum upload size in bytes per file (default: 5242880 (5 MB)) + maxFileSize: 5242880 + # Maximum file uploads per request (default: 20) + maxFiles: 10 diff --git a/manifest.json b/manifest.json index 4686010..fb715c3 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.0.0-beta.115~ynh1", + "version": "2.0.0-beta.148~ynh1", "url": "https://wiki.js.org/", "license": "AGPL-3.0-or-later", "maintainer": {