summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authordrebs <drebs@riseup.net>2017-11-19 18:32:50 -0200
committerdrebs <drebs@riseup.net>2017-11-19 20:10:00 -0200
commit0844dc3a1a15f60757a680c819cad686b5724bf4 (patch)
treeceb3bbf8e461edeca9d632440590323909e69407 /docs
parent70cd9349faad311d645157f1961f63e030998a57 (diff)
[feature] allow setting couchdb url from environment
Diffstat (limited to 'docs')
-rw-r--r--docs/man/soledad-server.1.rst3
-rw-r--r--docs/reference/environment_variables.rst1
2 files changed, 4 insertions, 0 deletions
diff --git a/docs/man/soledad-server.1.rst b/docs/man/soledad-server.1.rst
index 3d37a8d2..e40e9a63 100644
--- a/docs/man/soledad-server.1.rst
+++ b/docs/man/soledad-server.1.rst
@@ -61,6 +61,9 @@ SOLEDAD_SERVER_CONFIG_FILE
Load configuration from this file instead of using the default one
(*/etc/soledad/soledad-server.conf*).
+SOLEDAD_COUCH_URL
+ If set, use this URL for accessing couchdb (overrides the configuration file).
+
SOLEDAD_HTTP_PERSIST
If set, persist HTTP connections.
diff --git a/docs/reference/environment_variables.rst b/docs/reference/environment_variables.rst
index bfd155ee..321c925c 100644
--- a/docs/reference/environment_variables.rst
+++ b/docs/reference/environment_variables.rst
@@ -6,6 +6,7 @@ Some environment variables affect the behaviour of Soledad:
============================== =============== =================================
variable affects description
============================== =============== =================================
+``SOLEDAD_COUCH_URL`` server override the CouchDB url.
``SOLEDAD_HTTP_PERSIST`` client persist HTTP connections.
``SOLEDAD_USE_PYTHON_LOGGING`` client / server use python logging instead of
twisted's logger.