From 016c4585fa71d8975a500755409e110f8e410597 Mon Sep 17 00:00:00 2001
From: Unrud <unrud@openaliasbox.org>
Date: Thu, 25 May 2017 19:58:22 +0200
Subject: [PATCH] WIP (add missing configuration options)

---
 configuration.md | 12 +++++++++++-
 proxy.md         |  5 +++--
 setup.md         |  7 ++++---
 wsgi.md          |  3 +++
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/configuration.md b/configuration.md
index 3f18a365..ac1f2180 100644
--- a/configuration.md
+++ b/configuration.md
@@ -62,13 +62,23 @@ Default: ``20``
 ### max_content_length
 The maximum size of the request body. (bytes)
 
-Default ``10000000``
+Default: ``10000000``
+
+### timeout
+Socket timeout. (seconds)
+
+Default: ``10``
 
 ### ssl
 Enable transport layer encryption.
 
 Default: ``False``
 
+### certificate
+Path of the SSL certifcate.
+
+Default: ``/etc/ssl/radicale.cert.pem``
+
 ### key
 Path to the private key for SSL. Only effective if ``ssl`` is enabled.
 
diff --git a/proxy.md b/proxy.md
index 3d617b77..82f74815 100644
--- a/proxy.md
+++ b/proxy.md
@@ -16,5 +16,6 @@ location /sub/folder/radicale {
 }
 ```
 
-Radicale's default configuration limits the maximum number of parallel
-connections!
+Be reminded that Radicale's default configuration enforces limits on the
+maximum number of parallel connections, the maximum file size and the rate of
+incorrect authentication attempts. Connections are terminated after a timeout.
diff --git a/setup.md b/setup.md
index f32985ce..7c61875e 100644
--- a/setup.md
+++ b/setup.md
@@ -82,14 +82,15 @@ filesystem_folder = /path/to/storage
 ## Limits
 
 Radicale enforces limits on the maximum number of parallel connections,
-the maximum file size (important for contacts with big photos) and limits
-the rate of incorrect authentication attempts. The default values should be
-fine for most scenarios.
+the maximum file size (important for contacts with big photos) and the rate of
+incorrect authentication attempts. Connections are terminated after a timeout.
+The default values should be fine for most scenarios.
 
 ```ini
 [server]
 max_connections = 20
 max_content_length = 10000000  # 1 Megabyte
+timeout = 10  # seconds
 [auth]
 delay = 1  # Average delay after failed login attempts in seconds
 ```
diff --git a/wsgi.md b/wsgi.md
index 76321a2d..fb6a3078 100644
--- a/wsgi.md
+++ b/wsgi.md
@@ -6,3 +6,6 @@ permalink: /wsgi/
 
 Radicale is compatible with the WSGI specification. No special configuration
 is required.
+
+Be reminded that Radicale's default configuration enforces limits on the
+maximum file size and that connections are terminated after a timeout.