From 030ee6c9324ed6f8ddf0b61840062c2efcf72c8a Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Thu, 24 Sep 2020 00:49:51 +0200
Subject: [PATCH] Update website
---
modules/restserver/src/main/resources/reference.conf | 4 ++++
website/site/content/docs/configure/_index.md | 12 +++++++++---
website/site/content/docs/webapp/uploading.md | 5 +++++
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/modules/restserver/src/main/resources/reference.conf b/modules/restserver/src/main/resources/reference.conf
index 70a7062c..f3fd0278 100644
--- a/modules/restserver/src/main/resources/reference.conf
+++ b/modules/restserver/src/main/resources/reference.conf
@@ -9,6 +9,10 @@ docspell.server {
# This is the base URL this application is deployed to. This is used
# to create absolute URLs and to configure the cookie.
+ #
+ # If default is not changed, the HOST line of the login request is
+ # used instead or the value of the `X-Forwarded-For` header. If set
+ # to some other value, the request is not inspected.
base-url = "http://localhost:7880"
# Where the server binds to.
diff --git a/website/site/content/docs/configure/_index.md b/website/site/content/docs/configure/_index.md
index 24012418..93b4dacc 100644
--- a/website/site/content/docs/configure/_index.md
+++ b/website/site/content/docs/configure/_index.md
@@ -167,12 +167,18 @@ components. For a joex component, the url must be resolvable from a
REST server component. The REST server also uses this url to create
absolute urls and to configure the authenication cookie.
-By default it is build using the information from the `bind` setting.
+By default it is build using the information from the `bind` setting,
+which is `http://localhost:7880`.
+If the default is not changed, docspell will use the login request to
+determine the base-url. It first inspects the `X-Forwarded-For` header
+that is often used with reverse proxies. If that is not present, the
+`Host` header of the request is used. However, if the `base-url`
+setting is changed, then only this setting is used.
```
-docspell.server.baseurl = ...
-docspell.joex.baseurl = ...
+docspell.server.base-url = ...
+docspell.joex.base-url = ...
```
### Examples
diff --git a/website/site/content/docs/webapp/uploading.md b/website/site/content/docs/webapp/uploading.md
index a8f37381..37c44f46 100644
--- a/website/site/content/docs/webapp/uploading.md
+++ b/website/site/content/docs/webapp/uploading.md
@@ -152,6 +152,7 @@ structure:
{ multiple: Bool
, direction: Maybe String
, folder: Maybe String
+, skipDuplicates: Bool
}
```
@@ -169,6 +170,10 @@ be placed into this folder. Errors are logged (for example, the folder
may have been deleted before the task is executed) and the item is
then not put into any folder.
+The `skipDuplicates` is optional and set to `false` if not specified.
+It configures the processing task. If set to `true`, the processing
+task will skip all input files that are already present in docspell.
+
This kind of request is very common and most programming languages
have support for this. For example, here is another curl command
uploading two files with meta data: