Release 24.04.4-4.1 - See CHANGELOG.md

tiredofit · Jul 11, 2024 · 5e3fa41 · 5e3fa41
1 parent 04127a9
commit 5e3fa41
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 233 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## 24.04.4-4.1 2024-07-10 <dave at tiredofit dot ca>
+
+   ### Added
+      - Add ENABLE_OVERWRITE_MODE environment variable
+      - Add HELP_URL environment variable
+      - Add ENABLE_WASM and FORCE_WASM support
+
+   ### Changed
+      - Rework TLS configuration due to changes in upstream configuration requirements
+      - Change INTERFACE environment defaults from notebookbar to tabbed
+
+
 ## 24.04.4-4 2024-07-10 <dave at tiredofit dot ca>
 
    ### Added

diff --git a/Dockerfile.alpine b/Dockerfile.alpine
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ This will build a Docker image for [Collabora Online](https://www.collaboraoffic
     - [General Usage](#general-usage)
     - [Administration](#administration)
     - [Logging](#logging)
-    - [Language](#languages-for-writing-aids-spell-checker-grammar-checker-thesaurus-hyphenation)
+    - [Languages for writing aids (spell checker, grammar checker, thesaurus, hyphenation)](#languages-for-writing-aids-spell-checker-grammar-checker-thesaurus-hyphenation)
     - [Spell Check](#spell-check)
     - [TLS Settings](#tls-settings)
     - [Performance and Limits](#performance-and-limits)
@@ -133,20 +133,22 @@ Be sure to view the following repositories to understand all the customizable op
 | [OS Base](https://github.com/tiredofit/docker-debian/) | Customized Image based on Debian Linux |
 
 #### General Usage
-| Parameter                        | Description                                                                                                                | Default       |
-| -------------------------------- | -------------------------------------------------------------------------------------------------------------------------- | ------------- |
-| `SETUP_TYPE`                     | Automatically generate configuration with defaults. Set to `MANUAL` and map the configuration file to use your own         | `AUTO`        |
-| `ALLOWED_HOSTS`                  | Set which domains which can access service Seperate Multiple with `,` - Example: `https://www.example\.org` (no wildcards) | ``            |
-| `EXTRA_OPTIONS`                  | If you want to pass additional arguments upon startup, add it here                                                         | ``            |
-| `INTERFACE`                      | Web interface type `classic` or `notebookbar`                                                                              | `notebookbar` |
-| `GROUP_DOWNLOAD_AS`              | Group Download as Icons into dropdown in notebookbar view                                                                  | `TRUE`        |
-| `WATERMARK_OPACITY`              | Watermark Opacity                                                                                                          | `0.2`         |
-| `WATERMARK_TEXT`                 | Text to display for watermark                                                                                              | ``            |
-| `ENABLE_MACROS`                  | Enable Macros                                                                                                              | `FALSE`       |
-| `MACRO_SECURITY_LEVEL`           | Macro Security Level `1` Medium `0` Low                                                                                    | `1`           |
-| `ENABLE_METRICS_UNAUTHENTICATED` | Enable Unauthenticated Metrics                                                                                             | `FALSE`       |
-| `ENABLE_HOME_MODE`               | Enable more features with home mode                                                                                        | `FALSE`       |
-
+| Parameter                        | Description                                                                                                                | Default  |
+| -------------------------------- | -------------------------------------------------------------------------------------------------------------------------- | -------- |
+| `SETUP_TYPE`                     | Automatically generate configuration with defaults. Set to `MANUAL` and map the configuration file to use your own         | `AUTO`   |
+| `ALLOWED_HOSTS`                  | Set which domains which can access service Seperate Multiple with `,` - Example: `https://www.example\.org` (no wildcards) | ``       |
+| `EXTRA_OPTIONS`                  | If you want to pass additional arguments upon startup, add it here                                                         | ``       |
+| `INTERFACE`                      | Web interface type `compact` `tabbed`                                                                                      | `tabbed` |
+| `GROUP_DOWNLOAD_AS`              | Group Download as Icons into dropdown in notebookbar view                                                                  | `TRUE`   |
+| `WATERMARK_OPACITY`              | Watermark Opacity                                                                                                          | `0.2`    |
+| `WATERMARK_TEXT`                 | Text to display for watermark                                                                                              | ``       |
+| `ENABLE_MACROS`                  | Enable Macros                                                                                                              | `FALSE`  |
+| `MACRO_SECURITY_LEVEL`           | Macro Security Level `1` Medium `0` Low                                                                                    | `1`      |
+| `ENABLE_METRICS_UNAUTHENTICATED` | Enable Unauthenticated Metrics                                                                                             | `FALSE`  |
+| `ENABLE_HOME_MODE`               | Enable more features with home mode                                                                                        | `FALSE`  |
+| `ENABLE_OVERWRITE_MODE`          | Enable overwrite mode (user can use the insert key)                                                                        | `TRUE`   |
+| `ENABLE_WASM`                    | Enable WASM support                                                                                                        | `TRUE`   |
+| `FORCE_WASM`                     | Force all requests to WASM                                                                                                 | `FALSE`  |
 
 #### Administration
 | Parameter              | Description                                   | Default           | `_FILE` |
@@ -181,11 +183,11 @@ Be sure to view the following repositories to understand all the customizable op
 The image comes with English (US, GB variants) baked into the image, however upon container startup you can add more languages via environment variables.
 Add multiple languages by seperating with a space.
 
-| Parameter      | Value   | Description                |
-| -------------- | ------- | -------------------------- |
-| `LANGUAGE`     | `en_GB` | English (Great Britain)    |
-|                | `en_US` | English (US)               |
-|                | `fr_FR` | French (France)            |
+| Parameter  | Value   | Description             |
+| ---------- | ------- | ----------------------- |
+| `LANGUAGE` | `en_GB` | English (Great Britain) |
+|            | `en_US` | English (US)            |
+|            | `fr_FR` | French (France)         |
 
 The above table is just a sample of valid values.
 

diff --git a/install/assets/defaults/10-coolwsd b/install/assets/defaults/10-coolwsd
@@ -26,26 +26,30 @@ ENABLE_LANGUAGE_TOOL=${ENABLE_LANGUAGE_TOOL:-"FALSE"}
 ENABLE_MACROS=${ENABLE_MACROS:-"FALSE"}
 ENABLE_METRICS_UNAUTHENTICATED=${ENABLE_METRICS_UNAUTHENTICATED:-"FALSE"}
 ENABLE_MOUNT_JAIL=${ENABLE_MOUNT_JAIL:-"true"}
+ENABLE_OVERWRITE_MODE=${ENABLE_OVERWRITE_MODE:-"TRUE"}
 ENABLE_SECCOMP=${ENABLE_SECCOMP:-"true"}
 ENABLE_TILES_CACHE=${ENABLE_TILES_CACHE:-"TRUE"}
 ENABLE_TLS=${ENABLE_TLS:-"FALSE"}
 ENABLE_TLS_CERT_GENERATE=${ENABLE_TLS_CERT_GENERATE:-"TRUE"}
 ENABLE_TLS_REVERSE_PROXY=${ENABLE_TLS_REVERSE_PROXY:-"TRUE"}
 ENABLE_USER_STATISTICS=${ENABLE_USER_STATISTICS:-"FALSE"}
+ENABLE_WASM=${ENABLE_WASM:-"TRUE"}
 ENABLE_ZOTERO=${ENABLE_ZOTERO:-"TRUE"}
 FILES_QUARANTINE_DIRECTORY_SIZE_LIMIT=${FILES_QUARANTINE_DIRECTORY_SIZE_LIMIT:-"250"}
-FILES_QUARANTINE_EXPIRY=${FILES_QUARANTINE_EXPIRY:-"30"}
-FILES_QUARANTINE_MAX_VERSIONS=${FILES_QUARANTINE_MAX_VERSIONS:-"2"}
+FILES_QUARANTINE_EXPIRY=${FILES_QUARANTINE_EXPIRY:-"3000"}
+FILES_QUARANTINE_MAX_VERSIONS=${FILES_QUARANTINE_MAX_VERSIONS:-"5"}
 FILES_QUARANTINE_PATH=${FILES_QUARANTINE_PATH:-"quarantine"}
 FILE_SERVER_ROOT_PATH=${FILE_SERVER_ROOT_PATH:-"browser/../"}
 FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-0}
 FONTS_MISSING_ACTION=${FONTS_MISSING_ACTION:-"log"}
+FORCE_WASM=${FORCE_WASM:-"FALSE"}
 GROUP_DOWNLOAD_AS=${GROUP_DOWNLOAD_AS:-"TRUE"}
+HELP_URL=${HELP_URL:-"https://help.collaboraoffice.com/help.html?"}
 HEXIFY_EMBEDDED_URLS=${HEXIFY_EMBEDDED_URLS:-"FALSE"}
 IDLE_SAVE=${IDLE_SAVE:-30}
 IDLE_UNLOAD_TIMEOUT=${IDLE_UNLOAD_TIMEOUT:-3600}
 INDIRECTION_ENDPOINT=${INDIRECTION_ENDPOINT:-""}
-INTERFACE=${INTERFACE:-"notebookbar"}
+INTERFACE=${INTERFACE:-"tabbed"}
 LANGUAGE=${LANGUAGE:-'en_GB en_US'}
 LANGUAGE_TOOL_API_KEY=${LANGUAGE_TOOL_API_KEY:-""}
 LANGUAGE_TOOL_BASE_URL=${LANGUAGE_TOOL_BASE_URL:-""}