Merge pull request #89 from YunoHost-Apps/testing

Upgrade to 2.1.107

README.md

@@ -9,7 +9,7 @@ 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.0.12
+**Shipped version:** 2.1.107
 
 ## Important points before installing
 

check_process

@@ -10,7 +10,10 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
+		# 2.0.0-beta.303
 		upgrade=1	from_commit=62db8a96750dfd28880126d3eb9228d4d71f0814
+		# 2.0.12
+		upgrade=1	from_commit=90fb1a7cb3db812a8b2558673d5f1f22b39becec
 		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.

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.0.12/wiki-js.tar.gz
+SOURCE_URL=https://github.com/Requarks/wiki/releases/download/2.1.107/wiki-js.tar.gz
-SOURCE_SUM=67ad4b7b3d70085da277fb7beacbfd99f97715cd81d99ff5e6eef3c407c05bc3
+SOURCE_SUM=8b5cac71bbef018714f4c00c743261e2cf72bfbcb537be254a345e7261a06950
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=false

conf/config.sample.yml

@@ -22,6 +22,7 @@ port: __PORT__
 
 db:
   type: postgres
+
   # PostgreSQL / MySQL / MariaDB / MS SQL Server only:
   host: localhost
   port: 5432
@@ -29,6 +30,19 @@ db:
   pass: __DB_PWD__
   db: __DB_NAME__
   ssl: false
+
+  # Optional - PostgreSQL / MySQL / MariaDB only:
+  # -> Uncomment lines you need below and set `auto` to false
+  # -> Full list of accepted options: https://nodejs.org/api/tls.html#tls_tls_createsecurecontext_options
+  sslOptions:
+    auto: true
+    # rejectUnauthorized: false
+    # ca: path/to/ca.crt
+    # cert: path/to/cert.crt
+    # key: path/to/key.pem
+    # pfx: path/to/cert.pfx
+    # passphrase: xyz123
+
   # SQLite only:
   storage: path/to/database.sqlite
 
@@ -45,7 +59,12 @@ db:
 
 ssl:
   enabled: false
+  port: 3443
 
+  # Provider to use, possible values: custom, letsencrypt
+  provider: custom
+
+  # ++++++ For custom only ++++++
   # Certificate format, either 'pem' or 'pfx':
   format: pem
   # Using PEM format:
@@ -59,9 +78,9 @@ ssl:
   # to 1024 bits (default: null):
   dhparam: null
 
-  # Listen on this HTTP port and redirect all requests to HTTPS.
+  # ++++++ For letsencrypt only ++++++
-  # Set to false to disable (default: 80):
+  domain: wiki.yourdomain.com
-  redirectNonSSLPort: 80
+  subscriberEmail: admin@example.com
 
 # ---------------------------------------------------------------------
 # Database Pool Options
@@ -95,7 +114,7 @@ logLevel: info
 uploads:
   # Maximum upload size in bytes per file (default: 5242880 (5 MB))
   maxFileSize: 5242880
-  # Maximum file uploads per request (default: 20)
+  # Maximum file uploads per request (default: 10)
   maxFiles: 10
 
 # ---------------------------------------------------------------------
@@ -109,5 +128,5 @@ offline: false
 # ---------------------------------------------------------------------
 # Data Path
 # ---------------------------------------------------------------------
-# Writeable data path for Wiki.js, mainly for cache and user uploads.
+# Writeable data path used for cache and temporary user uploads.
 dataPath: ./data

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.12~ynh2",
+    "version": "2.1.107~ynh1",
     "url": "https://wiki.js.org/",
     "license": "AGPL-3.0-or-later",
     "maintainer": {