From aa221698c8d641d41d5ff27e5889f028702e505c Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Sun, 6 Jun 2021 02:18:43 -0400
Subject: [PATCH] Docker: Explicitly default env var substitutions to null

---
 settings.json.docker | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/settings.json.docker b/settings.json.docker
index 9c99975cd..80becd3be 100644
--- a/settings.json.docker
+++ b/settings.json.docker
@@ -108,7 +108,7 @@
    * is used. If this is a relative path it is interpreted as relative to the
    * Etherpad root directory.
    */
-  "favicon": "${FAVICON}",
+  "favicon": "${FAVICON:null}",
 
   /*
    * Skin name.
@@ -205,12 +205,12 @@
 
   "dbType": "${DB_TYPE:dirty}",
   "dbSettings": {
-    "host":     "${DB_HOST}",
-    "port":     "${DB_PORT}",
-    "database": "${DB_NAME}",
-    "user":     "${DB_USER}",
-    "password": "${DB_PASS}",
-    "charset":  "${DB_CHARSET}",
+    "host":     "${DB_HOST:null}",
+    "port":     "${DB_PORT:null}",
+    "database": "${DB_NAME:null}",
+    "user":     "${DB_USER:null}",
+    "password": "${DB_PASS:null}",
+    "charset":  "${DB_CHARSET:null}",
     "filename": "${DB_FILENAME:var/dirty.db}"
   },
 
@@ -308,7 +308,7 @@
    * it to null disables Abiword and will only allow plain text and HTML
    * import/exports.
    */
-  "abiword": "${ABIWORD}",
+  "abiword": "${ABIWORD:null}",
 
   /*
    * This is the absolute path to the soffice executable.
@@ -316,7 +316,7 @@
    * LibreOffice can be used in lieu of Abiword to export pads.
    * Setting it to null disables LibreOffice exporting.
    */
-  "soffice": "${SOFFICE}",
+  "soffice": "${SOFFICE:null}",
 
   /*
    * Path to the Tidy executable.
@@ -324,7 +324,7 @@
    * Tidy is used to improve the quality of exported pads.
    * Setting it to null disables Tidy.
    */
-  "tidyHtml": "${TIDY_HTML}",
+  "tidyHtml": "${TIDY_HTML:null}",
 
   /*
    * Allow import of file types other than the supported ones:
@@ -454,13 +454,13 @@
     "admin": {
       // 1) "password" can be replaced with "hash" if you install ep_hash_auth
       // 2) please note that if password is null, the user will not be created
-      "password": "${ADMIN_PASSWORD}",
+      "password": "${ADMIN_PASSWORD:null}",
       "is_admin": true
     },
     "user": {
       // 1) "password" can be replaced with "hash" if you install ep_hash_auth
       // 2) please note that if password is null, the user will not be created
-      "password": "${USER_PASSWORD}",
+      "password": "${USER_PASSWORD:null}",
       "is_admin": false
     }
   },