public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Docker: Explicitly default env var substitutions to null

pull/5051/head
Richard Hansen 2021-06-06 02:18:43 -04:00
parent c7bb18c6da
commit aa221698c8
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
settings.json.docker
View File

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