Merge branch 'spantaleev:master' into fixgradle

This commit is contained in:
drelephant 2022-11-06 00:39:42 +11:00 committed by GitHub
commit 5642586820
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View File

@ -58,6 +58,8 @@ matrix_etherpad_database_connection_string: 'postgres://{{ matrix_etherpad_datab
# Variables configuring the etherpad # Variables configuring the etherpad
matrix_etherpad_title: 'Etherpad' matrix_etherpad_title: 'Etherpad'
matrix_etherpad_abiword: null
matrix_etherpad_soffice: null
matrix_etherpad_default_pad_text: | matrix_etherpad_default_pad_text: |
Welcome to Etherpad! Welcome to Etherpad!

View File

@ -20,8 +20,8 @@
"editOnly": false, "editOnly": false,
"minify": true, "minify": true,
"maxAge": 21600, "maxAge": 21600,
"abiword": null, "abiword": {{ matrix_etherpad_abiword|to_json }},
"soffice": null, "soffice": {{ matrix_etherpad_soffice|to_json }},
"tidyHtml": null, "tidyHtml": null,
"allowUnknownFileEnds": true, "allowUnknownFileEnds": true,
"requireAuthentication": false, "requireAuthentication": false,
@ -103,7 +103,7 @@
"pageUp": true, "pageUp": true,
"pageDown": true "pageDown": true
}, },
"loglevel": "INFO", "loglevel": "WARN",
"logconfig" : "logconfig" :
{ "appenders": [ { "appenders": [
{ "type": "console", { "type": "console",