container support for OVERPASS_ config

2 files changed, 28 insertions, 15 deletions

diff --git a/container/entrypoint b/container/entrypoint
index dcfe1fa..514252c 100644
--- a/container/entrypoint
+++ b/container/entrypoint
@@ -48,6 +48,16 @@ if [[ ! -f "$CONFIG" ]] ; then
         sed -i '/^email\.password =/c email.password = '"$EMAIL_PASSWORD" "$CONFIG"
     fi
 
+    if [[ -v OVERPASS_URL ]] ; then
+        sed -i '/^\[app:main\]/a overpass.url = '"$OVERPASS_URL" "$CONFIG"
+    fi
+    if [[ -v OVERPASS_BASIC_AUTH_USERNAME ]] ; then
+        sed -i '/^\[app:main\]/a overpass.basic_auth.username = '"$OVERPASS_BASIC_AUTH_USERNAME" "$CONFIG"
+    fi
+    if [[ -v OVERPASS_BASIC_AUTH_PASSWORD ]] ; then
+        sed -i '/^\[app:main\]/a overpass.basic_auth.password = '"$OVERPASS_BASIC_AUTH_PASSWORD" "$CONFIG"
+    fi
+
     if [[ -v LOGLEVEL ]] ; then
         # We are only changing the fietsboek log level here, as SQLAlchemy
         # produces a lot of noise.
diff --git a/doc/administration/docker.rst b/doc/administration/docker.rst
index ed44a05..b5df268 100644
--- a/doc/administration/docker.rst
+++ b/doc/administration/docker.rst
@@ -68,21 +68,24 @@ the options that diverge from the default values::
 
 The following environment variables are supported:
 
-=============================== ===============================
-Environment variable            Setting
-=============================== ===============================
-``REDIS_URL`` [#f1]_            ``redis.url``
-``SQLALCHEMY_URL``              ``sqlalchemy.url``
-``DATA_DIR``                    ``fietsboek.data_dir``
-``SESSION_KEY`` [#f2]_          ``session_key``
-``ENABLE_ACCOUNT_REGISTRATION`` ``enable_account_registration``
-``DEFAULT_LOCALE_NAME``         ``pyramid.default_locale_name``
-``EMAIL_FROM``                  ``email.from``
-``EMAIL_SMTP_URL``              ``email.smtp_url``
-``EMAIL_USERNAME``              ``email.username``
-``EMAIL_PASSWORD``              ``email.password``
-``LOGLEVEL``                    ``[logger_fietsboek] level``
-=============================== ===============================
+================================ ================================
+Environment variable             Setting
+================================ ================================
+``REDIS_URL`` [#f1]_             ``redis.url``
+``SQLALCHEMY_URL``               ``sqlalchemy.url``
+``DATA_DIR``                     ``fietsboek.data_dir``
+``SESSION_KEY`` [#f2]_           ``session_key``
+``ENABLE_ACCOUNT_REGISTRATION``  ``enable_account_registration``
+``DEFAULT_LOCALE_NAME``          ``pyramid.default_locale_name``
+``EMAIL_FROM``                   ``email.from``
+``EMAIL_SMTP_URL``               ``email.smtp_url``
+``EMAIL_USERNAME``               ``email.username``
+``EMAIL_PASSWORD``               ``email.password``
+``OVERPASS_URL``                 ``overpass.url``
+``OVERPASS_BASIC_AUTH_USERNAME`` ``overpass.basic_auth.username``
+``OVERPASS_BASIC_AUTH_PASSWORD`` ``overpass.basic_auth.password``
+``LOGLEVEL``                     ``[logger_fietsboek] level``
+================================ ================================
 
 .. [#f1] Required.
 .. [#f2] Defaults to a random string.