From 9092dd5a870d506fcdf4295bc0a79b368180461f Mon Sep 17 00:00:00 2001 From: Dave Conroy Date: Wed, 26 Apr 2023 10:23:07 -0700 Subject: [PATCH] Add _FILE support --- README.md | 38 +++++++++++++++--------------- install/etc/cont-init.d/10-coolwsd | 9 ++++++- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 7392b3d..fdb8895 100644 --- a/README.md +++ b/README.md @@ -146,12 +146,12 @@ Be sure to view the following repositories to understand all the customizable op #### Administration -| Parameter | Description | Default | -| ---------------------- | --------------------------------------------- | ----------------- | -| `ENABLE_ADMIN_CONSOLE` | Enable Administration Console | `TRUE` | -| `ADMIN_USER` | User for accessing Administration Console | `admin` | -| `ADMIN_PASS` | Password for accessing Administration Console | `collaboraonline` | -| `ADMIN_JWT_EXPIRY` | Admin JWT Expiry in seconds | `1800` | +| Parameter | Description | Default | `_FILE` | +| ---------------------- | --------------------------------------------- | ----------------- | --- | +| `ENABLE_ADMIN_CONSOLE` | Enable Administration Console | `TRUE` | | +| `ADMIN_USER` | User for accessing Administration Console | `admin` | x | +| `ADMIN_PASS` | Password for accessing Administration Console | `collaboraonline` | x | +| `ADMIN_JWT_EXPIRY` | Admin JWT Expiry in seconds | `1800` | | #### Logging @@ -269,21 +269,21 @@ The image comes with English (US, GB, Canada variants) baked into the image, how | `FILES_QUARANTINE_EXPIRY` | Files expiry in minutes | `30` | #### DeepL Translation -| Parameter | Description | Default | -| ---------------- | -------------------------------- | ------- | -| `ENABLE_DEEPL` | Enable DeepL Translation Support | `FALSE` | -| `DEEPL_API_URL` | DeepL API URL | `` | -| `DEEPL_AUTH_KEY` | DeepL Auth Key | `` | +| Parameter | Description | Default | `_FILE` | +| ---------------- | -------------------------------- | ------- | --- | +| `ENABLE_DEEPL` | Enable DeepL Translation Support | `FALSE` || +| `DEEPL_API_URL` | DeepL API URL | `` | x | +| `DEEPL_AUTH_KEY` | DeepL Auth Key | `` | x | #### Language Tool -| Parameter | Description | Default | -| ----------------------------- | ------------------------------------------------------------------------ | ------- | -| `ENABLE_LANGUAGE_TOOL` | Enable Language Tool Grammar checking integration | `FALSE` | -| `LANGUAGE_TOOL_BASE_URL` | Base URL for Language Tool | | -| `LANGUAGE_TOOL_USER_NAME` | Language Tool User Name | | -| `LANGUAGE_TOOL_API_KEY` | Language Tool provided API Key | | -| `LANGUAGE_TOOL_REST_PROTOCOL` | REST protocol. blank for Language Tool `duden` for Duden Korrekturserver | | -| `LANGUAGE_TOOL_SSL_VERIFY` | SSL Verify | `TRUE` | +| Parameter | Description | Default | `_FILE` | +| ----------------------------- | ------------------------------------------------------------------------ | ------- | --- | +| `ENABLE_LANGUAGE_TOOL` | Enable Language Tool Grammar checking integration | `FALSE` | | +| `LANGUAGE_TOOL_BASE_URL` | Base URL for Language Tool | | x | +| `LANGUAGE_TOOL_USER_NAME` | Language Tool User Name | | x | +| `LANGUAGE_TOOL_API_KEY` | Language Tool provided API Key | | x| +| `LANGUAGE_TOOL_REST_PROTOCOL` | REST protocol. blank for Language Tool `duden` for Duden Korrekturserver | | | +| `LANGUAGE_TOOL_SSL_VERIFY` | SSL Verify | `TRUE` | | #### Zotero | Parameter | Description | Default | diff --git a/install/etc/cont-init.d/10-coolwsd b/install/etc/cont-init.d/10-coolwsd index d5e6cea..e550867 100755 --- a/install/etc/cont-init.d/10-coolwsd +++ b/install/etc/cont-init.d/10-coolwsd @@ -5,6 +5,14 @@ prepare_service single prepare_service 03-monitoring PROCESS_NAME="collabora-online" +transform_file_var \ + ADMIN_USER \ + ADMIN_PASS \ + DEEPL_API_URL \ + DEEPL_AUTH_KEY \ + LANGUAGE_TOOL_USER_NAME \ + LANGUAGE_TOOL_REST_PROTOCOL + sanity_var "ALLOWED_HOSTS" "Allowed Hostnames" print_debug "Creating directories and setting up logging" @@ -12,7 +20,6 @@ mkdir -p "${LOG_PATH}" touch "${LOG_PATH}"/"${LOG_FILE}" chown -R cool "${LOG_PATH}" - print_debug "Setting up DNS Resolution" rm /opt/cool/systemplate/etc/resolv.conf cp /etc/hosts /opt/cool/systemplate/etc/