Skip to content

Commit 988d0da

Browse files
tiredofittiredofit
committed
Release 24.04.8-2.1 - See CHANGELOG.md
1 parent 00f7d94 commit 988d0da

File tree

6 files changed

+48
-8
lines changed

6 files changed

+48
-8
lines changed

‎CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## 24.04.8-2.1 2024-10-16 <dave at tiredofit dot ca>
2+
3+
### Added
4+
- Add accessibility toggle
5+
- Add nss certificates path option
6+
- Add document signing toggle
7+
- Enable In APP config restart
8+
9+
### Changed
10+
- Fix issue with capabilities and child processes
11+
12+
113
## 24.04.8-2 2024-10-09 <dave at tiredofit dot ca>
214

315
### Added

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ RUN source /assets/functions/00-container && \
247247
chown -R cool /opt/* && \
248248
mkdir -p /var/cache/coolwsd && \
249249
chown -R cool /var/cache/coolwsd && \
250-
setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /opt/cool/bin/coolforkit && \
250+
setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /opt/cool/bin/coolforkit-caps && \
251251
setcap cap_sys_admin=ep /opt/cool/bin/coolmount && \
252252
mkdir -p /usr/share/hunspell && \
253253
mkdir -p /usr/share/hyphen && \

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2023 Dave Conroy
3+
Copyright (c) 2024 Dave Conroy
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ Be sure to view the following repositories to understand all the customizable op
142142
| `GROUP_DOWNLOAD_AS` | Group Download as Icons into dropdown in notebookbar view | `TRUE` |
143143
| `WATERMARK_OPACITY` | Watermark Opacity | `0.2` |
144144
| `WATERMARK_TEXT` | Text to display for watermark | `` |
145+
| `ENABLE_DOCUMENT_SIGNING` | Enable Document Signing Settings | `TRUE` |
145146
| `ENABLE_MACROS` | Enable Macros | `FALSE` |
146147
| `MACRO_SECURITY_LEVEL` | Macro Security Level `1` Medium `0` Low | `1` |
147148
| `ENABLE_METRICS_UNAUTHENTICATED` | Enable Unauthenticated Metrics | `FALSE` |
@@ -326,15 +327,18 @@ Don’t forget to add the according languages to the [`LANGUAGE`](#languages-for
326327
#### Other Settings
327328
| Parameter | Description | Default |
328329
| ------------------------------ | ----------------------------------------------------------------------------------------------------------------- | ------------- |
330+
| `CERTIFICATES_PATH` | Path to the NSS certificates that are available to all users | `` |
329331
| `CHILD_ROOT_PATH` | Child root path | `child-roots` |
332+
| `CONTENT_SECURITY_POLICY` | Content Security Policy | `` |
330333
| `DOCUMENT_SIGNING_URL` | Endpoint URL of signing server | `` |
334+
| `ENABLE_ACCESSIBILITY` | Enable Accessibility settings | `FALSE` |
331335
| `ENABLE_CAPABILITIES` | Enable Capabilities | `TRUE` |
332336
| `ENABLE_CONFIG_RELOAD` | Enable Reload of coolwsd if config changed in container | `TRUE` |
333337
| `ENABLE_EXPERIMENTAL_FEATURES` | Enable experimental features | `FALSE` |
334338
| `ENABLE_MOUNT_JAIL` | Enable mounting jails | `true` |
335339
| `ENABLE_SECCOMP` | Enable Seccomp | `TRUE` |
336340
| `FILE_SERVER_ROOT_PATH` | Path to directory considered as root | `browser/../` |
337-
| `FRAME_ANCESTORS` | Hosts where interface can be hosted in Iframe | `` |
341+
| `FRAME_ANCESTORS` | Hosts where interface can be hosted in IFrame *OBSOLETE* | `` |
338342
| `HEXIFY_EMBEDDED_URLS` | Hexify Embedded URLS (useful for Azure deployments) | `FALSE` |
339343
| `INDIRECTION_ENDPOINT` | URL endpoint to server which zervers routeToken in json format | |
340344
| `PDF_RESOLUTION_DPI` | PDF Resolution DPI when rendering PDF documents as image | `96` |

‎install/assets/defaults/10-coolwsd

+5
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,24 @@ ADMIN_JWT_EXPIRY=${ADMIN_JWT_EXPIRY:-"1800"}
44
ALWAYS_SAVE_ON_EXIT=${ALWAYS_SAVE_ON_EXIT:-"false"}
55
AUTO_SAVE=${AUTO_SAVE:-300}
66
BATCH_PRIORITY=${BATCH_PRIORITY:-"5"}
7+
CERTIFICATES_PATH=${CERTIFICATES_PATH:-""}
78
CHILD_ROOT_PATH=${CHILD_ROOT_PATH:-"child-roots"}
89
CLEANUP_BAD_BEHAVIOUR_TIME=${CLEANUP_BAD_BEHAVIOUR_TIME:-60}
910
CLEANUP_IDLE_TIME=${CLEANUP_IDLE_TIME:-300}
1011
CLEANUP_INTERVAL=${CLEANUP_INTERVAL:-"10000"}
1112
CLEANUP_LIMIT_CPU_PER=${CLEANUP_LIMIT_CPU_PER:-85}
1213
CLEANUP_LIMIT_DIRTY_MEMORY=${CLEANUP_LIMIT_DIRTY_MEMORY:-3072}
1314
CONNECTION_TIMEOUT=${CONNECTION_TIMEOUT:-30}
15+
CONTENT_SECURITY_POLICY=${CONTENT_SECURITY_POLICY:-""}
1416
DEEPL_API_URL=${DEEPL_API_URL:-""}
1517
DEEPL_AUTH_KEY=${DEEPL_AUTH_KEY:-""}
18+
ENABLE_ACCESSIBILITY=${ENABLE_ACCESSIBILITY:-"FALSE"}
1619
ENABLE_ADMIN_CONSOLE=${ENABLE_ADMIN_CONSOLE:-"TRUE"}
1720
ENABLE_CAPABILITIES=${ENABLE_CAPABILITIES:-"true"}
1821
ENABLE_CLEANUP=${ENABLE_CLEANUP:-"false"}
1922
ENABLE_CONFIG_RELOAD=${ENABLE_CONFIG_RELOAD:-"TRUE"}
2023
ENABLE_DEEPL=${ENABLE_DEEPL:-"FALSE"}
24+
ENABLE_DOCUMENT_SIGNING=${ENABLE_DOCUMENT_SIGNING:-"TRUE"}
2125
ENABLE_DOCUMENT_STATISTICS=${ENABLE_DOCUMENT_STATISTICS:-"FALSE"}
2226
ENABLE_EXPERIMENTAL_FEATURES=${ENABLE_EXPERIMENTAL_FEATURES:-"false"}
2327
ENABLE_FILES_QUARANTINE=${ENABLE_FILES_QUARANTINE:-"FALSE"}
@@ -84,6 +88,7 @@ PDF_RESOLUTION_DPI=${PDF_RESOLUTION_DPI:-"96"}
8488
PRESPAWN_CHILD_PROCESSES=${PRESPAWN_CHILD_PROCESSES:-1}
8589
REDLINING_AS_COMMENTS=${REDLINING_AS_COMMENTS:-"false"}
8690
REMOTE_FONT_URL=${REMOTE_FONT_URL:-""}
91+
RESTART_CONFIG_EDIT=${RESTART_CONFIG_EDIT:-"TRUE"}
8792
SETUP_TYPE=${SETUP_TYPE:-"AUTO"}
8893
SYS_TEMPLATE_PATH=${SYS_TEMPLATE_PATH:-"systemplate"}
8994
TLS_CA_FILENAME=${TLS_CA_FILENAME:-"ca-chain.cert.pem"}

‎install/etc/cont-init.d/10-coolwsd

+24-5
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,13 @@ fi
132132
if [ "${SETUP_TYPE,,}" = "auto" ]; then
133133
print_notice "Autogenerating Configuration File"
134134
### Replace Configuration directives
135-
sed -i -e "s|<allowed_languages \(.*\)>.*</allowed_languages>|<allowed_languages \1>${LANGUAGE}</allowed_languages>|g" /etc/coolwsd/coolwsd.xml
135+
sed -i \
136+
-e "s|<enable type=\"bool\" desc=\"Controls whether accessibility\"\(.*\)>.*</enable>|<enable type=\"bool\" desc=\"Controls whether accessibility\1>${ENABLE_ACCESSIBILITY,,}</enable>|" \
137+
/etc/coolwsd/coolwsd.xml
138+
139+
sed -i \
140+
-e "s|<allowed_languages \(.*\)>.*</allowed_languages>|<allowed_languages \1>${LANGUAGE}</allowed_languages>|g" \
141+
/etc/coolwsd/coolwsd.xml
136142

137143
## Language Tool
138144
sed -i \
@@ -152,10 +158,13 @@ if [ "${SETUP_TYPE,,}" = "auto" ]; then
152158
/etc/coolwsd/coolwsd.xml
153159

154160

155-
sed -i -e "s|<sys_template_path \(.*\)>.*</sys_template_path>|<sys_template_path \1>${SYS_TEMPLATE_PATH}</sys_template_path>|" /etc/coolwsd/coolwsd.xml
156-
sed -i -e "s|<child_root_path \(.*\)>.*</child_root_path>|<child_root_path \1>${CHILD_ROOT_PATH}</child_root_path>|" /etc/coolwsd/coolwsd.xml
157-
sed -i -e "s|<mount_jail_tree \(.*\)>.*</mount_jail_tree>|<mount_jail_tree \1>${ENABLE_MOUNT_JAIL,,}</mount_jail_tree>|" /etc/coolwsd/coolwsd.xml
158-
sed -i -e "s|<server_name \(.*\)>.*</server_name>|<server_name \1>${HOSTNAME}</server_name>|" /etc/coolwsd/coolwsd.xml
161+
sed -i \
162+
-e "s|<sys_template_path \(.*\)>.*</sys_template_path>|<sys_template_path \1>${SYS_TEMPLATE_PATH}</sys_template_path>|" \
163+
-e "s|<child_root_path \(.*\)>.*</child_root_path>|<child_root_path \1>${CHILD_ROOT_PATH}</child_root_path>|" \
164+
-e "s|<mount_jail_tree \(.*\)>.*</mount_jail_tree>|<mount_jail_tree \1>${ENABLE_MOUNT_JAIL,,}</mount_jail_tree>|" \
165+
/etc/coolwsd/coolwsd.xml
166+
167+
sed -i -e "s|<server_name \(.*\)>.*</server_name>|<server_name \1>${HOSTNAME}</server_name>|" /etc/coolwsd/coolwsd.xml
159168
sed -i -e "s|<file_server_root_path \(.*\)>.*</file_server_root_path>|<file_server_root_path \1>${FILE_SERVER_ROOT_PATH}</file_server_root_path>|" /etc/coolwsd/coolwsd.xml
160169
sed -i -e "s|<hexify_embedded_urls \(.*\)>.*<\/hexify_embedded_urls>|<hexify_embedded_urls \1>${HEXIFY_EMBEDDED_URLS,,}<\/hexify_embedded_urls>|" /etc/coolwsd/coolwsd.xml
161170
sed -i -e "s|<experimental_features \(.*\)>.*<\/experimental_features>|<experimental_features \1>${ENABLE_EXPERIMENTAL_FEATURES,,}<\/experimental_features>|" /etc/coolwsd/coolwsd.xml
@@ -245,6 +254,7 @@ if [ "${SETUP_TYPE,,}" = "auto" ]; then
245254
sed -i "/<alias_groups .*>/a \ <group><host desc=\"hostname to allow or deny.\" allow=\"true\">${host}</host></group>" /etc/coolwsd/coolwsd.xml
246255
done
247256
sed -i \
257+
-e "s|<content_security_policy \(.*\)>.*<\/content_security_policy>|<content_security_policy \1>${CONTENT_SECURITY_POLICY}<\/content_security_policy>|" \
248258
-e "s|<frame_ancestors \(.*\)>.*<\/frame_ancestors>|<frame_ancestors \1>${FRAME_ANCESTORS}<\/frame_ancestors>|" \
249259
-e "s|<connection_timeout \(.*\)>.*<\/connection_timeout>|<connection_timeout \1>${CONNECTION_TIMEOUT}<\/connection_timeout>|" \
250260
/etc/coolwsd/coolwsd.xml
@@ -276,6 +286,10 @@ if [ "${SETUP_TYPE,,}" = "auto" ]; then
276286
-e "s|<enable_metrics_unauthenticated \(.*\)>.*<\/enable_metrics_unauthenticated>|<enable_metrics_unauthenticated \1>${ENABLE_METRICS_UNAUTHENTICATED,,}<\/enable_metrics_unauthenticated>|" \
277287
/etc/coolwsd/coolwsd.xml
278288

289+
sed -i \
290+
-e "s|<database_path\(.*\)>.*<\/database_path>|<database_path \1>${CERTIFICATES_PATH}<\/database_path>|" \
291+
/etc/coolwsd/coolwsd.xml
292+
279293
## Watermark
280294
sed -i \
281295
-e "s|<opacity \(.*\)>.*<\/opacity>|<opacity \1>${WATERMARK_OPACITY}<\/opacity>|" \
@@ -309,6 +323,9 @@ if [ "${SETUP_TYPE,,}" = "auto" ]; then
309323
## Remote Config
310324
sed -i -e "s|<remote_url desc=\(.*\)>.*<\/remote_url>|<remote_url desc=\1>${REMOTE_URL}<\/remote_url>|" /etc/coolwsd/coolwsd.xml
311325

326+
## Stop and restart on Config Change
327+
sed -i -e "s|<stop_on_config_change desc=\(.*\)>.*<\/stop_on_config_change>|<stop_on_config_change desc=\1>${ENABLE_CONFIG_RELOAD,,}<\/stop_on_config_change>|" /etc/coolwsd/coolwsd.xml
328+
312329
## Remote Fonts
313330
sed -i -e "s|<url desc=\"URL of optional JSON\(.*\)>.*<\/url>|<url desc=\"URL of optional JSON\1>${REMOTE_FONT_URL}<\/url>|" /etc/coolwsd/coolwsd.xml
314331

@@ -336,6 +353,8 @@ if [ "${SETUP_TYPE,,}" = "auto" ]; then
336353
-e "s|<force .*=\"When enabled, all requests are redirected to WASM\(.*\)>.*<\/force>|<force desc=\"When enabled, all requests are redirected to WASM\1>${FORCE_WASM}<\/force>|" \
337354
/etc/coolwsd/coolwsd.xml
338355

356+
## Document Signing
357+
sed -i -e "s|<enable .*=\"Enable document signing\(.*\)>.*<\/enable>|<enable desc=\"Enable document signing\1>${ENABLE_DOCUMENT_SIGNING}<\/enable>|" /etc/coolwsd/coolwsd.xml
339358
fi
340359

341360
# Generate WOPI proof key

0 commit comments

Comments
 (0)