summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2020-05-23 19:04:51 +0200
committerChristian Pointner <equinox@spreadspace.org>2020-05-23 19:04:51 +0200
commitf5e3a12f9616fa7d6e9b4d06675039e8104a7ce0 (patch)
tree2171969adb44d8e36bba8207bad943eac000c58a
parentclean up sk-testvm (diff)
collabora/code: config files are now managed by ansible
-rw-r--r--inventory/host_vars/sk-cloudia/collabora.yml19
-rwxr-xr-xroles/apps/collabora/code/contrib/extract-lolwsdxml.sh27
-rw-r--r--roles/apps/collabora/code/defaults/main.yml10
-rw-r--r--roles/apps/collabora/code/tasks/main.yml12
-rw-r--r--roles/apps/collabora/code/templates/config/loolwsd.4.2.1.2.xml.j2154
-rw-r--r--roles/apps/collabora/code/templates/nginx-vhost.conf.j28
-rw-r--r--roles/apps/collabora/code/templates/pod.yml.j24
7 files changed, 210 insertions, 24 deletions
diff --git a/inventory/host_vars/sk-cloudia/collabora.yml b/inventory/host_vars/sk-cloudia/collabora.yml
index 55e62508..f6bf2a2a 100644
--- a/inventory/host_vars/sk-cloudia/collabora.yml
+++ b/inventory/host_vars/sk-cloudia/collabora.yml
@@ -5,13 +5,12 @@ collabora_code_instances:
o.skillz.biz:
version: 4.2.1.2
port: 8200
- hostnames:
- - o.skillz.biz
- admin_user: admin
- admin_password: "{{ vault_collabora_code_admin_passwords['o.skillz.biz'] }}"
- ## TODO: fix this
- # backend_storage:
- # - wolke.elevate.at
- # - insomnia.skillz.biz
- # - nc.skillz.biz
- # - wae.elevate.at
+ hostname: o.skillz.biz
+ admin:
+ username: admin
+ password: "{{ vault_collabora_code_admin_passwords['o.skillz.biz'] }}"
+ backend_storages:
+ - wolke.elevate.at
+ - insomnia.skillz.biz
+ - nc.skillz.biz
+ - wae.elevate.at
diff --git a/roles/apps/collabora/code/contrib/extract-lolwsdxml.sh b/roles/apps/collabora/code/contrib/extract-lolwsdxml.sh
new file mode 100755
index 00000000..ab4e5fb4
--- /dev/null
+++ b/roles/apps/collabora/code/contrib/extract-lolwsdxml.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+if [ -z "$1" ]; then
+ echo "Usage: $0 <version>"
+ exit 1
+fi
+VERSION="$1"
+
+IMAGE_TAG="$VERSION"
+IMAGE_NAME="collabora/code"
+CONF_D=$(realpath "${BASH_SOURCE%/*}/../templates/config")
+CONTAINER_NAME="collabora-code-loolwsd.xml-extractor"
+
+sudo docker rm "$CONTAINER_NAME" > /dev/null 2>&1
+
+set -e
+sudo docker create --name "$CONTAINER_NAME" "$IMAGE_NAME:$IMAGE_TAG" /bin/true
+sudo docker cp --archive=false "$CONTAINER_NAME:/etc/loolwsd/loolwsd.xml" - | tar -xO loolwsd.xml > "$CONF_D/loolwsd.$VERSION.xml.j2"
+sudo docker rm "$CONTAINER_NAME"
+
+echo ""
+echo "File extraction was sucessful! Now snyc the config file with existing ones."
+echo ""
+echo "you might also want to delete the image:"
+echo ""
+echo " sudo docker rmi '$IMAGE_NAME:$IMAGE_TAG'"
+echo ""
diff --git a/roles/apps/collabora/code/defaults/main.yml b/roles/apps/collabora/code/defaults/main.yml
index f17054ed..2f025db5 100644
--- a/roles/apps/collabora/code/defaults/main.yml
+++ b/roles/apps/collabora/code/defaults/main.yml
@@ -5,7 +5,9 @@ collabora_code_base_path: /srv/collabora/code
# example:
# version: 4.0.6.1
# port: 8200
-# hostnames:
-# - office.example.com
-# admin_user: admin
-# admin_password: S3cret
+# hostname: office.example.com
+# admin:
+# username: admin
+# password: S3cret
+# backend_storages:
+# - cloud.example.com
diff --git a/roles/apps/collabora/code/tasks/main.yml b/roles/apps/collabora/code/tasks/main.yml
index ce88fe0d..e283035b 100644
--- a/roles/apps/collabora/code/tasks/main.yml
+++ b/roles/apps/collabora/code/tasks/main.yml
@@ -4,8 +4,15 @@
file:
path: "{{ collabora_code_base_path }}/{{ item }}/config"
state: directory
+ mode: 0750
-## TODO: render config.xml
+- name: generate configuration file
+ loop: "{{ collabora_code_instances | dict2items }}"
+ loop_control:
+ label: "{{ item.key }}"
+ template:
+ src: "config/loolwsd.{{ item.value.version }}.xml.j2"
+ dest: "{{ collabora_code_base_path }}/{{ item.key }}/config/loolwsd.xml"
- name: generate pod manifests
loop: "{{ collabora_code_instances | dict2items }}"
@@ -25,4 +32,5 @@
name: "collabora-code-{{ item.key }}"
content: "{{ lookup('template', 'nginx-vhost.conf.j2') }}"
acme: true
- hostnames: "{{ item.value.hostnames }}"
+ hostnames:
+ - "{{ item.value.hostname }}"
diff --git a/roles/apps/collabora/code/templates/config/loolwsd.4.2.1.2.xml.j2 b/roles/apps/collabora/code/templates/config/loolwsd.4.2.1.2.xml.j2
new file mode 100644
index 00000000..04269bd9
--- /dev/null
+++ b/roles/apps/collabora/code/templates/config/loolwsd.4.2.1.2.xml.j2
@@ -0,0 +1,154 @@
+<config>
+
+ <!-- Note: 'default' attributes are used to document a setting's default value as well as to use as fallback. -->
+ <!-- Note: When adding a new entry, a default must be set in WSD in case the entry is missing upon deployment. -->
+
+ <allowed_languages desc="List of supported languages of Writing Aids (spell checker, grammar checker, thesaurus, hyphenation) on this instance. Allowing too many has negative effect on startup performance." default="de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru">de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru</allowed_languages>
+
+ <sys_template_path desc="Path to a template tree with shared libraries etc to be used as source for chroot jails for child processes." type="path" relative="true" default="systemplate"></sys_template_path>
+ <child_root_path desc="Path to the directory under which the chroot jails for the child processes will be created. Should be on the same file system as systemplate and lotemplate. Must be an empty directory." type="path" relative="true" default="jails"></child_root_path>
+
+ <server_name desc="External hostname:port of the server running loolwsd. If empty, it's derived from the request (please set it if this doesn't work). Must be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string" default="">{{ item.value.hostname }}</server_name>
+ <file_server_root_path desc="Path to the directory that should be considered root for the file server. This should be the directory containing loleaflet." type="path" relative="true" default="loleaflet/../"></file_server_root_path>
+
+ <memproportion desc="The maximum percentage of system memory consumed by all of the Collabora Online Development Edition, after which we start cleaning up idle documents" type="double" default="80.0"></memproportion>
+ <num_prespawn_children desc="Number of child processes to keep started in advance and waiting for new clients." type="uint" default="1">1</num_prespawn_children>
+ <per_document desc="Document-specific settings, including LO Core settings.">
+ <max_concurrency desc="The maximum number of threads to use while processing a document." type="uint" default="4">4</max_concurrency>
+ <document_signing_url desc="The endpoint URL of signing server, if empty the document signing is disabled" type="string" default="https://app.vereign.com">https://app.vereign.com</document_signing_url>
+ <redlining_as_comments desc="If true show red-lines as comments" type="bool" default="false">false</redlining_as_comments>
+ <idle_timeout_secs desc="The maximum number of seconds before unloading an idle document. Defaults to 1 hour." type="uint" default="3600">3600</idle_timeout_secs>
+ <!-- Idle save and auto save are checked every 30 seconds -->
+ <!-- They are disabled when the value is zero or negative. -->
+ <idlesave_duration_secs desc="The number of idle seconds after which document, if modified, should be saved. Defaults to 30 seconds." type="int" default="30">30</idlesave_duration_secs>
+ <autosave_duration_secs desc="The number of seconds after which document, if modified, should be saved. Defaults to 5 minutes." type="int" default="300">300</autosave_duration_secs>
+ <always_save_on_exit desc="On exiting the last editor, always perform the save, even if the document is not modified." type="bool" default="false">false</always_save_on_exit>
+ <limit_virt_mem_mb desc="The maximum virtual memory allowed to each document process. 0 for unlimited." type="uint">0</limit_virt_mem_mb>
+ <limit_stack_mem_kb desc="The maximum stack size allowed to each document process. 0 for unlimited." type="uint">8000</limit_stack_mem_kb>
+ <limit_file_size_mb desc="The maximum file size allowed to each document process to write. 0 for unlimited." type="uint">0</limit_file_size_mb>
+ <limit_num_open_files desc="The maximum number of files allowed to each document process to open. 0 for unlimited." type="uint">0</limit_num_open_files>
+ <limit_load_secs desc="Maximum number of seconds to wait for a document load to succeed. 0 for unlimited." type="uint" default="100">100</limit_load_secs>
+ <limit_convert_secs desc="Maximum number of seconds to wait for a document conversion to succeed. 0 for unlimited." type="uint" default="100">100</limit_convert_secs>
+ </per_document>
+
+ <per_view desc="View-specific settings.">
+ <out_of_focus_timeout_secs desc="The maximum number of seconds before dimming and stopping updates when the browser tab is no longer in focus. Defaults to 120 seconds." type="uint" default="120">120</out_of_focus_timeout_secs>
+ <idle_timeout_secs desc="The maximum number of seconds before dimming and stopping updates when the user is no longer active (even if the browser is in focus). Defaults to 15 minutes." type="uint" default="900">900</idle_timeout_secs>
+ </per_view>
+
+ <loleaflet_html desc="Allows UI customization by replacing the single endpoint of loleaflet.html" type="string" default="loleaflet.html">loleaflet.html</loleaflet_html>
+
+ <logging>
+ <color type="bool">true</color>
+ <level type="string" desc="Can be 0-8, or none (turns off logging), fatal, critical, error, warning, notice, information, debug, trace" default="warning">warning</level>
+ <protocol type="bool" descr="Enable minimal client-site JS protocol logging from the start">false</protocol>
+ <file enable="false">
+ <property name="path" desc="Log file path.">/var/log/loolwsd.log</property>
+ <property name="rotation" desc="Log file rotation strategy. See Poco FileChannel.">never</property>
+ <property name="archive" desc="Append either timestamp or number to the archived log filename.">timestamp</property>
+ <property name="compress" desc="Enable/disable log file compression.">true</property>
+ <property name="purgeAge" desc="The maximum age of log files to preserve. See Poco FileChannel.">10 days</property>
+ <property name="purgeCount" desc="The maximum number of log archives to preserve. Use 'none' to disable purging. See Poco FileChannel.">10</property>
+ <property name="rotateOnOpen" desc="Enable/disable log file rotation on opening.">true</property>
+ <property name="flush" desc="Enable/disable flushing after logging each line. May harm performance. Note that without flushing after each line, the log lines from the different processes will not appear in chronological order.">false</property>
+ </file>
+ <anonymize>
+ <anonymize_user_data type="bool" desc="Enable to anonymize/obfuscate of user-data in logs. If default is true, it was forced at compile-time and cannot be disabled." default="false">false</anonymize_user_data>
+ <anonymization_salt type="uint" desc="The salt used to anonymize/obfuscate user-data in logs. Use a secret 64-bit random number." default="82589933">82589933</anonymization_salt>
+ </anonymize>
+ </logging>
+
+ <loleaflet_logging desc="Logging in the browser console" default="false">false</loleaflet_logging>
+
+ <trace desc="Dump commands and notifications for replay. When 'snapshot' is true, the source file is copied to the path first." enable="false">
+ <path desc="Output path to hold trace file and docs. Use '%' for timestamp to avoid overwriting. For example: /some/path/to/looltrace-%.gz" compress="true" snapshot="false"></path>
+ <filter>
+ <message desc="Regex pattern of messages to exclude"></message>
+ </filter>
+ <outgoing>
+ <record desc="Whether or not to record outgoing messages" default="false">false</record>
+ </outgoing>
+ </trace>
+
+ <net desc="Network settings">
+ <!-- On systems where localhost resolves to IPv6 [::1] address first, when net.proto is all and net.listen is loopback, loolwsd unexpectedly listens on [::1] only.
+ You need to change net.proto to IPv4, if you want to use 127.0.0.1. -->
+ <proto type="string" default="all" desc="Protocol to use IPv4, IPv6 or all for both">all</proto>
+ <listen type="string" default="any" desc="Listen address that loolwsd binds to. Can be 'any' or 'loopback'.">any</listen>
+ <service_root type="path" default="" desc="Prefix all the pages, websockets, etc. with this path."></service_root>
+ <post_allow desc="Allow/deny client IP address for POST(REST)." allow="true">
+ <host desc="The IPv4 private 192.168 block as plain IPv4 dotted decimal addresses.">192\.168\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:192\.168\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ <host desc="The IPv4 loopback (localhost) address.">127\.0\.0\.1</host>
+ <host desc="Ditto, but as IPv4-mapped IPv6 address">::ffff:127\.0\.0\.1</host>
+ <host desc="The IPv6 loopback (localhost) address.">::1</host>
+ <host desc="The IPv4 private 172.17.0.0/16 subnet (Docker).">172\.17\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.17\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ </post_allow>
+ <frame_ancestors desc="Specify who is allowed to embed the LO Online iframe (loolwsd and WOPI host are always allowed). Separate multiple hosts by space."></frame_ancestors>
+ </net>
+
+ <ssl desc="SSL settings">
+ <enable type="bool" desc="Controls whether SSL encryption between browser and loolwsd is enabled (do not disable for production deployment). If default is false, must first be compiled with SSL support to enable." default="true">true</enable>
+ <termination desc="Connection via proxy where loolwsd acts as working via https, but actually uses http." type="bool" default="true">false</termination>
+ <cert_file_path desc="Path to the cert file" relative="false">/etc/loolwsd/cert.pem</cert_file_path>
+ <key_file_path desc="Path to the key file" relative="false">/etc/loolwsd/key.pem</key_file_path>
+ <ca_file_path desc="Path to the ca file" relative="false">/etc/loolwsd/ca-chain.cert.pem</ca_file_path>
+ <cipher_list desc="List of OpenSSL ciphers to accept" default="ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"></cipher_list>
+ <hpkp desc="Enable HTTP Public key pinning" enable="false" report_only="false">
+ <max_age desc="HPKP's max-age directive - time in seconds browser should remember the pins" enable="true">1000</max_age>
+ <report_uri desc="HPKP's report-uri directive - pin validation failure are reported at this URL" enable="false"></report_uri>
+ <pins desc="Base64 encoded SPKI fingerprints of keys to be pinned">
+ <pin></pin>
+ </pins>
+ </hpkp>
+ </ssl>
+
+ <security desc="Altering these defaults potentially opens you to significant risk">
+ <seccomp desc="Should we use the seccomp system call filtering." type="bool" default="true">true</seccomp>
+ <capabilities desc="Should we require capabilities to isolate processes into chroot jails" type="bool" default="true">true</capabilities>
+ </security>
+
+ <watermark>
+ <opacity desc="Opacity of on-screen watermark from 0.0 to 1.0" type="double" default="0.2"></opacity>
+ <text desc="Watermark text to be displayed on the document if entered" type="string"></text>
+ </watermark>
+
+ <storage desc="Backend storage">
+ <filesystem allow="false" />
+ <wopi desc="Allow/deny wopi storage. Mutually exclusive with webdav." allow="true">
+ <host desc="Regex pattern of hostname to allow or deny." allow="true">localhost</host>
+{% for backend in item.value.backend_storages %}
+ <host allow="true">{{ backend }}</host>
+{% endfor %}
+ <max_file_size desc="Maximum document size in bytes to load. 0 for unlimited." type="uint">0</max_file_size>
+ <reuse_cookies desc="When enabled, cookies from the browser will be captured and set on WOPI requests." type="bool" default="false">false</reuse_cookies>
+ <locking desc="Locking settings">
+ <refresh desc="How frequently we should re-acquire a lock with the storage server, in seconds (default 15 mins) or 0 for no refresh" type="int" default="900">900</refresh>
+ </locking>
+ </wopi>
+ <webdav desc="Allow/deny webdav storage. Mutually exclusive with wopi." allow="false">
+ <host desc="Hostname to allow" allow="false">localhost</host>
+ </webdav>
+ <ssl desc="SSL settings">
+ <enable type="bool" desc="Controls whether SSL encryption between storage and loolwsd is enabled. Defaults when empty to following the ssl.enable setting"></enable>
+ <cert_file_path desc="Path to the cert file" relative="false"></cert_file_path>
+ <key_file_path desc="Path to the key file" relative="false"></key_file_path>
+ <ca_file_path desc="Path to the ca file" relative="false"></ca_file_path>
+ <cipher_list desc="List of OpenSSL ciphers to accept. If empty the defaults are used. These can be overriden only if absolutely needed."></cipher_list>
+ </ssl>
+ </storage>
+
+ <tile_cache_persistent desc="Should the tiles persist between two editing sessions of the given document?" type="bool" default="true">true</tile_cache_persistent>
+
+ <admin_console desc="Web admin console settings.">
+ <enable desc="Enable the admin console functionality" type="bool" default="true">true</enable>
+ <enable_pam desc="Enable admin user authentication with PAM" type="bool" default="false">false</enable_pam>
+ <username desc="The username of the admin console. Ignored if PAM is enabled.">{{ item.value.admin.username }}</username>
+ <password desc="The password of the admin console. Deprecated on most platforms. Instead, use PAM or loolconfig to set up a secure password.">{{ item.value.admin.password }}</password>
+ </admin_console>
+
+ <monitors desc="Addresses of servers we connect to on start for monitoring">
+ </monitors>
+
+</config>
diff --git a/roles/apps/collabora/code/templates/nginx-vhost.conf.j2 b/roles/apps/collabora/code/templates/nginx-vhost.conf.j2
index cec811f9..a14113f0 100644
--- a/roles/apps/collabora/code/templates/nginx-vhost.conf.j2
+++ b/roles/apps/collabora/code/templates/nginx-vhost.conf.j2
@@ -1,7 +1,7 @@
server {
listen 80;
listen [::]:80;
- server_name {{ item.value.hostnames | join(' ') }};
+ server_name {{ item.value.hostname }};
include snippets/acmetool.conf;
@@ -13,12 +13,12 @@ server {
server {
listen 443 ssl http2;
listen [::]:443 ssl http2;
- server_name {{ item.value.hostnames | join(' ') }};
+ server_name {{ item.value.hostname }};
include snippets/acmetool.conf;
include snippets/tls.conf;
- ssl_certificate /var/lib/acme/live/{{ item.value.hostnames[0] }}/fullchain;
- ssl_certificate_key /var/lib/acme/live/{{ item.value.hostnames[0] }}/privkey;
+ ssl_certificate /var/lib/acme/live/{{ item.value.hostname }}/fullchain;
+ ssl_certificate_key /var/lib/acme/live/{{ item.value.hostname }}/privkey;
include snippets/hsts.conf;
diff --git a/roles/apps/collabora/code/templates/pod.yml.j2 b/roles/apps/collabora/code/templates/pod.yml.j2
index 8ed092ac..eb771de7 100644
--- a/roles/apps/collabora/code/templates/pod.yml.j2
+++ b/roles/apps/collabora/code/templates/pod.yml.j2
@@ -12,10 +12,6 @@ spec:
env:
- name: "DONT_GEN_SSL_CERT"
value: "1"
- - name: "username"
- value: "{{ item.value.admin_user }}"
- - name: "password"
- value: "{{ item.value.admin_password }}"
- name: "extra_params"
value: "--o:ssl.enable=false --o:ssl.termination=true"
volumeMounts: