Release 1.6.0 - See CHANGELOG.md

2024-06-20 06:25:23 +02:00 · 2020-01-13 14:37:48 -08:00 · 2020-01-13 14:37:48 -08:00 · 66f9d1c592
parent 7178960622
commit 66f9d1c592
5 changed files with 93 additions and 52 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,9 @@
+## 1.6.0 2020-01-12 <dave at tiredofit dot ca>
+
+   ### Added
+      - Update to support new tiredofit/debian base image
+
+
 ## 1.5 2019-07-16 <dave at tiredofit dot ca>

 * Added more environment variables
--- a/examples/docker-compose.yml
+++ b/examples/docker-compose.yml
@ -0,0 +1,47 @@
+version: '3.7'
+services:
+
+  libreoffice-app:
+    image: tiredofit/libreoffice-online
+    container_name: libreoffice-app
+    expose:
+      - 9980
+    cap_add:
+      - MKNOD
+    labels:
+    - traefik.enable=true
+    - traefik.frontend.rule=Host:libreoffice.example.com
+    - traefik.port=9980
+    - traefik.protocol=http
+    - traefik.docker.network=proxy
+    - traefik.backend=libreoffice-app
+    environment:
+      - VIRTUAL_HOST=libreoffice.example.com
+      - VIRTUAL_NETWORK=proxy
+      - VIRTUAL_PORT=9980
+      - VIRTUAL_PROTO=https
+      - LETSENCRYPT_HOST=libreoffice.example.com
+      - LETSENCRYPT_EMAIL=techsupport@example.com
+ 
+      - ZABBIX_HOSTNAME=libreoffice-app
+      
+      - ADMIN_USER=admin
+      - ADMIN_PASS=libreoffice
+      - ALLOWED_HOSTS=allowedhostname.example.com
+      - DICTIONARIES="en_GB en_US"
+      - LOG_LEVEL=warning
+    networks:
+    - proxy
+    - internal
+    - services
+    restart: always
+
+networks:
+  proxy:
+    external: true
+  internal:
+    external: false
+  services:
+    external: true
+
+
--- a/install/assets/functions/10-loolwsd
+++ b/install/assets/functions/10-loolwsd
@ -0,0 +1,29 @@
+#!/usr/bin/with-contenv bash
+
+### Set Defaults
+AUTO_SAVE=${AUTO_SAVE:-300}
+ENABLE_ADMIN_CONSOLE=${ENABLE_ADMIN_CONSOLE:-"TRUE"}
+ENABLE_TLS=${ENABLE_SSL:-"TRUE"}
+ENABLE_TLS_CERT_GENERATE=${ENABLE_SSL_CERT_GENERATE:-"TRUE"}
+ENABLE_TLS_REVERSE_PROXY=${ENABLE_SSL_REVERSE_PROXY:-"FALSE"}
+FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-0}
+IDLE_SAVE=${IDLE_SAVE:-30}
+IDLE_UNLOAD_TIMEOUT=${IDLE_UNLOAD_TIMEOUT:-3600}
+LOG_ANONYMIZE_FILES=${LOG_ANONYMIZE_FILES:-"FALSE"}
+LOG_ANONYMIZE_USERS=${LOG_ANONYMIZE_USERS:-"FALSE"}
+LOG_LEVEL=${LOG_LEVEL:-"information"}
+LOG_TYPE=${LOG_TYPE:-"CONSOLE"}
+MAX_FILE_LOAD_LIMIT=${MAX_FILE_LOAD_LIMIT:-100}
+MAX_OPEN_FILES=${MAX_OPEN_FILES:-0}
+MAX_THREADS_DOCUMENT=${MAX_THREADS_DOCUMENT:-4}
+MEMORY_DATA_LIMIT=${MEMORY_DATA_LIMIT:-0}
+MEMORY_STACK_LIMIT=${MEMORY_STACK_LIMIT:-8000}
+MEMORY_USAGE_MAX=${MEMORY_USAGE_MAX:-"80.0"}
+PRESPAWN_CHILD_PROCESSES=${PRESPAWN_CHILD_PROCESSES:-1}
+SETUP_TYPE=${SETUP_TYPE:-"AUTO"}
+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/loolwsd/certs"}
+TLS_KEY_FILENAME=${TLS_KEY_FILENAME:-"key.pem"}
+USER_IDLE_TIMEOUT=${USER_IDLE_TIMEOUT:-900}
+USER_OUT_OF_FOCUS_TIMEOUT=${USER_OUT_OF_FOCUS_TIMEOUT:-60}
--- a/install/etc/cont-init.d/10-loolwsd
+++ b/install/etc/cont-init.d/10-loolwsd
@ -1,37 +1,7 @@
 #!/usr/bin/with-contenv bash

-### Set Debug Mode
-if [ "$DEBUG_MODE" = "TRUE" ] || [ "$DEBUG_MODE" = "true" ]; then
-    set -x
-fi
-
-### Set Defaults
-AUTO_SAVE=${AUTO_SAVE:-300}
-ENABLE_ADMIN_CONSOLE=${ENABLE_ADMIN_CONSOLE:-"TRUE"}
-ENABLE_TLS=${ENABLE_SSL:-"TRUE"}
-ENABLE_TLS_CERT_GENERATE=${ENABLE_SSL_CERT_GENERATE:-"TRUE"}
-ENABLE_TLS_REVERSE_PROXY=${ENABLE_SSL_REVERSE_PROXY:-"FALSE"}
-FILE_SIZE_LIMIT=${FILE_SIZE_LIMIT:-0}
-IDLE_SAVE=${IDLE_SAVE:-30}
-IDLE_UNLOAD_TIMEOUT=${IDLE_UNLOAD_TIMEOUT:-3600}
-LOG_ANONYMIZE_FILES=${LOG_ANONYMIZE_FILES:-"FALSE"}
-LOG_ANONYMIZE_USERS=${LOG_ANONYMIZE_USERS:-"FALSE"}
-LOG_LEVEL=${LOG_LEVEL:-"information"}
-LOG_TYPE=${LOG_TYPE:-"CONSOLE"}
-MAX_FILE_LOAD_LIMIT=${MAX_FILE_LOAD_LIMIT:-100}
-MAX_OPEN_FILES=${MAX_OPEN_FILES:-0}
-MAX_THREADS_DOCUMENT=${MAX_THREADS_DOCUMENT:-4}
-MEMORY_DATA_LIMIT=${MEMORY_DATA_LIMIT:-0}
-MEMORY_STACK_LIMIT=${MEMORY_STACK_LIMIT:-8000}
-MEMORY_USAGE_MAX=${MEMORY_USAGE_MAX:-"80.0"}
-PRESPAWN_CHILD_PROCESSES=${PRESPAWN_CHILD_PROCESSES:-1}
-SETUP_TYPE=${SETUP_TYPE:-"AUTO"}
-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/loolwsd/certs"}
-TLS_KEY_FILENAME=${TLS_KEY_FILENAME:-"key.pem"}
-USER_IDLE_TIMEOUT=${USER_IDLE_TIMEOUT:-900}
-USER_OUT_OF_FOCUS_TIMEOUT=${USER_OUT_OF_FOCUS_TIMEOUT:-60}
+for s in /assets/functions/*; do source $s; done
+PROCESS_NAME="libreoffice-online"

 mkdir -p /var/log/lool
 touch /var/log/lool/loolwsd.log
@ -42,7 +12,7 @@ ln -s /etc/resolv.conf /opt/lool/systemplate/etc/resolv.conf

 ### Custom File Support
 if [ -d /assets/custom ] ; then
-	echo "** [libreoffice-online] Custom Files Found, Copying over top of Master.."
+	print_warn "Custom Files Found, Copying over top of Master.."
 	cp -R /assets/custom/* /opt/lool/share/
 	chown -R lool. /opt/lool/share/
 fi
@ -51,7 +21,7 @@ if [ "$ENABLE_SSL" = "TRUE" ]; then
 	if [ "$ENABLE_SSL_CERT_GENERATE" = "TRUE" ]; then
 		mkdir -p $TLS_CERT_PATH
 		# Generate new SSL certificate instead of using the default
-		echo "** [libreoffice-online] Auto Generating Self Signed Certificates"
+		print_notice "Auto Generating Self Signed Certificates"
 		mkdir -p /tmp/ssl/
 		cd /tmp/ssl/
 		mkdir -p certs/ca
@ -80,7 +50,7 @@ if [ "$ENABLE_SSL" = "TRUE" ]; then
 fi

 if [ "$SETUP_TYPE" = "AUTO" ]; then
-    echo '** [libreoffice-online] Autogenerating Configuration File'
+    print_notice "Autogenerating Configuration File"
 	### Replace Configuration directives
 	perl -pi -e "s/<allowed_languages (.*)>.*<\/allowed_languages>/<allowed_languages \1>${DICTIONARIES}<\/allowed_languages>/" /etc/loolwsd/loolwsd.xml
 	perl -pi -e "s/<autosave_duration_secs (.*)>.*<\/autosave_duration_secs>/<autosave_duration_secs \1>${AUTO_SAVE}<\/autosave_duration_secs>/" /etc/loolwsd/loolwsd.xml
@ -134,5 +104,4 @@ if [ "$SETUP_TYPE" = "AUTO" ]; then
 	fi
 fi

-mkdir -p /tmp/state
-echo 'Initialization Complete' >/tmp/state/10-loolwsd-init
+liftoff
--- a/install/etc/s6/services/10-loolwsd/run
+++ b/install/etc/s6/services/10-loolwsd/run
@ -1,19 +1,9 @@
 #!/usr/bin/with-contenv bash

-while [ ! -f /tmp/state/10-loolwsd-init ]
-do
-  sleep 1
-done
+for s in /assets/functions/*; do source $s; done
+PROCESS_NAME="libreoffice-online"
+check_container_initialized
+check_service_initialized init

-if [ ! -f /tmp/state/10-loolwsd ]; then
-  touch /tmp/state/10-loolwsd
-fi
-
-### Set Debug Mode
-if [ "$DEBUG_MODE" = "TRUE" ] || [ "$DEBUG_MODE" = "true" ]; then
-    set -x
-fi
-
-echo '**'
-echo '** [libreoffice-online] Starting Libreoffice Online Web Services daemon'
+print_info "Starting Libreoffice Online Web Services daemon'
 exec s6-setuidgid lool /opt/lool/bin/loolwsd --version --o:sys_template_path=/opt/lool/systemplate --o:lo_template_path=/opt/libreoffice --o:child_root_path=/opt/lool/jails --o:file_server_root_path=/opt/lool/share/loolwsd storage.filesystem[@allow]=true --o:admin_console.username=${ADMIN_USER} --o:admin_console.password=${ADMIN_PASS} ${EXTRA_OPTIONS} >> /var/log/lool/loolwsd.log