diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a84f26..1a28fa0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## 2.4.0 2022-04-07 + + ### Added + - Collabora Online cp-22.05.0-1 + - LibreOffice Core cp-22.05.0-1 + + ### Changed + - Changed how ALLOWED_HOSTS works - may require https://url, instead of Regex + - Changed Idle Timeout from 15 minutes to 1 hour + ## 2.3.6 2022-03-22 ### Added @@ -149,7 +159,7 @@ ### Changed - Max Open Documents to 100000 (from 5000) - Max Users to 100000 (from 5000) - + ## 2.0.2 2021-03-24 diff --git a/Dockerfile b/Dockerfile index 8daacad..36d0ffd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,11 +14,11 @@ ARG APP_NAME ### Environment Variables ENV COLLABORA_ONLINE_BRANCH=${COLLABORA_ONLINE_BRANCH:-"master"} \ - COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-21.11.3-2"} \ + COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-22.05.0-1"} \ COLLABORA_ONLINE_REPO_URL=${COLLABORA_ONLINE_REPO_URL:-"https://github.com/CollaboraOnline/online"} \ # LIBREOFFICE_BRANCH=${LIBREOFFICE_BRANCH:-"master"} \ - LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-21.06.22-1"} \ + LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-22.05.0-1"} \ LIBREOFFICE_REPO_URL=${LIBREOFFICE_REPO_URL:-"https://github.com/LibreOffice/core"} \ # APP_NAME=${APP_NAME:-"Document Editor"} \ diff --git a/README.md b/README.md index 81a54ac..8366ac6 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,8 @@ The following image tags are available along with their taged release based on w | LibreOffice version | Collabora Online version | Tag | | ------------------- | ------------------------ | -------- | -| `2021` | `21.11.0` | `latest` | +| `2022` | `22.05.x` | `latest` | +| `2022` | `22.05.x` | `2.4.0` | | `2021` | `21.11.0` | `2.3.0` | | `6.4.x` | `6.4.x` | `2.1` | | `6.4.x` | `6.4.x` | `2.0` | @@ -258,7 +259,6 @@ The image comes with English (US, GB, Canada variants) baked into the image, how #### Other Settings | Parameter | Description | Default | | ----------------------- | ------------------------------------------------------- | --------------- | -| `ALLOW_172_XX_SUBNET` | Allow 172.16.0.0/12 Subnet | `TRUE` | | `ENABLE_CAPABILITIES` | Enable Capabilities | `TRUE` | | `ENABLE_CONFIG_RELOAD` | Enable Reload of coolwsd if config changed in container | `TRUE` | | `ENABLE_SECCOMP` | Enable Seccomp | `TRUE` | diff --git a/install/assets/defaults/10-coolwsd b/install/assets/defaults/10-coolwsd index 1274fd0..338f36f 100755 --- a/install/assets/defaults/10-coolwsd +++ b/install/assets/defaults/10-coolwsd @@ -1,7 +1,6 @@ #!/usr/bin/with-contenv bash ADMIN_JWT_EXPIRY=${ADMIN_JWT_EXPIRY:-"1800"} -ALLOW_172_XX_SUBNET=${ALLOW_172_XX_SUBNET:-"TRUE"} ALWAYS_SAVE_ON_EXIT=${ALWAYS_SAVE_ON_EXIT:-"false"} AUTO_SAVE=${AUTO_SAVE:-300} BATCH_PRIORITY=${BATCH_PRIORITY:-"5"} @@ -60,6 +59,6 @@ TLS_CA_FILENAME=${TLS_CA_FILENAME:-"ca-chain.cert.pem"} TLS_CERT_FILENAME=${TLS_CERT_FILENAME:-"cert.pem"} TLS_CERT_PATH=${TLS_CERT_PATH:-"/etc/coolwsd/certs"} TLS_KEY_FILENAME=${TLS_KEY_FILENAME:-"key.pem"} -USER_IDLE_TIMEOUT=${USER_IDLE_TIMEOUT:-900} +USER_IDLE_TIMEOUT=${USER_IDLE_TIMEOUT:-3600} USER_OUT_OF_FOCUS_TIMEOUT=${USER_OUT_OF_FOCUS_TIMEOUT:-60} -WATERMARK_OPACITY=${WATERMARK_OPACITY:-"0.2"} \ No newline at end of file +WATERMARK_OPACITY=${WATERMARK_OPACITY:-"0.2"} diff --git a/install/etc/cont-init.d/10-coolwsd b/install/etc/cont-init.d/10-coolwsd index 38fdd7f..16c1b13 100755 --- a/install/etc/cont-init.d/10-coolwsd +++ b/install/etc/cont-init.d/10-coolwsd @@ -57,6 +57,8 @@ if [ -n "${DICTIONARIES}" ]; then silent apt-get clean rm -rf /var/lib/apt/lists/* chown -R cool. /opt/libreoffice/share/extensions/* + rm -rf /opt/cool/systemplate/* + silent sudo -u cool /opt/cool/bin/coolwsd-systemplate-setup /opt/cool/systemplate /opt/libreoffice fi ### Custom File Support @@ -83,7 +85,7 @@ if [ -d /assets/custom-fonts/ ] ; then chmod +rx /assets/custom-fonts ln -s /assets/custom-fonts /usr/share/fonts/truetype/custom silent fc-cache -f -v - rm -rf /opt/cool/systemplate + rm -rf /opt/cool/systemplate/* silent sudo -u cool /opt/cool/bin/coolwsd-systemplate-setup /opt/cool/systemplate /opt/libreoffice fi @@ -117,14 +119,14 @@ if var_true "${ENABLE_TLS}" ; then rm -rf /tmp/ssl chown -R cool "${TLS_CERT_PATH}" else - if [ ! -f "${TLS_CERT_PATH}/${TLS_KEY_FILENAME}" ] || [ ! -f "${TLS_CERT_PATH}/${TLS_CA_FILENAME}" ] || [ ! -f "${TLS_CERT_PATH}/${TLS_CERT_FILENAME}" ] ; then + if [ ! -f "${TLS_CERT_PATH}"/"${TLS_KEY_FILENAME}" ] || [ ! -f "${TLS_CERT_PATH}"/"${TLS_CA_FILENAME}" ] || [ ! -f "${TLS_CERT_PATH}"/"${TLS_CERT_FILENAME}" ] ; then print_error "TLS Certificates missing... Please switch to autogenerate mode, or place your certifcates in the correct location." fi fi fi fi -if [ "$SETUP_TYPE" = "AUTO" ]; then +if [ "${SETUP_TYPE,,}" = "auto" ]; then print_notice "Autogenerating Configuration File" ### Replace Configuration directives sed -i -e "s|.*|${LANGUAGE}|g" /etc/coolwsd/coolwsd.xml @@ -200,7 +202,7 @@ if [ "$SETUP_TYPE" = "AUTO" ]; then sed -i -e "s|.*<\/anonymization_salt>|${LOG_ANONYMIZE_SALT}<\/anonymization_salt>|" /etc/coolwsd/coolwsd.xml fi - if [ "$LOG_TYPE" = "FILE" ]; then + if [ "${LOG_TYPE,,}" = "file" ]; then sed -i -e "s|.*<\/property>|${LOG_PATH}/${LOG_FILE}<\/property>|" /etc/coolwsd/coolwsd.xml sed -i -e "s|.*<\/property>|${LOG_FILE_FLUSH}<\/property>|" /etc/coolwsd/coolwsd.xml @@ -212,19 +214,12 @@ if [ "$SETUP_TYPE" = "AUTO" ]; then fi ### Allowed Hosts + sed -i -e 's|||' /etc/coolwsd/coolwsd.xml allowed_hosts=$(echo "${ALLOWED_HOSTS}" | tr "," "\n") - for host in $allowed_hosts - do + for host in $allowed_hosts; do print_info "Adding Allowed Host: ${host}" - sed -i "/>localhost<\/host>/a \ \ \ \ \ \ \ \ \ \ \ \ \${host}" /etc/coolwsd/coolwsd.xml + sed -i "//a \ ${host}" /etc/coolwsd/coolwsd.xml done - - if var_true "${ALLOW_172_XX_SUBNET}" ; then - print_debug "Allowing 172.16.0.0/12 Subnet" - sed -i "/<\/post_allow>/i \ \ \ \ \ \ \ \ 172\\.1\[6789\]\.\[0-9\]\{1,3\}\.\[0-9\]\{1,3\}<\/host>" /etc/coolwsd/coolwsd.xml - sed -i "/<\/post_allow>/i \ \ \ \ \ \ \ \ 172\\.2\[0-9\]\\.\[0-9\]\{1,3\}\\.\[0-9\]\{1,3\}<\/host>" /etc/coolwsd/coolwsd.xml - sed -i "/<\/post_allow>/i \ \ \ \ \ \ \ \ 172\\.3\[01\]\\.\[0-9\]\{1,3\}\\.\[0-9\]\{1,3\}<\/host>" /etc/coolwsd/coolwsd.xml - fi fi # Generate WOPI proof key