diff --git a/.env.sample b/.env.sample index ff62576..28cc690 100644 --- a/.env.sample +++ b/.env.sample @@ -12,3 +12,9 @@ SECRET_DB_PASSWORD_VERSION=v1 SECRET_ADMIN_PASSWORD_VERSION=v1 EXTRA_VOLUME=/dev/null:/tmp/.dummy + +## embedded collabora +#COMPOSE_FILE="compose.yml:compose.collabora.yml" +#SECRET_COLLABORA_ADMIN_PASSWORD_VERSION=v1 +#NEXTCLOUD_DOMAIN=app +#COLLABORA_ADMIN_USERNAME=admin diff --git a/abra.sh b/abra.sh index 650b31b..443b4dd 100644 --- a/abra.sh +++ b/abra.sh @@ -1,6 +1,7 @@ export FPM_TUNE_VERSION=v4 export NGINX_CONF_VERSION=v2 export MY_CNF_VERSION=v4 +export COOLWSD_XML_VERSION=v1 NC_APP_DIR="app:/var/www/html" diff --git a/compose.collabora.yml b/compose.collabora.yml new file mode 100644 index 0000000..ce2d755 --- /dev/null +++ b/compose.collabora.yml @@ -0,0 +1,34 @@ +--- + +version: "3.8" + +services: + collabora: + image: "collabora/code:21.11.1.4.1" + cap_add: + - MKNOD + secrets: + - collabora_admin_password + configs: + - source: coolwsd_xml + target: /etc/coolwsd/coolwsd.xml + uid: "104" # lool + gid: "106" # lool + environment: + - ADMIN_USERNAME + - DOMAIN=${DOMAIN} + - DONT_GEN_SSL_CERT=true + - NEXTCLOUD_DOMAIN=${NEXTCLOUD_DOMAIN} + networks: + - internal + +secrets: + collabora_admin_password: + external: true + name: ${STACK_NAME}_collabora_admin_password_${SECRET_COLLABORA_ADMIN_PASSWORD_VERSION} + +configs: + coolwsd_xml: + name: ${STACK_NAME}_coolwsd_xml_${COOLWSD_XML_VERSION} + file: coolwsd.xml.tmpl + template_driver: golang diff --git a/compose.yml b/compose.yml index 4333544..2ceefc2 100644 --- a/compose.yml +++ b/compose.yml @@ -1,4 +1,6 @@ +--- version: "3.8" + services: web: image: nginx:1.20.0 diff --git a/coolwsd.xml.tmpl b/coolwsd.xml.tmpl new file mode 100644 index 0000000..71e58de --- /dev/null +++ b/coolwsd.xml.tmpl @@ -0,0 +1,226 @@ + + + + + + + + + de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru + + + + + + + + + + + 4 + + 6 + 5 + + false + 96 + 3600 + + + 30 + 300 + false + 0 + 8000 + 0 + 0 + 100 + 100 + + 10000 + 60 + 300 + 3072 + 85 + 120 + + + + + 120 + 900 + + + + + + true + + warning + notice + fatal + false + + -INFO-WARN + + + /var/log/coolwsd.log + never + timestamp + true + 10 days + 10 + true + false + + + false + 82589933 + + + + + + /var/log/coolwsd.trace.json + + + false + + + + + + + + false + + + + + + all + any + + + + 192\.168\.[0-9]{1,3}\.[0-9]{1,3} + ::ffff:192\.168\.[0-9]{1,3}\.[0-9]{1,3} + 127\.0\.0\.1 + ::ffff:127\.0\.0\.1 + ::1 + 172\.17\.[0-9]{1,3}\.[0-9]{1,3} + ::ffff:172\.17\.[0-9]{1,3}\.[0-9]{1,3} + 10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} + ::ffff:10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} + + + + + + + + + + + false + + true + /etc/coolwsd/cert.pem + /etc/coolwsd/key.pem + /etc/coolwsd/ca-chain.cert.pem + + + 1000 + + + + + + + + + true + true + 1800 + false + 1 + false + + + + + + + + + false + false + + + + + notebookbar + + + + + + {{ env "NEXTCLOUD_DOMAIN" }} + localhost + 10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3} + 172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3} + 172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3} + 172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3} + 192\.168\.[0-9]{1,3}\.[0-9]{1,3} + 192\.168\.1\.1 + 0 + + 900 + + + + true + + + + + + + + + true + + + true + false + {{ env "COLLABORA_ADMIN_USERNAME" }} + {{ secret "collabora_admin_password" }} + + + + + + + + + + + + + + + + +