summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chaos-at-home/ch-mz-ap.yml (renamed from chaos-at-home/mz-ap.yml)2
-rw-r--r--chaos-at-home/ch-mz-router.yml15
-rw-r--r--chaos-at-home/host_vars/mz-router.yml61
-rw-r--r--chaos-at-home/mz-router.yml14
-rw-r--r--files/chaos-at-home/bind-zones/db.elev8.at9
-rw-r--r--inventory/group_vars/promzone-chaos-at-home/vars.yml4
-rw-r--r--inventory/group_vars/promzone-elevate-festival/vars.yml2
-rw-r--r--inventory/host_vars/ch-apps/vars.yml2
-rw-r--r--inventory/host_vars/ch-companion-raspi.yml2
-rw-r--r--inventory/host_vars/ch-dione.yml2
-rw-r--r--inventory/host_vars/ch-equinox-t450s.yml5
-rw-r--r--inventory/host_vars/ch-equinox-ws.yml7
-rw-r--r--inventory/host_vars/ch-helene.yml2
-rw-r--r--inventory/host_vars/ch-mimas.yml2
-rw-r--r--inventory/host_vars/ch-mz-ap.yml (renamed from inventory/host_vars/mz-ap.yml)0
-rw-r--r--inventory/host_vars/ch-mz-router.yml (renamed from inventory/host_vars/mz-router.yml)6
-rw-r--r--inventory/host_vars/ch-pan.yml4
-rw-r--r--inventory/host_vars/ch-router.yml8
-rw-r--r--inventory/host_vars/ele-calypso.yml2
-rw-r--r--inventory/host_vars/ele-companion-raspi.yml2
-rw-r--r--inventory/host_vars/ele-coturn.yml2
-rw-r--r--inventory/host_vars/ele-helene.yml2
-rw-r--r--inventory/host_vars/ele-jitsi.yml2
-rw-r--r--inventory/host_vars/ele-media.yml2
-rw-r--r--inventory/host_vars/ele-thetys.yml2
-rw-r--r--inventory/host_vars/glt-jitsi.yml2
-rw-r--r--inventory/host_vars/s2-thetys.yml2
-rw-r--r--inventory/host_vars/sk-cloudio/collabora.yml14
-rw-r--r--inventory/host_vars/sk-cloudio/etherpad.yml58
-rw-r--r--inventory/host_vars/sk-cloudio/nextcloud.yml180
-rw-r--r--inventory/host_vars/sk-cloudio/onlyoffice.yml22
-rw-r--r--inventory/host_vars/sk-cloudio/pigallery2.yml20
-rw-r--r--inventory/host_vars/sk-cloudio/vars.yml111
-rw-r--r--inventory/host_vars/sk-testvm.yml2
-rw-r--r--inventory/host_vars/sk-tomnext-nc.yml6
-rw-r--r--inventory/hosts.ini8
-rwxr-xr-xroles/apps/collabora/code/contrib/extract-coolwsdxml.sh2
-rwxr-xr-xroles/apps/collabora/code/contrib/extract-loolwsdxml.sh27
-rw-r--r--roles/apps/collabora/code/defaults/main.yml33
-rw-r--r--roles/apps/collabora/code/filter_plugins/collabora_code.py25
-rw-r--r--roles/apps/collabora/code/instance/tasks/custom-image.yml24
-rw-r--r--roles/apps/collabora/code/instance/tasks/main.yml95
-rw-r--r--roles/apps/collabora/code/instance/templates/config/coolwsd.21.11.1.3.1.xml.j2 (renamed from roles/apps/collabora/code/templates/config/coolwsd.21.11.1.3.1.xml.j2)12
-rw-r--r--roles/apps/collabora/code/instance/templates/config/coolwsd.23.05.5.2.1.xml.j2 (renamed from roles/apps/collabora/code/templates/config/coolwsd.23.05.5.2.1.xml.j2)12
-rw-r--r--roles/apps/collabora/code/instance/templates/config/coolwsd.23.05.6.4.1.xml.j2 (renamed from roles/apps/collabora/code/templates/config/coolwsd.23.05.6.4.1.xml.j2)12
-rw-r--r--roles/apps/collabora/code/instance/templates/config/coolwsd.24.04.6.2.1.xml.j2340
-rw-r--r--roles/apps/collabora/code/instance/templates/nginx-vhost.conf.j2113
-rw-r--r--roles/apps/collabora/code/instance/templates/pod-spec.yml.j240
-rw-r--r--roles/apps/collabora/code/tasks/custom-image.yml24
-rw-r--r--roles/apps/collabora/code/tasks/main.yml51
-rw-r--r--roles/apps/collabora/code/tasks/nginx-vhost.yml17
-rw-r--r--roles/apps/collabora/code/templates/config/loolwsd.6.4.0.14.xml.j2179
-rw-r--r--roles/apps/collabora/code/templates/config/loolwsd.6.4.10.2.xml.j2192
-rw-r--r--roles/apps/collabora/code/templates/config/loolwsd.6.4.14.3.xml.j2203
-rw-r--r--roles/apps/collabora/code/templates/config/loolwsd.6.4.3.3.xml.j2180
-rw-r--r--roles/apps/collabora/code/templates/config/loolwsd.6.4.4.3.xml.j2180
-rw-r--r--roles/apps/collabora/code/templates/config/loolwsd.6.4.6.2.xml.j2180
-rw-r--r--roles/apps/collabora/code/templates/config/loolwsd.6.4.7.3.xml.j2184
-rw-r--r--roles/apps/collabora/code/templates/config/loolwsd.6.4.7.5.xml.j2184
-rw-r--r--roles/apps/collabora/code/templates/config/loolwsd.6.4.8.1.xml.j2188
-rw-r--r--roles/apps/collabora/code/templates/nginx-vhost.conf.j299
-rw-r--r--roles/apps/collabora/code/templates/pod-spec.yml.j230
-rw-r--r--roles/apps/nextcloud/base/defaults/main.yml9
-rw-r--r--roles/apps/nextcloud/base/tasks/main.yml51
-rw-r--r--roles/apps/nextcloud/base/templates/cron@.service.j2 (renamed from roles/apps/nextcloud/templates/cron@.service.j2)2
-rwxr-xr-xroles/apps/nextcloud/base/templates/nextcloud-cron.j219
-rwxr-xr-xroles/apps/nextcloud/base/templates/nextcloud-occ.j2 (renamed from roles/apps/nextcloud/templates/nextcloud-occ.j2)2
-rwxr-xr-xroles/apps/nextcloud/base/templates/nextcloud-upgrade.j2 (renamed from roles/apps/nextcloud/templates/nextcloud-upgrade.j2)21
-rw-r--r--roles/apps/nextcloud/defaults/main.yml31
-rw-r--r--roles/apps/nextcloud/instance/defaults/main.yml9
-rw-r--r--roles/apps/nextcloud/instance/tasks/custom-image.yml (renamed from roles/apps/nextcloud/tasks/custom-image.yml)14
-rw-r--r--roles/apps/nextcloud/instance/tasks/main.yml196
-rw-r--r--roles/apps/nextcloud/instance/templates/apache-site.conf.j220
-rw-r--r--roles/apps/nextcloud/instance/templates/cron-.timer.j29
-rw-r--r--roles/apps/nextcloud/instance/templates/pod-spec-with-mariadb.yml.j2110
-rw-r--r--roles/apps/nextcloud/instance/templates/upgrade.sh.j277
-rw-r--r--roles/apps/nextcloud/meta/main.yml3
-rw-r--r--roles/apps/nextcloud/tasks/main.yml239
-rw-r--r--roles/apps/nextcloud/templates/apache-site.conf.j210
-rw-r--r--roles/apps/nextcloud/templates/cron-.timer.j29
-rw-r--r--roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j2101
-rw-r--r--roles/apps/nextcloud/templates/run-cron.sh.j27
-rw-r--r--roles/apps/onlyoffice/defaults/main.yml25
-rw-r--r--roles/apps/onlyoffice/instance/tasks/main.yml88
-rw-r--r--roles/apps/onlyoffice/instance/templates/pod-spec.yml.j275
-rw-r--r--roles/apps/onlyoffice/tasks/main.yml152
-rw-r--r--roles/apps/onlyoffice/templates/pod-spec.yml.j2102
-rw-r--r--roles/core/base/tasks/Debian.yml9
-rw-r--r--roles/core/base/tasks/OpenBSD.yml4
-rw-r--r--roles/core/base/tasks/main.yml4
-rw-r--r--roles/greenbone/server/templates/docker-compose-22.4.yml.j2123
-rw-r--r--roles/installer/debian/preseed/defaults/main.yml2
-rw-r--r--roles/installer/openbsd/autoinstall/defaults/main.yml2
-rw-r--r--roles/installer/openbsd/autoinstall/templates/auto_install.conf.j22
-rw-r--r--roles/installer/raspios/image/defaults/main.yml2
-rw-r--r--roles/installer/ubuntu/autoinstall/defaults/main.yml2
-rw-r--r--roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j26
-rw-r--r--roles/kubernetes/base/tasks/cri_docker.yml1
-rw-r--r--roles/monitoring/prometheus/server/defaults/main/main.yml22
-rw-r--r--roles/monitoring/prometheus/server/defaults/main/rules_prometheus.yml4
-rw-r--r--roles/monitoring/prometheus/server/templates/prometheus.service.j22
-rw-r--r--roles/monitoring/prometheus/server/templates/prometheus.yml.j27
-rw-r--r--roles/x509/acmetool/base/templates/responses.j21
-rw-r--r--skillz/host_vars/sk-cloudio.yml320
-rw-r--r--skillz/sk-cloudio.yml23
-rw-r--r--skillz/sk-tomnext-nc.yml46
106 files changed, 2060 insertions, 3115 deletions
diff --git a/chaos-at-home/mz-ap.yml b/chaos-at-home/ch-mz-ap.yml
index 46b0aa88..545d8c4a 100644
--- a/chaos-at-home/mz-ap.yml
+++ b/chaos-at-home/ch-mz-ap.yml
@@ -1,6 +1,6 @@
---
- name: Basic Setup
- hosts: mz-ap
+ hosts: ch-mz-ap
connection: local
gather_facts: no
roles:
diff --git a/chaos-at-home/ch-mz-router.yml b/chaos-at-home/ch-mz-router.yml
new file mode 100644
index 00000000..65c0c2b0
--- /dev/null
+++ b/chaos-at-home/ch-mz-router.yml
@@ -0,0 +1,15 @@
+---
+- name: Basic Setup
+ hosts: ch-mz-router
+ connection: local
+ gather_facts: no
+ roles:
+ - role: installer/openwrt/image
+ post_tasks:
+ - pause:
+ prompt: |
+ * scp -O {{ output_images[0] }} ch-mz-router:/tmp/openwrt.bin
+ * ssh ch-mz-router sysupgrade -n /tmp/openwrt.bin
+ * ssh ch-mz-router dropbearkey -t ed25519 -f /etc/dyndns/id_ed25519
+ replace the key at the dyndns server (ch-pan: /var/lib/dyndns/.ssh/authorized_keys)
+ after that run the dyndns update script manually to accept the ssh host-key
diff --git a/chaos-at-home/host_vars/mz-router.yml b/chaos-at-home/host_vars/mz-router.yml
deleted file mode 100644
index 9d5b814b..00000000
--- a/chaos-at-home/host_vars/mz-router.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-$ANSIBLE_VAULT;1.2;AES256;chaos-at-home
-65643339366566643435323363386430633134636135383962623132373433393832663837376539
-3235323334643539356336333737646438393664336265660a393134323731336665386165613435
-33393233666434643462323235656163373365333565373566616666666339616632663464326436
-3061343337356139330a653463376366343835616237646239643338333866653530613364323638
-35336561633037366437333866306231613738336339646538373261656365386231393265363130
-37303830386562646335353462353662383636393233623962376565363435643366633733626334
-35643363306163666662353962393231643939313230343961666661333334313438653234373733
-37376530633163323462366434623532626536323830333562316239306634303731643965386233
-32383466356366613262653731663665343036373136343731393332616435636165393639643165
-30363663376236613533393333663163376332326536396465656162653961316563373861323662
-64393265636566306631323937333164613165616232393633386438316362656635383062303337
-39333932616535613230346666373635653363333761373765346237313731343166666136323734
-31383930646434306137333262376264323539383365303931353666333738666639386537353831
-63616366346336326331663938383161373837356331633265303266353738633233303039383066
-62633738376139626662366632373435373337323737336639306339653231336433333863303130
-64663964393562616635633738333139646334636433316638393835306366363238623562626134
-39643465303936633564373933343163643637616239663534666631633536613165326663663431
-37623931303461376336653562646366383836343534386366306334666330306635396561303661
-62353830666234616438383565636638663436303830356535323935653034646366396530313336
-61646137336435313138326535376339333735393931373333323561373936396664333537336361
-61646332623639663264646362393133356562616338303835336330393265663432323139356233
-66356161366564316339623835613266343233373434666462326531303361313230633638353963
-34303262653534326562623138313566646631343136393766316434663735326661623930626539
-66363066363236363965613765666362616137333035383331666163623266316434353731306366
-32623733613165653265386430663361373466396430306262353631326238396130613165656332
-34373139313063336636626461646563373531383935376436653933306333346431393833656366
-61356437333031346634616539326438613931346666346234333365303463626465353039616437
-37613433396138636534326638393966356661386662396330623234616638633333333161653735
-38386261306561383632613065653538376136306239336663356662386638623338613462353663
-62373666633333333461333963386632613137326165396433633439363938623838656665326339
-30323765613437373539333339646136633263323061653764306264316437353832313263323139
-32323633323562626661313534616263326561613030656363616461393334363833396133323266
-66386139383163386537383433396261373766653164373736323235643631656161393262383738
-61316533336662646232303936356236366436663265646131363237366463363732343964363366
-37653037303630613330333663623535663739643430333263636539613632303738653031663936
-38623665643939353733386335356161336531663333623538343332336264376663623261656633
-30333638646363356236303532363532353039323862366135653166316336623062333537366335
-31633839396461336361643465636664646164663762346236363763396263383163326465653964
-34663134623430353432646130633661636237613435323836386262333363373139376462363765
-63623638366136646265396432333339653234643532336233383461386361616630313936303162
-35626366366262623934333961653363616135313836643365613836343438353365383264623037
-31663231316462616137373435663039633434623466356266633235313865323362393636393862
-64343062336433343137316565373535666337653833353136376635666539656662373763623238
-30666532633965386264323565353431306633666364656662333631646139386138393066356238
-62653837656664333462363334373664373937333932313465353237636134626466343735633466
-31643039333866303233613762323866333264313135373130623166393339613131323537373537
-35626633373838363766623233626130646332336435316333323439613636373536343233633137
-30363863656465636635633936356165386633653637333932396164653835313163376363616133
-35376637376630636336386538353235353364313464313231633663616536323532336432376232
-64396234303332313134366133643664643165393932323361616666383162303337626663396131
-35613865373635303834373062666539386462663238383332616565303866316239613361373661
-37346162623764336332663431303664343430366562633361623566356266616534656562363833
-63366238656261646564306133623433306663376531373563363032303938303538356630636466
-30616630306334616237346661346235376133303538306638663631376163383138636365326230
-32376139373030303239376631316166393363613465323436633932376463303531386161313264
-65323261326232366332396335386639313735353135356139343937386232653737393565376639
-31363530313038306131383236396364666165393837343538316539336263333663643031623136
-30316436633662353162363836633238613833613530613762383662653435393263626161373938
-61613133643937346433643862326165326233363335656431663064336165383462623636383334
-63313438346136633461
diff --git a/chaos-at-home/mz-router.yml b/chaos-at-home/mz-router.yml
deleted file mode 100644
index 8f4f056f..00000000
--- a/chaos-at-home/mz-router.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- name: Basic Setup
- hosts: mz-router
- connection: local
- gather_facts: no
- roles:
- - role: installer/openwrt/image
- post_tasks:
- - pause:
- prompt: "\n****** copy and install image onto router and wait for it to come back ******\n"
-
- - shell: "base64 -d | ssh chmz-router \"/bin/sh -c 'umask 077; cat > /etc/dyndns/id_rsa'\""
- args:
- stdin: "{{ vault_dyndns_ssh_key_b64 }}"
diff --git a/files/chaos-at-home/bind-zones/db.elev8.at b/files/chaos-at-home/bind-zones/db.elev8.at
index e5a5c2a4..fb8ac94a 100644
--- a/files/chaos-at-home/bind-zones/db.elev8.at
+++ b/files/chaos-at-home/bind-zones/db.elev8.at
@@ -1,7 +1,7 @@
$TTL 1h
@ SOA ns0.chaos-at-home.org. hostmaster (
- 2024061802
+ 2024082500
1h
5m
28d
@@ -13,10 +13,11 @@ $TTL 1h
MX 10 mx0.chaos-at-home.org.
MX 10 mx1.chaos-at-home.org.
-wolke CNAME cloudio.skillz.biz.
-office CNAME cloudio.skillz.biz.
+;wolke CNAME cloudio.skillz.biz.
+;office CNAME cloudio.skillz.biz.
+wolke A 94.130.242.24
+office A 94.130.242.24
-bs CNAME cloudio.skillz.biz.
wikijs CNAME cloudio.skillz.biz.
;stun A 162.55.59.151
diff --git a/inventory/group_vars/promzone-chaos-at-home/vars.yml b/inventory/group_vars/promzone-chaos-at-home/vars.yml
index 7969d26f..752bada7 100644
--- a/inventory/group_vars/promzone-chaos-at-home/vars.yml
+++ b/inventory/group_vars/promzone-chaos-at-home/vars.yml
@@ -14,9 +14,9 @@ prometheus_exporter_smokeping_version: 0.8.1
prometheus_exporter_bind_version: 0.7.0
prometheus_exporter_chrony_version: 0.10.1
prometheus_exporter_chrony_disable_dns_lookups: yes
-prometheus_exporter_mosquitto_version: 0.7.2
+prometheus_exporter_mosquitto_version: 0.7.3
-prometheus_server_version: 2.53.2
+prometheus_server_version: 2.54.1
prometheus_alertmanager_version: 0.27.0
prometheus_server: ch-mon
diff --git a/inventory/group_vars/promzone-elevate-festival/vars.yml b/inventory/group_vars/promzone-elevate-festival/vars.yml
index 8cb3ebbb..398f1511 100644
--- a/inventory/group_vars/promzone-elevate-festival/vars.yml
+++ b/inventory/group_vars/promzone-elevate-festival/vars.yml
@@ -13,7 +13,7 @@ prometheus_exporter_nut_version: 3.1.1
prometheus_exporter_chrony_version: 0.10.1
prometheus_exporter_chrony_disable_dns_lookups: yes
-prometheus_server_version: 2.53.2
+prometheus_server_version: 2.54.1
prometheus_alertmanager_version: 0.27.0
prometheus_server: ele-calypso
diff --git a/inventory/host_vars/ch-apps/vars.yml b/inventory/host_vars/ch-apps/vars.yml
index a3f34992..57a7e485 100644
--- a/inventory/host_vars/ch-apps/vars.yml
+++ b/inventory/host_vars/ch-apps/vars.yml
@@ -141,7 +141,7 @@ kubelet_storage:
quota: 10G
'syncoid:sync': 'false'
-kubernetes_version: 1.30.3
+kubernetes_version: 1.30.4
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 42
kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/ch-companion-raspi.yml b/inventory/host_vars/ch-companion-raspi.yml
index d8134f27..d82f5b8e 100644
--- a/inventory/host_vars/ch-companion-raspi.yml
+++ b/inventory/host_vars/ch-companion-raspi.yml
@@ -29,7 +29,7 @@ docker_pkg_provider: docker-com
docker_plugins:
- buildx
-kubernetes_version: 1.30.3
+kubernetes_version: 1.30.4
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 42
kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml
index 8534d2fb..1782ceea 100644
--- a/inventory/host_vars/ch-dione.yml
+++ b/inventory/host_vars/ch-dione.yml
@@ -49,7 +49,7 @@ kubelet_storage:
size: 5G
fs: ext4
-# kubernetes_version: 1.30.3
+# kubernetes_version: 1.30.4
# kubernetes_container_runtime: docker
# kubernetes_standalone_max_pods: 42
# kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/ch-equinox-t450s.yml b/inventory/host_vars/ch-equinox-t450s.yml
index b34d1ae6..869bcac8 100644
--- a/inventory/host_vars/ch-equinox-t450s.yml
+++ b/inventory/host_vars/ch-equinox-t450s.yml
@@ -262,6 +262,8 @@ ws_base_extra_packages:
- texlive-lang-german
- texlive-latex-extra
- tlp
+ - tor
+ - tor-geoipdb
- torbrowser-launcher
- totem
- unrar
@@ -296,9 +298,6 @@ ws_base_extra_packages:
- grype
# needs apt-repo/ansible
- ansible
- ### needs apt-repo/tor-project -> https://gitlab.torproject.org/tpo/core/tor/-/issues/40946
- ##- tor
- ##- tor-geoipdb
# needs apt-repo/kubernetes
- kubectl
# needs apt-repo/element
diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml
index 8c55d382..70faf7be 100644
--- a/inventory/host_vars/ch-equinox-ws.yml
+++ b/inventory/host_vars/ch-equinox-ws.yml
@@ -26,7 +26,7 @@ network:
nameservers: "{{ network_zones.lan.dns }}"
domain: "{{ host_domain }}"
primary: &_network_primary_
- name: enp9s0
+ name: enp11s0
address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}"
gateway: "{{ network_zones.lan.gateway }}"
interfaces:
@@ -264,6 +264,8 @@ ws_base_extra_packages:
- texlive
- texlive-lang-german
- texlive-latex-extra
+ - tor
+ - tor-geoipdb
- torbrowser-launcher
- totem
- unrar
@@ -297,9 +299,6 @@ ws_base_extra_packages:
- grype
# needs apt-repo/ansible
- ansible
- ### needs apt-repo/tor-project -> https://gitlab.torproject.org/tpo/core/tor/-/issues/40946
- ##- tor
- ##- tor-geoipdb
# needs apt-repo/kubernetes
- kubectl
# needs apt-repo/element
diff --git a/inventory/host_vars/ch-helene.yml b/inventory/host_vars/ch-helene.yml
index 61d4f7ef..52b3a3f9 100644
--- a/inventory/host_vars/ch-helene.yml
+++ b/inventory/host_vars/ch-helene.yml
@@ -49,7 +49,7 @@ kubelet_storage:
size: 5G
fs: ext4
-# kubernetes_version: 1.30.3
+# kubernetes_version: 1.30.4
# kubernetes_container_runtime: docker
# kubernetes_standalone_max_pods: 42
# kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/ch-mimas.yml b/inventory/host_vars/ch-mimas.yml
index bc09509d..d2ad251b 100644
--- a/inventory/host_vars/ch-mimas.yml
+++ b/inventory/host_vars/ch-mimas.yml
@@ -63,7 +63,7 @@ wireguard_p2p_peers:
- pub_key: "9pUDet+les5aI9UnHHVgyw95hNBxlAX8DBCxTjigpEI="
endpoint:
host: "{{ network_zones.magenta.prefix | ansible.utils.ipaddr(network_zones.magenta.offsets['ch-router']) | ansible.utils.ipaddr('address') }}"
- port: 51820
+ port: 5182
allowed_ips:
- "{{ network_zones.remote.prefix }}"
- "{{ network_zones.svc.prefix }}"
diff --git a/inventory/host_vars/mz-ap.yml b/inventory/host_vars/ch-mz-ap.yml
index 044f41f9..044f41f9 100644
--- a/inventory/host_vars/mz-ap.yml
+++ b/inventory/host_vars/ch-mz-ap.yml
diff --git a/inventory/host_vars/mz-router.yml b/inventory/host_vars/ch-mz-router.yml
index 254aaf02..c798623b 100644
--- a/inventory/host_vars/mz-router.yml
+++ b/inventory/host_vars/ch-mz-router.yml
@@ -1,10 +1,4 @@
---
-## TOOD:
-# After router upgrades run this command to generate a new dyndns ssh key
-# $ dropbearkey -t ed25519 -f /etc/dyndns/id_ed25519
-# Then replace the key at the dyndns server (/var/lib/dyndns/.ssh/authorized_keys)
-# after that run the dyndns update script manually to accept the ssh host-key
-
openwrt_arch: ath79
openwrt_target: generic
openwrt_profile: tplink_tl-wdr4300-v1
diff --git a/inventory/host_vars/ch-pan.yml b/inventory/host_vars/ch-pan.yml
index 29ec85ae..2b7fc39b 100644
--- a/inventory/host_vars/ch-pan.yml
+++ b/inventory/host_vars/ch-pan.yml
@@ -58,7 +58,7 @@ wireguard_p2p_peers:
- pub_key: "9pUDet+les5aI9UnHHVgyw95hNBxlAX8DBCxTjigpEI="
endpoint:
host: "{{ network_zones.magenta.prefix | ansible.utils.ipaddr(network_zones.magenta.offsets['ch-router']) | ansible.utils.ipaddr('address') }}"
- port: 51820
+ port: 5182
allowed_ips:
- "{{ network_zones.remote.prefix }}"
- "{{ network_zones.svc.prefix }}"
@@ -88,7 +88,7 @@ dyndns:
- "dyn.schaaas.at. 7200 IN AAAA 2a02:3e0:407::19"
- "captive.schaaas.at. 7200 IN CNAME dyn.schaaas.at."
clients:
- mz-router: mzl
+ ch-mz-router: mzl
ch-equinox-t450s: equinox
ele-media: elemedia
diff --git a/inventory/host_vars/ch-router.yml b/inventory/host_vars/ch-router.yml
index 3f31bcbe..aaa46bb2 100644
--- a/inventory/host_vars/ch-router.yml
+++ b/inventory/host_vars/ch-router.yml
@@ -185,7 +185,7 @@ openwrt_mixin:
ip protocol icmp accept
ip6 nexthdr ipv6-icmp accept
tcp dport { {{ ansible_port }} } accept
- udp dport { openvpn, 51820 } accept
+ udp dport { openvpn, 5182 } accept
}
chain input_openvpn {
@@ -368,7 +368,7 @@ openwrt_uci:
options:
proto: wireguard
private_key: "{{ vault_wireguard_remote_private_key }}"
- listen_port: 51820
+ listen_port: 5182
addresses:
- "{{ network_zones.remote.prefix | ansible.utils.ipaddr(network_zones.remote.offsets[inventory_hostname]) }}"
nohostroute: 1
@@ -404,8 +404,8 @@ openwrt_uci:
options:
enabled: '1'
interface: 'eth1'
- download: '147000'
- upload: '20000'
+ download: '510000'
+ upload: '72000'
qdisc: 'cake'
script: 'piece_of_cake.qos'
qdisc_advanced: '0'
diff --git a/inventory/host_vars/ele-calypso.yml b/inventory/host_vars/ele-calypso.yml
index 90e92097..8da4c4af 100644
--- a/inventory/host_vars/ele-calypso.yml
+++ b/inventory/host_vars/ele-calypso.yml
@@ -74,7 +74,7 @@ kubelet_storage:
size: 5G
fs: ext4
-kubernetes_version: 1.30.3
+kubernetes_version: 1.30.4
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 42
kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/ele-companion-raspi.yml b/inventory/host_vars/ele-companion-raspi.yml
index 7d130639..b25acb27 100644
--- a/inventory/host_vars/ele-companion-raspi.yml
+++ b/inventory/host_vars/ele-companion-raspi.yml
@@ -29,7 +29,7 @@ docker_pkg_provider: docker-com
docker_plugins:
- buildx
-kubernetes_version: 1.30.3
+kubernetes_version: 1.30.4
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 42
kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/ele-coturn.yml b/inventory/host_vars/ele-coturn.yml
index f966ac9e..1cbc2767 100644
--- a/inventory/host_vars/ele-coturn.yml
+++ b/inventory/host_vars/ele-coturn.yml
@@ -27,7 +27,7 @@ acme_directory_server: "{{ acme_directory_server_le_live_v2 }}"
acme_client: acmetool
-kubernetes_version: 1.30.3
+kubernetes_version: 1.30.4
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 100
kubernetes_standalone_pod_cidr: 192.168.255.0/24
diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml
index 6eef576d..76f7978c 100644
--- a/inventory/host_vars/ele-helene.yml
+++ b/inventory/host_vars/ele-helene.yml
@@ -92,7 +92,7 @@ kubelet_storage:
size: 5G
fs: ext4
-kubernetes_version: 1.30.3
+kubernetes_version: 1.30.4
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 42
kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/ele-jitsi.yml b/inventory/host_vars/ele-jitsi.yml
index ea446019..4fe526c0 100644
--- a/inventory/host_vars/ele-jitsi.yml
+++ b/inventory/host_vars/ele-jitsi.yml
@@ -32,7 +32,7 @@ acme_directory_server: "{{ acme_directory_server_le_live_v2 }}"
acme_client: acmetool
-kubernetes_version: 1.30.3
+kubernetes_version: 1.30.4
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 100
kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml
index e97e1671..d0fe5e2f 100644
--- a/inventory/host_vars/ele-media.yml
+++ b/inventory/host_vars/ele-media.yml
@@ -73,7 +73,7 @@ kubelet_storage:
size: 5G
fs: ext4
-kubernetes_version: 1.30.3
+kubernetes_version: 1.30.4
kubernetes_container_runtime: docker
kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml
index 2911be57..8d00359e 100644
--- a/inventory/host_vars/ele-thetys.yml
+++ b/inventory/host_vars/ele-thetys.yml
@@ -77,7 +77,7 @@ kubelet_storage:
size: 5G
fs: ext4
-kubernetes_version: 1.30.3
+kubernetes_version: 1.30.4
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 42
kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/glt-jitsi.yml b/inventory/host_vars/glt-jitsi.yml
index 2e36c347..69e51909 100644
--- a/inventory/host_vars/glt-jitsi.yml
+++ b/inventory/host_vars/glt-jitsi.yml
@@ -27,7 +27,7 @@ acme_directory_server: "{{ acme_directory_server_le_live_v2 }}"
acme_client: acmetool
-kubernetes_version: 1.30.3
+kubernetes_version: 1.30.4
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 100
kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml
index 5f2897c9..8f03e497 100644
--- a/inventory/host_vars/s2-thetys.yml
+++ b/inventory/host_vars/s2-thetys.yml
@@ -53,7 +53,7 @@ kubelet_storage:
size: 5G
fs: ext4
-kubernetes_version: 1.30.3
+kubernetes_version: 1.30.4
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 42
kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/sk-cloudio/collabora.yml b/inventory/host_vars/sk-cloudio/collabora.yml
index 93cab2eb..5910da27 100644
--- a/inventory/host_vars/sk-cloudio/collabora.yml
+++ b/inventory/host_vars/sk-cloudio/collabora.yml
@@ -1,11 +1,17 @@
---
-collabora_code_base_path: /srv/storage/collabora/code
-
collabora_code_instances:
o.skillz.biz:
- version: 23.05.6.4.1
+ version: 24.04.6.2.1
port: 8200
- hostname: o.skillz.biz
+ storage:
+ type: directory
+ dest: /srv/storage/collabora/code/o.skillz.biz
+ publish:
+ zone: "{{ apps_publish_zone__sk_cloudio }}"
+ hostnames:
+ - o.skillz.biz
+ tls:
+ certificate_provider: acmetool
admin:
username: admin
password: "{{ vault_collabora_code_admin_passwords['o.skillz.biz'] }}"
diff --git a/inventory/host_vars/sk-cloudio/etherpad.yml b/inventory/host_vars/sk-cloudio/etherpad.yml
deleted file mode 100644
index a368be44..00000000
--- a/inventory/host_vars/sk-cloudio/etherpad.yml
+++ /dev/null
@@ -1,58 +0,0 @@
----
-etherpad_lite_zfs:
- pool: storage
- name: etherpad-lite
- properties:
- compression: lz4
-
-etherpad_lite_instances:
- pad.elevate.at:
- version: c65c5f17aa26c9179ce591f44721861ba6f6bec4-elevate
- port: 8300
- hostnames:
- - pad.elevate.at
- zfs_properties:
- quota: 5G
- settings:
- title: Elevate Etherpad
- users:
- admin:
- is_admin: true
- password: "{{ vault_etherpad_lite_user_passwords['pad.elevate.at']['admin'] }}"
- user:
- is_admin: false
- password: "{{ vault_etherpad_lite_user_passwords['pad.elevate.at']['user'] }}"
-
- defaultPadText: "Welcome to the ELEVATE - Etherpad!\n\nThis pad text is synchronized\
- \ as you type, so that everyone viewing this page sees the same text. This allows\
- \ you to collaborate seamlessly on documents!\n\nGet involved with Etherpad at http://etherpad.org\n\
- \n IMPORTANT: THIS PAD IS PRIVIDED FOR FREE TO THE PUBLIC! There is no guarantee\
- \ for your data - please take care of backups yourself! This is usually intended\
- \ only for the Elevate Team and it might get access control in the future! If you\
- \ are interested in having a PAD for your project, please get back to dan@elevate.at\
- \ for information. It can be made available!"
- favicon: favicon.ico
-
- maxAge: 21600
- editOnly: false
- minify: true
- requireSession: false
- requireAuthentication: false
- requireAuthorization: false
- socketTransportProtocols: [xhr-polling, jsonp-polling, htmlfile]
- abiword: null
- loglevel: INFO
- logconfig:
- appenders:
- - type: console
- dbType: "mysql"
- dbSettings:
- host: "127.0.0.1"
- user: "etherpad-lite"
- password: "{{ vault_etherpad_lite_database_passwords['pad.elevate.at'] }}"
- database: "etherpad-lite"
- charset: "utf8mb4"
- database:
- type: mariadb
- version: 10.4.22
- password: "{{ vault_etherpad_lite_database_passwords['pad.elevate.at'] }}"
diff --git a/inventory/host_vars/sk-cloudio/nextcloud.yml b/inventory/host_vars/sk-cloudio/nextcloud.yml
index 13d29815..3c5e5ae0 100644
--- a/inventory/host_vars/sk-cloudio/nextcloud.yml
+++ b/inventory/host_vars/sk-cloudio/nextcloud.yml
@@ -1,94 +1,116 @@
---
-nextcloud_zfs:
+_nextcloud_zfs_base_:
pool: storage
name: nextcloud
- properties:
- compression: lz4
nextcloud_instances:
- luzesombra.skillz.biz:
- # new: true
- version: 29.0.4
- port: 8100
- hostnames:
- - luzesombra.skillz.biz
- zfs_properties:
- quota: 200G
- redis:
- version: 7.2.1
- database:
- type: mariadb
- version: 11.1.2
- password: "{{ vault_nextcloud_database_passwords['luzesombra.skillz.biz'] }}"
- insomnia.skillz.biz:
- # new: true
- version: 29.0.4
- port: 8101
- hostnames:
- - insomnia.skillz.biz
- zfs_properties:
- quota: 400G
- redis:
- version: 7.2.1
- database:
- type: mariadb
- version: 10.11.5
- password: "{{ vault_nextcloud_database_passwords['insomnia.skillz.biz'] }}"
- nc.skillz.biz:
- # new: true
- version: 29.0.4
- port: 8102
- hostnames:
- - nc.skillz.biz
- zfs_properties:
- quota: 200G
- redis:
- version: 7.2.1
- database:
- type: mariadb
- version: 10.11.5
- password: "{{ vault_nextcloud_database_passwords['nc.skillz.biz'] }}"
- extra_args:
- - "--log_bin_trust_function_creators=true"
- custom_image:
- dockerfile: |
- RUN set -x \
- && apt-get update -q \
- && apt-get install -y -q ffmpeg \
- && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
- visuals.pixeldada.com:
- # new: true
- version: 29.0.4
- port: 8103
- hostnames:
- - visuals.pixeldada.com
- zfs_properties:
- quota: 100G
- redis:
- version: 7.2.4
- database:
- type: mariadb
- version: 11.3.2
- password: "{{ vault_nextcloud_database_passwords['visuals.pixeldada.com'] }}"
- extra_args:
- - "--log_bin_trust_function_creators=true"
- custom_image:
- dockerfile: |
- RUN set -x \
- && apt-get update -q \
- && apt-get install -y -q ffmpeg \
- && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+# luzesombra.skillz.biz:
+# # new: true
+# version: 29.0.4
+# port: 8100
+# hostnames:
+# - luzesombra.skillz.biz
+# storage:
+# type: zfs
+# parent: "{{ _nextcloud_zfs_base_ }}"
+# name: luzesombra.skillz.biz
+# properties:
+# quota: 200G
+# redis:
+# version: 7.2.1
+# database:
+# type: mariadb
+# version: 11.1.2
+# password: "{{ vault_nextcloud_database_passwords['luzesombra.skillz.biz'] }}"
+# insomnia.skillz.biz:
+# # new: true
+# version: 29.0.4
+# port: 8101
+# hostnames:
+# - insomnia.skillz.biz
+# storage:
+# type: zfs
+# parent: "{{ _nextcloud_zfs_base_ }}"
+# name: insomnia.skillz.biz
+# properties:
+# quota: 400G
+# redis:
+# version: 7.2.1
+# database:
+# type: mariadb
+# version: 10.11.5
+# password: "{{ vault_nextcloud_database_passwords['insomnia.skillz.biz'] }}"
+# nc.skillz.biz:
+# # new: true
+# version: 29.0.4
+# port: 8102
+# hostnames:
+# - nc.skillz.biz
+# storage:
+# type: zfs
+# parent: "{{ _nextcloud_zfs_base_ }}"
+# name: nc.skillz.biz
+# properties:
+# quota: 200G
+# redis:
+# version: 7.2.1
+# database:
+# type: mariadb
+# version: 10.11.5
+# password: "{{ vault_nextcloud_database_passwords['nc.skillz.biz'] }}"
+# extra_args:
+# - "--log_bin_trust_function_creators=true"
+# custom_image:
+# dockerfile: |
+# RUN set -x \
+# && apt-get update -q \
+# && apt-get install -y -q ffmpeg \
+# && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+# visuals.pixeldada.com:
+# # new: true
+# version: 29.0.4
+# port: 8103
+# hostnames:
+# - visuals.pixeldada.com
+# storage:
+# type: zfs
+# parent: "{{ _nextcloud_zfs_base_ }}"
+# name: visuals.pixeldada.com
+# properties:
+# quota: 100G
+# redis:
+# version: 7.2.4
+# database:
+# type: mariadb
+# version: 11.3.2
+# password: "{{ vault_nextcloud_database_passwords['visuals.pixeldada.com'] }}"
+# extra_args:
+# - "--log_bin_trust_function_creators=true"
+# custom_image:
+# dockerfile: |
+# RUN set -x \
+# && apt-get update -q \
+# && apt-get install -y -q ffmpeg \
+# && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
wolke.elev8.at:
# new: true
version: 29.0.3
port: 8105
- hostnames:
- - wolke.elev8.at
- zfs_properties:
- quota: 10G
+ storage:
+ type: zfs
+ parent: "{{ _nextcloud_zfs_base_ }}"
+ name: wolke.elev8.at
+ properties:
+ quota: 10G
redis:
version: 7.2.1
database:
type: mariadb
version: 10.11.5
password: "{{ vault_nextcloud_database_passwords['wolke.elev8.at'] }}"
+ publish:
+ zone: "{{ apps_publish_zone__sk_cloudio }}"
+ hostnames:
+ - wolke.elev8.at
+ tls:
+ certificate_provider: acmetool
diff --git a/inventory/host_vars/sk-cloudio/onlyoffice.yml b/inventory/host_vars/sk-cloudio/onlyoffice.yml
index 11f82abe..d8d3da82 100644
--- a/inventory/host_vars/sk-cloudio/onlyoffice.yml
+++ b/inventory/host_vars/sk-cloudio/onlyoffice.yml
@@ -1,20 +1,30 @@
---
-onlyoffice_zfs:
+_onlyoffice_zfs_base_:
pool: storage
name: onlyoffice
properties:
compression: lz4
- quota: 5G
onlyoffice_instances:
office.elev8.at:
- version: 8.1.0.1
+ version: 8.1.1.2
port: 8600
- hostname: office.elev8.at
jwt_secret: "{{ vault_onlyoffice_jwt_secrets['office.elev8.at'] }}"
+ storage:
+ type: zfs
+ parent: "{{ _onlyoffice_zfs_base_ }}"
+ name: office.elev8.at
+ properties:
+ quota: 5G
database:
- version: 12.19
+ version: 12.20
password: "{{ vault_onlyoffice_database_passwords['office.elev8.at'] }}"
amqp:
- version: 3.13.4
+ version: 3.13.7
password: "{{ vault_onlyoffice_amqp_passwords['office.elev8.at'] }}"
+ publish:
+ zone: "{{ apps_publish_zone__sk_cloudio }}"
+ hostnames:
+ - office.elev8.at
+ tls:
+ certificate_provider: acmetool
diff --git a/inventory/host_vars/sk-cloudio/pigallery2.yml b/inventory/host_vars/sk-cloudio/pigallery2.yml
deleted file mode 100644
index 2a7d5c84..00000000
--- a/inventory/host_vars/sk-cloudio/pigallery2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-pigallery2_zfs:
- pool: storage
- name: pigallery2
- properties:
- compression: lz4
-
-pigallery2_instances:
- pix.elevate.at:
- version: 1.9.3
- port: 8700
- hostname: pix.elevate.at
- zfs_properties:
- quota: 5G
- images_paths:
- 2019: /srv/storage/nextcloud/wolke.elevate.at/nextcloud/data/__groupfolders/1/Editions_from_2014/Fotos_Editions/2019/
- 2020: /srv/storage/nextcloud/wolke.elevate.at/nextcloud/data/__groupfolders/1/Editions_from_2014/Fotos_Editions/2020/
- 2021: /srv/storage/nextcloud/wolke.elevate.at/nextcloud/data/__groupfolders/1/Editions_from_2014/Fotos_Editions/2021/
- 2022: /srv/storage/nextcloud/wolke.elevate.at/nextcloud/data/__groupfolders/1/Editions_from_2014/Fotos_Editions/2022/
- 2023: /srv/storage/nextcloud/wolke.elevate.at/nextcloud/data/__groupfolders/1/Editions_from_2014/Fotos_Editions/2023/
diff --git a/inventory/host_vars/sk-cloudio/vars.yml b/inventory/host_vars/sk-cloudio/vars.yml
index 058c785f..be136e82 100644
--- a/inventory/host_vars/sk-cloudio/vars.yml
+++ b/inventory/host_vars/sk-cloudio/vars.yml
@@ -1,19 +1,43 @@
---
-system_lvm_volume_size_root: 3584M
+system_lvm_volume_size_root: 4G
system_lvm_volume_size_varlog: 5G
install:
- cloud:
- credentials: "{{ vault_hroot_robot_account }}"
- server_name: "{{ host_name }}"
+ vm:
+ memory: 48G
+ numcpus: 12
+ autostart: True
disks:
- primary: software-raid
- raid:
- level: 1
- members:
- - /dev/nvme0n1
- - /dev/nvme1n1
- system_lvm:
- size: 15G
+ primary: /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-0
+ scsi:
+ sda:
+ type: zfs
+ name: root
+ size: 15g
+ sdb:
+ type: zfs
+ name: data
+ size: 900g
+ properties:
+ 'syncoid:sync': 'false'
+ interfaces:
+ - bridge: br-public
+ name: primary0
+
+network:
+ nameservers: "{{ vm_host.network.dns }}"
+ domain: "{{ host_domain }}"
+ systemd_link:
+ interfaces: "{{ install.interfaces }}"
+ primary: &_network_primary_
+ name: primary0
+ address: "{{ vm_host.network.bridges.public.prefix | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) }}"
+ gateway: "{{ vm_host.network.bridges.public.prefix | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ansible.utils.ipaddr('address') }}"
+ template: overlay
+ overlay: "{{ (vm_host.network.bridges.public.overlays.default.prefix | ansible.utils.ipaddr(vm_host.network.bridges.public.overlays.default.offsets[inventory_hostname])).split('/')[0] }}"
+ interfaces:
+ - *_network_primary_
+
+external_ip: "{{ network.primary.overlay }}"
apt_repo_components:
@@ -22,7 +46,6 @@ apt_repo_components:
- non-free-firmware
spreadspace_apt_repo_components:
- - main
- container
@@ -33,20 +56,23 @@ zfs_arc_size:
zfs_pools:
storage:
mountpoint: /srv/storage
- create_vdevs: mirror /dev/nvme0n1p3 /dev/nvme1n1p3
+ create_vdevs: /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0-0-0-1
properties:
ashift: 12
autotrim: "on"
+zfs_volumes:
+ storage:
+ nextcloud:
+ properties:
+ compression: lz4
+ xattr: sa
+
zfs_sanoid_modules:
storage/nextcloud:
use_template: production
recursive: yes
process_children_only: yes
- storage/etherpad-lite:
- use_template: production
- recursive: yes
- process_children_only: yes
storage/keycloak:
use_template: production
recursive: yes
@@ -58,6 +84,8 @@ zfs_sanoid_modules:
docker_pkg_provider: docker-com
+docker_plugins:
+ - buildx
docker_storage:
type: zfs
@@ -73,7 +101,7 @@ kubelet_storage:
properties:
quota: 20G
-kubernetes_version: 1.30.3
+kubernetes_version: 1.30.4
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 100
kubernetes_standalone_pod_cidr: 192.168.255.0/24
@@ -94,8 +122,43 @@ postfix_base_inet_protocols:
acme_directory_server: "{{ acme_directory_server_le_live_v2 }}"
acme_client: acmetool
-## TODO: remove once migration of elevate services has been done
-ssh_users_root:
- - equinox
- - dan
- - brt
+
+sk_cloudio_apps_publish_ca_key: "{{ vault_sk_cloudio_apps_publish_ca_key }}"
+sk_cloudio_apps_publish_ca_cert: |
+ -----BEGIN CERTIFICATE-----
+ MIIE+DCCAuCgAwIBAgIUWYAlW7BhaDHZaWjkVlttP26KVhgwDQYJKoZIhvcNAQEL
+ BQAwKTEnMCUGA1UEAwweQXBwcyBQdWJsaXNoIENBIGZvciBzay1jbG91ZGlvMCAX
+ DTI0MDgyNDIwNDEzNloYDzIwNjQwNzA2MjA0MTM2WjApMScwJQYDVQQDDB5BcHBz
+ IFB1Ymxpc2ggQ0EgZm9yIHNrLWNsb3VkaW8wggIiMA0GCSqGSIb3DQEBAQUAA4IC
+ DwAwggIKAoICAQDUOVJTgNrqTlD6FXupVLIoMbQ7O9Xj3XmtYGVtF6LUPodbrlTs
+ 9TRkhWwVSUGokfgRtKOx1Zk13HFadKw92t9zzTVnT62drH9xOPPGitBXyxeCiyzr
+ Ib98qnDeO9o+9x0cRsg4tvjksfyMV0JtFxOsSJ6diHrGrakk9SIRVk63GYbRSKBQ
+ wKCeAihFX35oyd3qCmIt6ZuueX5Z2dNdiaXmcrwe0MhBghd4Upqe3BPopGeVzJtY
+ Bm6Fsq/V2H28g6l3kNU5sPpgPWMpDRuUTjnfe1MFVu51QwmbkxqWhODaH8dClshJ
+ imACGnRmTxJ5bAqBbT2z3IEdhaEnKKUyN8OYqX3mtmU1/We9d52cLvghtbiRuhrE
+ 4eK7GRCvc0QqU/hk6eFvfXVd5KI48tB8at9tKP6tWeavlYyfq5G3canmzOTTbxuA
+ TfpbFrHIwHCk9M3VTIcABMeb38EGoOpaSTTcX3eOT/k97tQJPKFlfl+EF+fhbijN
+ 1CEdR+6m2BIvcNmGkKl0VH6eVXiAUFKm03Kg1sH0gh4upQKdx+54szF51jsrHcPI
+ 16oBChS0t+JG1tcvbluVWwLMw1G5nvm302/RxYahNyCniMAUl/eaubTHarTBtK7w
+ lAYryanwtlbAR/XQZAHBNzhG/2er1nCr6E5Wh+98ID+ElWbmaQ5ale/8OQIDAQAB
+ oxYwFDASBgNVHRMBAf8ECDAGAQH/AgEBMA0GCSqGSIb3DQEBCwUAA4ICAQCpTUjN
+ veOg2dZ/44tg5P5RnZKZFiyYapaaxv3W6cfqpfUhrI8qSuBn9G/UAJAfMszU87rf
+ OZ1PRZCFuzu+dB7CrmMgvqt0cTRpaxlN9CzZpfpFADlt9NQKYxK4T8IxIZ7ebISl
+ UNyX08mRXNB3N+Qq1CcTVtwHNLbnwkLttryGJ1tmAwEu4QIHauG7cDXFQuRGP0CE
+ x+DSdLTcs6hvOYq4OfpX0Zci5zy4SI50DLoT5h94IaIPAL6XBi7n9bj8ZSHqa1ZC
+ lveyaGguEy53meARTXSCm/jxtpo8xD7pWz4vnYPZuyMGe9rbE77Y8CwWK/RvUdYx
+ th09ALKw76W59e78RkxKTqBvGmZYw1igY4p8IqcXci65xtO2HiRDHX2jU7AYkgAD
+ z5Rv+2ZMcOQHOPzxDRXk06+pQUZ3qQ3cU9ASziTSaLITnMVH0VokRNXvSZYxeuwR
+ yDqb1H4MsV91Sy4UyXmtfXZYouM3/3OwCzxpkgvxdVdQBzssUssLrRcS5UEcJGr8
+ 69M2CNHXX1fy0mLKdgqHNPzX9ALnqTHJMV5C5J3Q4RU6Vl2Un3Vg3A3dRKLPkg5P
+ C69nyBua3CIlx6Z8o2Ik9tJdwCULV6lYLGEfpsJHt627gF893Jexxuo3zI7XWQhb
+ ucrEkA2qzf0fHzCwFeiACMjssiN1YyevdI4Flw==
+ -----END CERTIFICATE-----
+
+apps_publish_zone__sk_cloudio:
+ name: sk-cloudio
+ publisher: sk-cloudio
+ certificate_provider: static-ca
+ certificate_ca_config:
+ cert_content: "{{ sk_cloudio_apps_publish_ca_cert }}"
+ key_content: "{{ sk_cloudio_apps_publish_ca_key }}"
diff --git a/inventory/host_vars/sk-testvm.yml b/inventory/host_vars/sk-testvm.yml
index 0c45dfcb..d728464d 100644
--- a/inventory/host_vars/sk-testvm.yml
+++ b/inventory/host_vars/sk-testvm.yml
@@ -56,7 +56,7 @@ kubelet_storage:
size: 1G
fs: ext4
-kubernetes_version: 1.30.3
+kubernetes_version: 1.30.4
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 100
kubernetes_standalone_pod_cidr: 192.168.255.0/24
diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml
index 1ace246f..01cf6e8c 100644
--- a/inventory/host_vars/sk-tomnext-nc.yml
+++ b/inventory/host_vars/sk-tomnext-nc.yml
@@ -88,7 +88,7 @@ kubelet_storage:
properties:
quota: 15G
-kubernetes_version: 1.30.3
+kubernetes_version: 1.30.4
kubernetes_container_runtime: docker
kubernetes_standalone_max_pods: 15
kubernetes_standalone_cni_variant: with-portmap
@@ -148,13 +148,15 @@ nextcloud_instances:
&& docker-php-ext-enable smbclient \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-collabora_code_base_path: /srv/storage/collabora/code
collabora_code_instances:
o.tomwaitz.eu:
version: 23.05.6.4.1
port: 8200
hostname: o.tomwaitz.eu
+ storage:
+ type: directory
+ dest: /srv/storage/collabora/code/o.tomwaitz.eu
admin:
username: admin
password: "{{ vault_collabora_code_admin_passwords['o.tomwaitz.eu'] }}"
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 60f41c10..f4c61e2a 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -71,8 +71,8 @@ chaos-at-home-sensors
chaos-at-home-ups
[chaos-at-home_mz]
-mz-router ansible_host=chmz-router
-mz-ap ansible_host=chmz-ap
+ch-mz-router host_name=mz-router
+ch-mz-ap host_name=mz-ap
[chaos-at-home_mur-at]
ch-atlas host_name=atlas
@@ -328,8 +328,8 @@ ch-testvm-openwrt
ch-installsmb
ch-gw-c3voc
ch-raspi-openwrt
-mz-ap
-mz-router
+ch-mz-ap
+ch-mz-router
ele-router-hmtsaal
ele-router-orpheum
ele-router-emc
diff --git a/roles/apps/collabora/code/contrib/extract-coolwsdxml.sh b/roles/apps/collabora/code/contrib/extract-coolwsdxml.sh
index 3f1a2f9e..26496ea7 100755
--- a/roles/apps/collabora/code/contrib/extract-coolwsdxml.sh
+++ b/roles/apps/collabora/code/contrib/extract-coolwsdxml.sh
@@ -8,7 +8,7 @@ VERSION="$1"
IMAGE_TAG="$VERSION"
IMAGE_NAME="collabora/code"
-CONF_D=$(realpath "${BASH_SOURCE%/*}/../templates/config")
+CONF_D=$(realpath "${BASH_SOURCE%/*}/../instance/templates/config")
CONTAINER_NAME="collabora-code-coolwsd.xml-extractor"
sudo docker rm "$CONTAINER_NAME" > /dev/null 2>&1
diff --git a/roles/apps/collabora/code/contrib/extract-loolwsdxml.sh b/roles/apps/collabora/code/contrib/extract-loolwsdxml.sh
deleted file mode 100755
index ab4e5fb4..00000000
--- a/roles/apps/collabora/code/contrib/extract-loolwsdxml.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/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 ef0699c1..932c2168 100644
--- a/roles/apps/collabora/code/defaults/main.yml
+++ b/roles/apps/collabora/code/defaults/main.yml
@@ -1,22 +1,27 @@
---
-collabora_code_base_path: /srv/collabora/code
-
# collabora_code_instances:
# example:
# version: 4.0.6.1
# port: 8200
-# hostname: office.example.com
+# storage:
+# type: ...
+# publish:
+# zone: "{{ apps_publish_zone__foo }}"
+# hostnames:
+# - office.example.com
+# tls:
+# certificate_provider: ...
# admin:
# username: admin
# password: S3cret
-# backend_storages:
-# - cloud.example.com
-# macros: # optional (by default allowed=false)
-# allowed: true
-# security_level: 1
-# custom_image: # optional
-# from: foo/bar:1.0 # optional
-# dockerfile: |
-# USER root
-# RUN apt-get install ...
-# USER 101
+# backend_storages:
+# - cloud.example.com
+# macros: # optional (by default allowed=false)
+# allowed: true
+# security_level: 1
+# custom_image: # optional
+# from: foo/bar:1.0 # optional
+# dockerfile: |
+# USER root
+# RUN apt-get install ...
+# USER 101
diff --git a/roles/apps/collabora/code/filter_plugins/collabora_code.py b/roles/apps/collabora/code/filter_plugins/collabora_code.py
deleted file mode 100644
index 2bd6959e..00000000
--- a/roles/apps/collabora/code/filter_plugins/collabora_code.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-from ansible import errors
-
-
-def collabora_code_loolvcool(version):
- try:
- ver_maj = version.split('.')[0]
- if int(ver_maj) > 6:
- return False
- return True
- except Exception as e:
- raise errors.AnsibleFilterError("collabora_code_loolvcool(): %s" % str(e))
-
-
-class FilterModule(object):
-
- ''' collabora code filters '''
- filter_map = {
- 'collabora_code_loolvcool': collabora_code_loolvcool,
- }
-
- def filters(self):
- return self.filter_map
diff --git a/roles/apps/collabora/code/instance/tasks/custom-image.yml b/roles/apps/collabora/code/instance/tasks/custom-image.yml
new file mode 100644
index 00000000..212fff36
--- /dev/null
+++ b/roles/apps/collabora/code/instance/tasks/custom-image.yml
@@ -0,0 +1,24 @@
+---
+- name: create build directory for custom image
+ file:
+ path: "{{ collabora_code_instance_basepath }}/build"
+ state: directory
+
+- name: generate Dockerfile for custom image
+ copy:
+ content: |
+ FROM {{ collabora_code_instances[collabora_code_instance].custom_image.from | default('collabora/code:' + collabora_code_instances[collabora_code_instance].version) }}
+ {{ collabora_code_instances[collabora_code_instance].custom_image.dockerfile }}
+ dest: "{{ collabora_code_instance_basepath }}/build/Dockerfile"
+ register: collabora_code_custom_image_docker
+
+- name: build custom image
+ docker_image:
+ name: "collabora/code/{{ collabora_code_instance }}:{{ collabora_code_instances[collabora_code_instance].version }}"
+ state: present
+ force_source: "{{ collabora_code_custom_image_docker is changed }}"
+ source: build
+ build:
+ path: "{{ collabora_code_instance_basepath }}/build"
+ network: host
+ pull: yes
diff --git a/roles/apps/collabora/code/instance/tasks/main.yml b/roles/apps/collabora/code/instance/tasks/main.yml
new file mode 100644
index 00000000..b0470a5b
--- /dev/null
+++ b/roles/apps/collabora/code/instance/tasks/main.yml
@@ -0,0 +1,95 @@
+---
+- name: prepare storage volume
+ vars:
+ storage_volume: "{{ collabora_code_instances[collabora_code_instance].storage }}"
+ include_role:
+ name: "storage/{{ collabora_code_instances[collabora_code_instance].storage.type }}/volume"
+
+- set_fact:
+ collabora_code_instance_basepath: "{{ storage_volume_mountpoint }}"
+
+- name: create instance config directory
+ file:
+ path: "{{ collabora_code_instance_basepath }}/config"
+ state: directory
+ mode: 0750
+
+- name: generate configuration file
+ template:
+ src: "config/coolwsd.{{ collabora_code_instances[collabora_code_instance].version }}.xml.j2"
+ dest: "{{ collabora_code_instance_basepath }}/config/coolwsd.xml"
+
+- name: generate/install TLS certificates for publishment
+ vars:
+ x509_certificate_name: "collabora-code-{{ collabora_code_instance }}_publish"
+ x509_certificate_hostnames: []
+ x509_certificate_config:
+ ca: "{{ collabora_code_instances[collabora_code_instance].publish.zone.certificate_ca_config }}"
+ cert:
+ common_name: "collabora-code-{{ collabora_code_instance }}.{{ inventory_hostname }}"
+ extended_key_usage:
+ - serverAuth
+ extended_key_usage_critical: yes
+ create_subject_key_identifier: yes
+ not_after: +100w
+ x509_certificate_renewal:
+ install:
+ - dest: "{{ collabora_code_instance_basepath }}/config/ca-chain.cert.pem"
+ src:
+ - ca_cert
+ mode: "0400"
+ owner: 100
+ - dest: "{{ collabora_code_instance_basepath }}/config/cert.pem"
+ src:
+ - cert
+ mode: "0400"
+ owner: 100
+ - dest: "{{ collabora_code_instance_basepath }}/config/key.pem"
+ src:
+ - key
+ owner: 100
+ mode: "0400"
+ include_role:
+ name: "x509/{{ collabora_code_instances[collabora_code_instance].publish.zone.certificate_provider }}/cert"
+
+- name: build custom image
+ when: "'custom_image' in collabora_code_instances[collabora_code_instance]"
+ include_tasks: custom-image.yml
+
+- name: install pod manifest
+ vars:
+ kubernetes_standalone_pod:
+ name: "collabora-code-{{ collabora_code_instance }}"
+ spec: "{{ lookup('template', 'pod-spec.yml.j2') }}"
+ mode: "0600"
+ config_hash_items:
+ - path: "{{ collabora_code_instance_basepath }}/config/coolwsd.xml"
+ properties:
+ - checksum
+ include_role:
+ name: kubernetes/standalone/pod
+
+- name: render nginx-vhost custom config
+ set_fact:
+ collabora_code_nginx_vhost_custom: "{{ lookup('template', 'nginx-vhost.conf.j2') }}"
+
+- name: configure nginx vhost for publishment
+ vars:
+ nginx_vhost__yaml: |
+ name: "collabora-code-{{ collabora_code_instance }}.{{ inventory_hostname }}"
+ template: generic
+ {% if 'tls' in collabora_code_instances[collabora_code_instance].publish %}
+ tls:
+ {{ collabora_code_instances[collabora_code_instance].publish.tls | to_nice_yaml(indent=2) | indent(2) }}
+ {% endif %}
+ hostnames:
+ {% for hostname in collabora_code_instances[collabora_code_instance].publish.hostnames %}
+ - {{ hostname }}
+ {% endfor %}
+ custom: |
+ {{ collabora_code_nginx_vhost_custom | indent(2) }}
+ nginx_vhost: "{{ nginx_vhost__yaml | from_yaml }}"
+ include_role:
+ name: nginx/vhost
+ apply:
+ delegate_to: "{{ collabora_code_instances[collabora_code_instance].publish.zone.publisher }}"
diff --git a/roles/apps/collabora/code/templates/config/coolwsd.21.11.1.3.1.xml.j2 b/roles/apps/collabora/code/instance/templates/config/coolwsd.21.11.1.3.1.xml.j2
index 05e9e3fa..b902dea9 100644
--- a/roles/apps/collabora/code/templates/config/coolwsd.21.11.1.3.1.xml.j2
+++ b/roles/apps/collabora/code/instance/templates/config/coolwsd.21.11.1.3.1.xml.j2
@@ -13,7 +13,7 @@
<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>
<mount_jail_tree desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool" default="true"></mount_jail_tree>
- <server_name desc="External hostname:port of the server running coolwsd. If empty, it's derived from the request (please set it if this doesn't work). May be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string" default="">{{ item.value.hostname }}</server_name>
+ <server_name desc="External hostname:port of the server running coolwsd. If empty, it's derived from the request (please set it if this doesn't work). May be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string" default="">{{ collabora_code_instances[collabora_code_instance].publish.hostnames[0] }}</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 cool." type="path" relative="true" default="browser/../"></file_server_root_path>
<hexify_embedded_urls desc="Enable to protect encoded URLs from getting decoded by intermediate hops. Particularly useful on Azure deployments" type="bool" default="false"></hexify_embedded_urls>
@@ -163,8 +163,8 @@
<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>
<jwt_expiry_secs desc="Time in seconds before the Admin Console's JWT token expires" type="int" default="1800">1800</jwt_expiry_secs>
- <enable_macros_execution desc="Specifies whether the macro execution is enabled in general. This will enable Basic, Beanshell, Javascript and Python scripts. If it is set to false, the macro_security_level is ignored. If it is set to true, the mentioned entry specified the level of macro security." type="bool" default="false">{{ item.value.macros.allowed | default(false) | ternary('true', 'false') }}</enable_macros_execution>
- <macro_security_level desc="Level of Macro security. 1 (Medium) Confirmation required before executing macros from untrusted sources. 0 (Low, not recommended) All macros will be executed without confirmation." type="int" default="1">{{ item.value.macros.security_level | default('1') }}</macro_security_level>
+ <enable_macros_execution desc="Specifies whether the macro execution is enabled in general. This will enable Basic, Beanshell, Javascript and Python scripts. If it is set to false, the macro_security_level is ignored. If it is set to true, the mentioned entry specified the level of macro security." type="bool" default="false">{{ collabora_code_instances[collabora_code_instance].macros.allowed | default(false) | ternary('true', 'false') }}</enable_macros_execution>
+ <macro_security_level desc="Level of Macro security. 1 (Medium) Confirmation required before executing macros from untrusted sources. 0 (Low, not recommended) All macros will be executed without confirmation." type="int" default="1">{{ collabora_code_instances[collabora_code_instance].macros.security_level | default('1') }}</macro_security_level>
<enable_metrics_unauthenticated desc="When enabled, the /cool/getMetrics endpoint will not require authentication." type="bool" default="false">false</enable_metrics_unauthenticated>
</security>
@@ -191,7 +191,7 @@
<filesystem allow="false" />
<wopi desc="Allow/deny wopi storage." allow="true">
<host desc="Regex pattern of hostname to allow or deny." allow="true">localhost</host>
-{% for backend in item.value.backend_storages %}
+{% for backend in collabora_code_instances[collabora_code_instance].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>
@@ -214,8 +214,8 @@
<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 coolconfig to set up a secure password.">{{ item.value.admin.password }}</password>
+ <username desc="The username of the admin console. Ignored if PAM is enabled.">{{ collabora_code_instances[collabora_code_instance].admin.username }}</username>
+ <password desc="The password of the admin console. Deprecated on most platforms. Instead, use PAM or coolconfig to set up a secure password.">{{ collabora_code_instances[collabora_code_instance].admin.password }}</password>
</admin_console>
<monitors desc="Addresses of servers we connect to on start for monitoring">
diff --git a/roles/apps/collabora/code/templates/config/coolwsd.23.05.5.2.1.xml.j2 b/roles/apps/collabora/code/instance/templates/config/coolwsd.23.05.5.2.1.xml.j2
index 4b002328..7c4a263a 100644
--- a/roles/apps/collabora/code/templates/config/coolwsd.23.05.5.2.1.xml.j2
+++ b/roles/apps/collabora/code/instance/templates/config/coolwsd.23.05.5.2.1.xml.j2
@@ -38,7 +38,7 @@
<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>
<mount_jail_tree desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool" default="true"></mount_jail_tree>
- <server_name desc="External hostname:port of the server running coolwsd. If empty, it's derived from the request (please set it if this doesn't work). May be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string" default="">{{ item.value.hostname }}</server_name>
+ <server_name desc="External hostname:port of the server running coolwsd. If empty, it's derived from the request (please set it if this doesn't work). May be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string" default="">{{ collabora_code_instances[collabora_code_instance].publish.hostnames[0] }}</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 cool." type="path" relative="true" default="browser/../"></file_server_root_path>
<hexify_embedded_urls desc="Enable to protect encoded URLs from getting decoded by intermediate hops. Particularly useful on Azure deployments" type="bool" default="false"></hexify_embedded_urls>
<experimental_features desc="Enable/Disable experimental features" type="bool" default="true">true</experimental_features>
@@ -194,8 +194,8 @@
<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>
<jwt_expiry_secs desc="Time in seconds before the Admin Console's JWT token expires" type="int" default="1800">1800</jwt_expiry_secs>
- <enable_macros_execution desc="Specifies whether the macro execution is enabled in general. This will enable Basic and Python scripts to execute both installed and from documents. If it is set to false, the macro_security_level is ignored. If it is set to true, the mentioned entry specified the level of macro security." type="bool" default="false">{{ item.value.macros.allowed | default(false) | ternary('true', 'false') }}</enable_macros_execution>
- <macro_security_level desc="Level of Macro security. 1 (Medium) Confirmation required before executing macros from untrusted sources. 0 (Low, not recommended) All macros will be executed without confirmation." type="int" default="1">{{ item.value.macros.security_level | default('1') }}</macro_security_level>
+ <enable_macros_execution desc="Specifies whether the macro execution is enabled in general. This will enable Basic and Python scripts to execute both installed and from documents. If it is set to false, the macro_security_level is ignored. If it is set to true, the mentioned entry specified the level of macro security." type="bool" default="false">{{ collabora_code_instances[collabora_code_instance].macros.allowed | default(false) | ternary('true', 'false') }}</enable_macros_execution>
+ <macro_security_level desc="Level of Macro security. 1 (Medium) Confirmation required before executing macros from untrusted sources. 0 (Low, not recommended) All macros will be executed without confirmation." type="int" default="1">{{ collabora_code_instances[collabora_code_instance].macros.security_level | default('1') }}</macro_security_level>
<enable_websocket_urp desc="Should we enable URP (UNO remote protocol) communication over the websocket. This allows full control of the Kit child server to anyone with access to the websocket including executing macros without confirmation or running arbitrary shell commands in the jail." type="bool" default="false">false</enable_websocket_urp>
<enable_metrics_unauthenticated desc="When enabled, the /cool/getMetrics endpoint will not require authentication." type="bool" default="false">false</enable_metrics_unauthenticated>
</security>
@@ -224,7 +224,7 @@
</locking>
<alias_groups desc="default mode is 'first' it allows only the first host when groups are not defined. set mode to 'groups' and define group to allow multiple host and its aliases" mode="groups">
-{% for backend in item.value.backend_storages %}
+{% for backend in collabora_code_instances[collabora_code_instance].backend_storages %}
<group>
<host allow="true">https://{{ backend }}:443</host>
</group>
@@ -245,8 +245,8 @@
<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 coolconfig to set up a secure password.">{{ item.value.admin.password }}</password>
+ <username desc="The username of the admin console. Ignored if PAM is enabled.">{{ collabora_code_instances[collabora_code_instance].admin.username }}</username>
+ <password desc="The password of the admin console. Deprecated on most platforms. Instead, use PAM or coolconfig to set up a secure password.">{{ collabora_code_instances[collabora_code_instance].admin.password }}</password>
<logging desc="Log admin activities irrespective of logging.level">
<admin_login desc="log when an admin logged into the console" type="bool" default="true">true</admin_login>
<metrics_fetch desc="log when metrics endpoint is accessed and metrics endpoint authentication is enabled" type="bool" default="true">true</metrics_fetch>
diff --git a/roles/apps/collabora/code/templates/config/coolwsd.23.05.6.4.1.xml.j2 b/roles/apps/collabora/code/instance/templates/config/coolwsd.23.05.6.4.1.xml.j2
index 4d4ac71c..aaccd7d0 100644
--- a/roles/apps/collabora/code/templates/config/coolwsd.23.05.6.4.1.xml.j2
+++ b/roles/apps/collabora/code/instance/templates/config/coolwsd.23.05.6.4.1.xml.j2
@@ -38,7 +38,7 @@
<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>
<mount_jail_tree desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool" default="true"></mount_jail_tree>
- <server_name desc="External hostname:port of the server running coolwsd. If empty, it's derived from the request (please set it if this doesn't work). May be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string" default="">{{ item.value.hostname }}</server_name>
+ <server_name desc="External hostname:port of the server running coolwsd. If empty, it's derived from the request (please set it if this doesn't work). May be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string" default="">{{ collabora_code_instances[collabora_code_instance].publish.hostnames[0] }}</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 cool." type="path" relative="true" default="browser/../"></file_server_root_path>
<hexify_embedded_urls desc="Enable to protect encoded URLs from getting decoded by intermediate hops. Particularly useful on Azure deployments" type="bool" default="false"></hexify_embedded_urls>
<experimental_features desc="Enable/Disable experimental features" type="bool" default="true">true</experimental_features>
@@ -209,8 +209,8 @@
<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>
<jwt_expiry_secs desc="Time in seconds before the Admin Console's JWT token expires" type="int" default="1800">1800</jwt_expiry_secs>
- <enable_macros_execution desc="Specifies whether the macro execution is enabled in general. This will enable Basic and Python scripts to execute both installed and from documents. If it is set to false, the macro_security_level is ignored. If it is set to true, the mentioned entry specified the level of macro security." type="bool" default="false">{{ item.value.macros.allowed | default(false) | ternary('true', 'false') }}</enable_macros_execution>
- <macro_security_level desc="Level of Macro security. 1 (Medium) Confirmation required before executing macros from untrusted sources. 0 (Low, not recommended) All macros will be executed without confirmation." type="int" default="1">{{ item.value.macros.security_level | default('1') }}</macro_security_level>
+ <enable_macros_execution desc="Specifies whether the macro execution is enabled in general. This will enable Basic and Python scripts to execute both installed and from documents. If it is set to false, the macro_security_level is ignored. If it is set to true, the mentioned entry specified the level of macro security." type="bool" default="false">{{ collabora_code_instances[collabora_code_instance].macros.allowed | default(false) | ternary('true', 'false') }}</enable_macros_execution>
+ <macro_security_level desc="Level of Macro security. 1 (Medium) Confirmation required before executing macros from untrusted sources. 0 (Low, not recommended) All macros will be executed without confirmation." type="int" default="1">{{ collabora_code_instances[collabora_code_instance].macros.security_level | default('1') }}</macro_security_level>
<enable_websocket_urp desc="Should we enable URP (UNO remote protocol) communication over the websocket. This allows full control of the Kit child server to anyone with access to the websocket including executing macros without confirmation or running arbitrary shell commands in the jail." type="bool" default="false">false</enable_websocket_urp>
<enable_metrics_unauthenticated desc="When enabled, the /cool/getMetrics endpoint will not require authentication." type="bool" default="false">false</enable_metrics_unauthenticated>
</security>
@@ -239,7 +239,7 @@
</locking>
<alias_groups desc="default mode is 'first' it allows only the first host when groups are not defined. set mode to 'groups' and define group to allow multiple host and its aliases" mode="groups">
-{% for backend in item.value.backend_storages %}
+{% for backend in collabora_code_instances[collabora_code_instance].backend_storages %}
<group>
<host allow="true">https://{{ backend }}:443</host>
</group>
@@ -260,8 +260,8 @@
<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 coolconfig to set up a secure password.">{{ item.value.admin.password }}</password>
+ <username desc="The username of the admin console. Ignored if PAM is enabled.">{{ collabora_code_instances[collabora_code_instance].admin.username }}</username>
+ <password desc="The password of the admin console. Deprecated on most platforms. Instead, use PAM or coolconfig to set up a secure password.">{{ collabora_code_instances[collabora_code_instance].admin.password }}</password>
<logging desc="Log admin activities irrespective of logging.level">
<admin_login desc="log when an admin logged into the console" type="bool" default="true">true</admin_login>
<metrics_fetch desc="log when metrics endpoint is accessed and metrics endpoint authentication is enabled" type="bool" default="true">true</metrics_fetch>
diff --git a/roles/apps/collabora/code/instance/templates/config/coolwsd.24.04.6.2.1.xml.j2 b/roles/apps/collabora/code/instance/templates/config/coolwsd.24.04.6.2.1.xml.j2
new file mode 100644
index 00000000..aab67a87
--- /dev/null
+++ b/roles/apps/collabora/code/instance/templates/config/coolwsd.24.04.6.2.1.xml.j2
@@ -0,0 +1,340 @@
+<!-- -*- nxml-child-indent: 4; tab-width: 4; indent-tabs-mode: nil -*- -->
+<config>
+
+ <!-- For more detailed documentation on typical configuration options please see:
+ https://sdk.collaboraonline.com/docs/installation/Configuration.html -->
+
+ <!-- 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. -->
+
+ <accessibility desc="Accessibility settings">
+ <enable type="bool" desc="Controls whether accessibility support should be enabled or not." default="false">false</enable>
+ </accessibility>
+
+ <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>
+
+ <!--
+ These are the settings of external (remote) spellchecker and grammar checker services. Currently LanguageTool and Duden Korrekturserver APIs are supported, you can
+ set either of them. By default they are disabled. To turn the support on, please set "enabled" property to true. It works with self hosted or cloud services, free
+ and premium as well. The "base_url" may be https://api.languagetoolplus.com/v2 if the cloud version of LanguageTool is used. Please note that your data in the
+ document e.g. the text part of it will be sent to the cloud API. Please read the respective privacy policies, e.g. https://languagetool.org/legal/privacy.
+ -->
+ <languagetool desc="Remote API settings for spell and grammar checking">
+ <enabled desc="Enable Remote Spell and Grammar Checker" type="bool" default="false"></enabled>
+ <base_url desc="HTTP endpoint for the API server, without /check or /languages postfix at the end." type="string" default=""></base_url>
+ <user_name desc="LanguageTool or Duden account username for premium usage." type="string" default=""></user_name>
+ <api_key desc="API key provided by LanguageTool or Duden account for premium usage." type="string" default=""></api_key>
+ <ssl_verification desc="Enable or disable SSL verification. You may have to disable it in test environments with self-signed certificates." type="string" default="true"></ssl_verification>
+ <rest_protocol desc="REST API protocol. For LanguageTool leave it blank, for Duden Korrekturserver use the string 'duden'." type="string" default=""></rest_protocol>
+ </languagetool>
+
+ <deepl desc="DeepL API settings for translation service">
+ <enabled desc="If true, shows translate option as a menu entry in the compact view and as an icon in the tabbed view." type="bool" default="false">false</enabled>
+ <api_url desc="URL for the API" type="string" default=""></api_url>
+ <auth_key desc="Auth Key generated by your account" type="string" default=""></auth_key>
+ </deepl>
+
+ <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>
+ <mount_jail_tree desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool" default="true"></mount_jail_tree>
+ <mount_namespaces desc="Use mount namespaces instead of coolmount." type="bool" default="true"></mount_namespaces>
+
+ <server_name desc="External hostname:port of the server running coolwsd. If empty, it's derived from the request (please set it if this doesn't work). May be specified when behind a reverse-proxy or when the hostname is not reachable directly." type="string" default="">{{ collabora_code_instances[collabora_code_instance].publish.hostnames[0] }}</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 cool." type="path" relative="true" default="browser/../"></file_server_root_path>
+ <hexify_embedded_urls desc="Enable to protect encoded URLs from getting decoded by intermediate hops. Particularly useful on Azure deployments" type="bool" default="false"></hexify_embedded_urls>
+ <experimental_features desc="Enable/Disable experimental features" type="bool" default="true">true</experimental_features>
+
+ <memproportion desc="The maximum percentage of available memory consumed by all of the Collabora Online Development Edition processes, after which we start cleaning up idle documents. If cgroup memory limits are set, this is the maximum percentage of that limit to consume." 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="4">4</num_prespawn_children>
+ <!-- <fetch_update_check desc="Every number of hours will fetch latest version data. Defaults to 10 hours." type="uint" default="10">10</fetch_update_check> -->
+ <!-- <allow_update_popup desc="Allows notification about an update in the editor" type="bool" default="true">true</allow_update_popup> -->
+ <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>
+ <batch_priority desc="A (lower) priority for use by batch eg. convert-to processes to avoid starving interactive ones" type="uint" default="5">5</batch_priority>
+ <bgsave_priority desc="A (lower) priority for use by background save processes to free time for interactive ones" type="uint" default="5">5</bgsave_priority>
+ <redlining_as_comments desc="If true show red-lines as comments" type="bool" default="false">false</redlining_as_comments>
+ <pdf_resolution_dpi desc="The resolution, in DPI, used to render PDF documents as image. Memory consumption grows proportionally. Must be a positive value less than 385. Defaults to 96." type="uint" default="96">96</pdf_resolution_dpi>
+ <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>
+ <idlesave_duration_secs desc="The number of idle seconds after which document, if modified, should be saved. Disabled when 0. Defaults to 30 seconds." type="uint" default="30">30</idlesave_duration_secs>
+ <autosave_duration_secs desc="The number of seconds after which document, if modified, should be saved. Disabled when 0. Defaults to 5 minutes." type="uint" default="300">300</autosave_duration_secs>
+ <background_autosave desc="Allow auto-saves to occur in a forked background process where possible." type="bool" default="true">true</background_autosave>
+ <background_manualsave desc="Allow manual save to occur in a forked background process where possible" type="bool" default="true">true</background_manualsave>
+ <always_save_on_exit desc="On exiting the last editor, always perform a save and upload if the document had been modified. This is to allow the storage to store the document, if it had skipped doing so, previously, as an optimization." 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_store_failures desc="Maximum number of consecutive save-and-upload to storage failures when unloading the document. 0 for unlimited (not recommended)." type="uint" default="5">5</limit_store_failures>
+ <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>
+ <min_time_between_saves_ms desc="Minimum number of milliseconds between saving the document on disk." type="uint" default="500">500</min_time_between_saves_ms>
+ <min_time_between_uploads_ms desc="Minimum number of milliseconds between uploading the document to storage." type="uint" default="5000">5000</min_time_between_uploads_ms>
+ <cleanup desc="Checks for resource consuming (bad) documents and kills associated kit process. A document is considered resource consuming (bad) if is in idle state for idle_time_secs period and memory usage passed limit_dirty_mem_mb or CPU usage passed limit_cpu_per" enable="true">
+ <cleanup_interval_ms desc="Interval between two checks" type="uint" default="10000">10000</cleanup_interval_ms>
+ <bad_behavior_period_secs desc="Minimum time period for a document to be in bad state before associated kit process is killed. If in this period the condition for bad document is not met once then this period is reset" type="uint" default="60">60</bad_behavior_period_secs>
+ <idle_time_secs desc="Minimum idle time for a document to be candidate for bad state" type="uint" default="300">300</idle_time_secs>
+ <limit_dirty_mem_mb desc="Minimum memory usage for a document to be candidate for bad state" type="uint" default="3072">3072</limit_dirty_mem_mb>
+ <limit_cpu_per desc="Minimum CPU usage for a document to be candidate for bad state" type="uint" default="85">85</limit_cpu_per>
+ <lost_kit_grace_period_secs desc="The minimum grace period for a lost kit process (not referenced by coolwsd) to resolve its lost status before it is terminated. To disable the cleanup of lost kits use value 0" default="120">120</lost_kit_grace_period_secs>
+ </cleanup>
+ </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 300 seconds." type="uint" default="300">300</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>
+ <custom_os_info desc="Custom string shown as OS version in About dialog, get from system if empty." type="string" default=""></custom_os_info>
+ </per_view>
+
+ <ver_suffix desc="Appended to etags to allow easy refresh of changed files during development" type="string" default=""></ver_suffix>
+
+ <logging>
+ <color type="bool">true</color>
+ <!--
+ Note to developers: When you do "make run", the logging.level will be set on the
+ coolwsd command line, so if you want to change it for your testing, do it in
+ Makefile.am, not here.
+ -->
+ <level type="string" desc="Can be 0-8 (with the lowest numbers being the least verbose), or none (turns off logging), fatal, critical, error, warning, notice, information, debug, trace" default="warning">warning</level>
+ <level_startup type="string" desc="As for level - but for the initial startup phase which is most problematic, logging reverts to level configured above when startup is complete" default="trace">trace</level_startup>
+ <disabled_areas type="string" desc="High verbosity logging ie. info to trace are disable-able, comma separated: Generic, Pixel, Socket, WebSocket, Http, WebServer, Storage, WOPI, Admin, Javascript" default="Socket,WebSocket,Admin">Socket,WebSocket,Admin,Pixel</disabled_areas>
+ <most_verbose_level_settable_from_client type="string" desc="A loggingleveloverride message from the client can not set a more verbose log level than this" default="notice">notice</most_verbose_level_settable_from_client>
+ <least_verbose_level_settable_from_client type="string" desc="A loggingleveloverride message from a client can not set a less verbose log level than this" default="fatal">fatal</least_verbose_level_settable_from_client>
+ <protocol type="bool" desc="Enable minimal client-site JS protocol logging from the start">false</protocol>
+ <!-- lokit_sal_log example: Log WebDAV-related messages, that is interesting for debugging Insert - Image operation: "+TIMESTAMP+INFO.ucb.ucp.webdav+WARN.ucb.ucp.webdav"
+ See also: https://docs.libreoffice.org/sal/html/sal_log.html -->
+ <lokit_sal_log type="string" desc="Fine tune log messages from LOKit. Default is to suppress log messages from LOKit." default="-INFO-WARN">-INFO-WARN</lokit_sal_log>
+ <file enable="false">
+ <!-- If you use other path than /var/log and you run coolwsd from systemd, make sure that you enable that path in coolwsd.service (ReadWritePaths). -->
+ <property name="path" desc="Log file path.">/var/log/coolwsd.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>
+ <docstats type="bool" desc="Enable to see document handling information in logs." default="false">false</docstats>
+ <userstats desc="Enable user stats. i.e: logs the details of a file and user" type="bool" default="false">false</userstats>
+ <disable_server_audit type="bool" desc="Disabled server audit dialog and notification. Admin will no longer see warnings in the application user interface. This doesn't affect log file." default="false">false</disable_server_audit>
+ </logging>
+
+ <!--
+ Note to developers: When you do "make run", the trace_event[@enable] will be set on the
+ coolwsd command line, so if you want to change it for your testing, do it in Makefile.am,
+ not here.
+ -->
+ <trace_event desc="The possibility to turn on generation of a Chrome Trace Event file" enable="false">
+ <path desc="Output path for the Trace Event file, to which they will be written if turned on at run-time" type="string" default="/var/log/coolwsd.trace.json">/var/log/coolwsd.trace.json</path>
+ </trace_event>
+
+ <browser_logging desc="Logging in the browser console" default="false">false</browser_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/cooltrace-%.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, coolwsd 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 coolwsd binds to. Can be 'any' or 'loopback'.">any</listen>
+ <!-- this allows you to shift all of our URLs into a sub-path from
+ https://my.com/browser/a123... to https://my.com/my/sub/path/browser/a123... -->
+ <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.16.0.0/12 subnet part 1.">172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ <host desc="The IPv4 private 172.16.0.0/12 subnet part 2.">172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ <host desc="The IPv4 private 172.16.0.0/12 subnet part 3.">172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ <host desc="The IPv4 private 10.0.0.0/8 subnet (Podman).">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ </post_allow>
+ <lok_allow desc="Allowed hosts as an external data source inside edited files. All allowed post_allow.host and storage.wopi entries are also considered to be allowed as a data source. Used for example in: PostMessage Action_InsertGraphics, =WEBSERVICE() function, external reference in the cell.">
+ <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.16.0.0/12 subnet part 1.">172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.1[6789]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ <host desc="The IPv4 private 172.16.0.0/12 subnet part 2.">172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.2[0-9]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ <host desc="The IPv4 private 172.16.0.0/12 subnet part 3.">172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:172\.3[01]\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ <host desc="The IPv4 private 10.0.0.0/8 subnet (Podman).">10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ <host desc="Ditto, but as IPv4-mapped IPv6 addresses">::ffff:10\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}</host>
+ <host desc="Localhost access by name">localhost</host>
+ </lok_allow>
+ <content_security_policy desc="Customize the CSP header by specifying one or more policy-directive, separated by semicolons. See w3.org/TR/CSP2"></content_security_policy>
+ <frame_ancestors desc="OBSOLETE: Use content_security_policy. Specify who is allowed to embed the Collabora Online iframe (coolwsd and WOPI host are always allowed). Separate multiple hosts by space."></frame_ancestors>
+ <connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by coolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs>
+
+ <!-- this setting radically changes how online works, it should not be used in a production environment -->
+ <proxy_prefix type="bool" default="false" desc="Enable a ProxyPrefix to be passed int through which to redirect requests"></proxy_prefix>
+ </net>
+
+ <ssl desc="SSL settings">
+ <!-- switches from https:// + wss:// to http:// + ws:// -->
+ <enable type="bool" desc="Controls whether SSL encryption between coolwsd and the network 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>
+ <!-- SSL off-load can be done in a proxy, if so disable SSL, and enable termination below in production -->
+ <termination desc="Connection via proxy where coolwsd 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/coolwsd/cert.pem</cert_file_path>
+ <key_file_path desc="Path to the key file" relative="false">/etc/coolwsd/key.pem</key_file_path>
+ <ca_file_path desc="Path to the ca file" relative="false">/etc/coolwsd/ca-chain.cert.pem</ca_file_path>
+ <ssl_verification desc="Enable or disable SSL verification of hosts remote to coolwsd. If true SSL verification will be strict, otherwise certs of hosts will not be verified. You may have to disable it in test environments with self-signed certificates." type="string" default="false">false</ssl_verification>
+ <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>
+ <sts desc="Strict-Transport-Security settings, per rfc6797. Subdomains are always included.">
+ <enabled desc="Whether or not Strict-Transport-Security is enabled. Enable only when ready for production. Cannot be disabled without resetting the browsers." type="bool" default="false">false</enabled>
+ <max_age desc="Strict-Transport-Security max-age directive, in seconds. 0 is allowed; please see rfc6797 for details. Defaults to 1 year." type="int" default="31536000">31536000</max_age>
+ </sts>
+ </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>
+
+ <!-- deprecated: If capabilities is 'false', coolwsd will assume mount_namespaces of 'true' to achieve
+ this goal, only avoiding chroot for process isolation if linux namespaces are unavailable -->
+ <capabilities desc="Should we require capabilities to isolate processes into chroot jails" type="bool" default="true">true</capabilities>
+
+ <jwt_expiry_secs desc="Time in seconds before the Admin Console's JWT token expires" type="int" default="1800">1800</jwt_expiry_secs>
+ <enable_macros_execution desc="Specifies whether the macro execution is enabled in general. This will enable Basic and Python scripts to execute both installed and from documents. If it is set to false, the macro_security_level is ignored. If it is set to true, the mentioned entry specified the level of macro security." type="bool" default="false">{{ collabora_code_instances[collabora_code_instance].macros.allowed | default(false) | ternary('true', 'false') }}</enable_macros_execution>
+ <macro_security_level desc="Level of Macro security. 1 (Medium) Confirmation required before executing macros from untrusted sources. 0 (Low, not recommended) All macros will be executed without confirmation." type="int" default="1">{{ collabora_code_instances[collabora_code_instance].macros.security_level | default('1') }}</macro_security_level>
+ <enable_websocket_urp desc="Should we enable URP (UNO remote protocol) communication over the websocket. This allows full control of the Kit child server to anyone with access to the websocket including executing macros without confirmation or running arbitrary shell commands in the jail." type="bool" default="false">false</enable_websocket_urp>
+ <enable_metrics_unauthenticated desc="When enabled, the /cool/getMetrics endpoint will not require authentication." type="bool" default="false">false</enable_metrics_unauthenticated>
+ </security>
+
+ <certificates>
+ <database_path type="string" desc="Path to the NSS certificates that are used for signing documents" default=""></database_path>
+ </certificates>
+
+ <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>
+
+
+ <user_interface>
+ <mode type="string" desc="Controls the user interface style. The 'default' means: Take the value from ui_defaults, or decide for one of compact or tabbed (default|compact|tabbed)" default="default">default</mode>
+ <use_integration_theme desc="Use theme from the integrator" type="bool" default="true">true</use_integration_theme>
+ </user_interface>
+
+ <storage desc="Backend storage">
+ <filesystem allow="false" />
+ <wopi desc="Allow/deny wopi storage." allow="true">
+ <max_file_size desc="Maximum document size in bytes to load. 0 for unlimited." type="uint">0</max_file_size>
+ <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>
+
+ <alias_groups desc="default mode is 'first' it allows only the first host when groups are not defined. set mode to 'groups' and define group to allow multiple host and its aliases" mode="groups">
+{% for backend in collabora_code_instances[collabora_code_instance].backend_storages %}
+ <group>
+ <host allow="true">https://{{ backend }}:443</host>
+ </group>
+{% endfor %}
+ </alias_groups>
+
+ <is_legacy_server desc="Set to true for legacy server that need deprecated headers." type="bool" default="false"></is_legacy_server>
+ </wopi>
+ <ssl desc="SSL settings">
+ <as_scheme type="bool" default="true" desc="When set we exclusively use the WOPI URI's scheme to enable SSL for storage">true</as_scheme>
+ <enable type="bool" desc="If as_scheme is false or not set, this can be set to force SSL encryption between storage and coolwsd. When empty this defaults to following the ssl.enable setting"></enable>
+ <cert_file_path desc="Path to the cert file. When empty this defaults to following the ssl.cert_file_path setting" relative="false"></cert_file_path>
+ <key_file_path desc="Path to the key file. When empty this defaults to following the ssl.key_file_path settinge" relative="false"></key_file_path>
+ <ca_file_path desc="Path to the ca file. When empty this defaults to following the ssl.ca_file_path setting" relative="false"></ca_file_path>
+ <cipher_list desc="List of OpenSSL ciphers to accept. If empty the defaults are used. These can be overridden only if absolutely needed."></cipher_list>
+ </ssl>
+ </storage>
+
+ <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.">{{ collabora_code_instances[collabora_code_instance].admin.username }}</username>
+ <password desc="The password of the admin console. Deprecated on most platforms. Instead, use PAM or coolconfig to set up a secure password.">{{ collabora_code_instances[collabora_code_instance].admin.password }}</password>
+ <logging desc="Log admin activities irrespective of logging.level">
+ <admin_login desc="log when an admin logged into the console" type="bool" default="true">true</admin_login>
+ <metrics_fetch desc="log when metrics endpoint is accessed and metrics endpoint authentication is enabled" type="bool" default="true">true</metrics_fetch>
+ <monitor_connect desc="log when external monitor gets connected" type="bool" default="true">true</monitor_connect>
+ <admin_action desc="log when admin does some action for example killing a process" type="bool" default="true">true</admin_action>
+ </logging>
+ </admin_console>
+
+ <monitors desc="Addresses of servers we connect to on start for monitoring">
+ <!-- <monitor desc="Address of the monitor and interval after which it should try reconnting after disconnect" retryInterval="20">wss://foobar:234/ws</monitor> -->
+ </monitors>
+
+ <quarantine_files desc="Files are stored here to be examined later in cases of crashes or similar situation." default="false" enable="false">
+ <limit_dir_size_mb desc="Maximum directory size, in MBs. On exceeding the specified limit, older files will be deleted." default="250" type="uint"></limit_dir_size_mb>
+ <max_versions_to_maintain desc="How many versions of the same file to keep." default="5" type="uint"></max_versions_to_maintain>
+ <path desc="Absolute path of the directory under which quarantined files will be stored. Do not use a relative path." type="path" relative="false"></path>
+ <expiry_min desc="Time in mins after quarantined files will be deleted." type="int" default="3000"></expiry_min>
+ </quarantine_files>
+
+ <remote_config>
+ <remote_url desc="remote server to which you will send request to get remote config in response" type="string" default=""></remote_url>
+ </remote_config>
+
+ <stop_on_config_change desc="Stop coolwsd whenever config files change." type="bool" default="false">false</stop_on_config_change>
+
+ <remote_font_config>
+ <url desc="URL of optional JSON file that lists fonts to be included in Online" type="string" default=""></url>
+ </remote_font_config>
+
+ <home_mode>
+ <enable desc="Enable more configuration options for home users" type="bool" default="false">false</enable>
+ </home_mode>
+
+ <fonts_missing>
+ <handling desc="How to handle fonts mising in a document: 'report', 'log', 'both', or 'ignore'" type="string" default="log">log</handling>
+ </fonts_missing>
+
+ <indirection_endpoint>
+ <url desc="URL endpoint to server which servers routeToken in json format" default=""></url>
+ <migration_timeout_secs desc="The maximum number of seconds waiting for shutdown migration message from indirection server before unloading an document. Defaults to 180 second." type="uint" default="180"></migration_timeout_secs>
+ </indirection_endpoint>
+
+
+
+
+
+ <zotero desc="Zotero plugin configuration. For more details about Zotero visit https://www.zotero.org/">
+ <enable desc="Enable Zotero plugin." type="bool" default="true">true</enable>
+ </zotero>
+
+ <help_url desc="The Help root URL, or empty for no help (hides the Help buttons)" type="string" default="https://help.collaboraoffice.com/help.html?">https://help.collaboraoffice.com/help.html?</help_url>
+
+ <overwrite_mode>
+ <enable desc="Enable overwrite mode (user can use insert key)" type="bool" default="true">true</enable>
+ </overwrite_mode>
+
+ <wasm desc="WASM-specific settings">
+ <enable desc="Enable WASM support" type="bool" default="false"></enable>
+ <force desc="When enabled, all requests are redirected to WASM." type="bool" default="false"></force>
+ </wasm>
+
+</config>
diff --git a/roles/apps/collabora/code/instance/templates/nginx-vhost.conf.j2 b/roles/apps/collabora/code/instance/templates/nginx-vhost.conf.j2
new file mode 100644
index 00000000..a7248194
--- /dev/null
+++ b/roles/apps/collabora/code/instance/templates/nginx-vhost.conf.j2
@@ -0,0 +1,113 @@
+client_max_body_size 128M;
+
+# static files
+location ^~ /browser {
+ include snippets/proxy-nobuff.conf;
+ include snippets/proxy-forward-headers.conf;
+
+ proxy_set_header Host $http_host;
+{% if collabora_code_instances[collabora_code_instance].publish.zone.publisher == inventory_hostname %}
+ proxy_pass https://127.0.0.1:{{ collabora_code_instances[collabora_code_instance].port }};
+{% else %}
+ proxy_pass https://{{ ansible_default_ipv4.address }}:{{ collabora_code_instances[collabora_code_instance].port }};
+{% endif %}
+ proxy_ssl_trusted_certificate /etc/ssl/apps-publish-{{ collabora_code_instances[collabora_code_instance].publish.zone.name }}/apps-publish-{{ collabora_code_instances[collabora_code_instance].publish.zone.name }}-ca-crt.pem;
+ proxy_ssl_verify on;
+ proxy_ssl_name collabora-code-{{ collabora_code_instance }}.{{ inventory_hostname }};
+ proxy_ssl_protocols TLSv1.3;
+}
+
+# WOPI discovery URL
+location ^~ /hosting/discovery {
+ include snippets/proxy-nobuff.conf;
+ include snippets/proxy-forward-headers.conf;
+
+ proxy_set_header Host $http_host;
+{% if collabora_code_instances[collabora_code_instance].publish.zone.publisher == inventory_hostname %}
+ proxy_pass https://127.0.0.1:{{ collabora_code_instances[collabora_code_instance].port }};
+{% else %}
+ proxy_pass https://{{ ansible_default_ipv4.address }}:{{ collabora_code_instances[collabora_code_instance].port }};
+{% endif %}
+ proxy_ssl_trusted_certificate /etc/ssl/apps-publish-{{ collabora_code_instances[collabora_code_instance].publish.zone.name }}/apps-publish-{{ collabora_code_instances[collabora_code_instance].publish.zone.name }}-ca-crt.pem;
+ proxy_ssl_verify on;
+ proxy_ssl_name collabora-code-{{ collabora_code_instance }}.{{ inventory_hostname }};
+ proxy_ssl_protocols TLSv1.3;
+}
+
+# Capabilities
+location ^~ /hosting/capabilities {
+ include snippets/proxy-nobuff.conf;
+ include snippets/proxy-forward-headers.conf;
+
+ proxy_set_header Host $http_host;
+{% if collabora_code_instances[collabora_code_instance].publish.zone.publisher == inventory_hostname %}
+ proxy_pass https://127.0.0.1:{{ collabora_code_instances[collabora_code_instance].port }};
+{% else %}
+ proxy_pass https://{{ ansible_default_ipv4.address }}:{{ collabora_code_instances[collabora_code_instance].port }};
+{% endif %}
+ proxy_ssl_trusted_certificate /etc/ssl/apps-publish-{{ collabora_code_instances[collabora_code_instance].publish.zone.name }}/apps-publish-{{ collabora_code_instances[collabora_code_instance].publish.zone.name }}-ca-crt.pem;
+ proxy_ssl_verify on;
+ proxy_ssl_name collabora-code-{{ collabora_code_instance }}.{{ inventory_hostname }};
+ proxy_ssl_protocols TLSv1.3;
+}
+
+# main websocket
+location ~ ^/cool/(.*)/ws$ {
+ include snippets/proxy-nobuff.conf;
+ include snippets/proxy-forward-headers.conf;
+
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection $connection_upgrade;
+
+ proxy_read_timeout 36000s;
+
+ proxy_set_header Host $http_host;
+{% if collabora_code_instances[collabora_code_instance].publish.zone.publisher == inventory_hostname %}
+ proxy_pass https://127.0.0.1:{{ collabora_code_instances[collabora_code_instance].port }};
+{% else %}
+ proxy_pass https://{{ ansible_default_ipv4.address }}:{{ collabora_code_instances[collabora_code_instance].port }};
+{% endif %}
+ proxy_ssl_trusted_certificate /etc/ssl/apps-publish-{{ collabora_code_instances[collabora_code_instance].publish.zone.name }}/apps-publish-{{ collabora_code_instances[collabora_code_instance].publish.zone.name }}-ca-crt.pem;
+ proxy_ssl_verify on;
+ proxy_ssl_name collabora-code-{{ collabora_code_instance }}.{{ inventory_hostname }};
+ proxy_ssl_protocols TLSv1.3;
+}
+
+# download, presentation and image upload
+location ~ ^/(c|l)ool {
+ include snippets/proxy-nobuff.conf;
+ include snippets/proxy-forward-headers.conf;
+
+ proxy_set_header Host $http_host;
+{% if collabora_code_instances[collabora_code_instance].publish.zone.publisher == inventory_hostname %}
+ proxy_pass https://127.0.0.1:{{ collabora_code_instances[collabora_code_instance].port }};
+{% else %}
+ proxy_pass https://{{ ansible_default_ipv4.address }}:{{ collabora_code_instances[collabora_code_instance].port }};
+{% endif %}
+ proxy_ssl_trusted_certificate /etc/ssl/apps-publish-{{ collabora_code_instances[collabora_code_instance].publish.zone.name }}/apps-publish-{{ collabora_code_instances[collabora_code_instance].publish.zone.name }}-ca-crt.pem;
+ proxy_ssl_verify on;
+ proxy_ssl_name collabora-code-{{ collabora_code_instance }}.{{ inventory_hostname }};
+ proxy_ssl_protocols TLSv1.3;
+}
+
+# Admin Console websocket
+location ^~ /cool/adminws {
+ include snippets/proxy-nobuff.conf;
+ include snippets/proxy-forward-headers.conf;
+
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection $connection_upgrade;
+
+ proxy_read_timeout 36000s;
+
+ proxy_set_header Host $http_host;
+{% if collabora_code_instances[collabora_code_instance].publish.zone.publisher == inventory_hostname %}
+ proxy_pass https://127.0.0.1:{{ collabora_code_instances[collabora_code_instance].port }};
+{% else %}
+ proxy_pass https://{{ ansible_default_ipv4.address }}:{{ collabora_code_instances[collabora_code_instance].port }};
+{% endif %}
+ proxy_ssl_trusted_certificate /etc/ssl/apps-publish-{{ collabora_code_instances[collabora_code_instance].publish.zone.name }}/apps-publish-{{ collabora_code_instances[collabora_code_instance].publish.zone.name }}-ca-crt.pem;
+ proxy_ssl_verify on;
+ proxy_ssl_name collabora-code-{{ collabora_code_instance }}.{{ inventory_hostname }};
+ proxy_ssl_protocols TLSv1.3;
+}
diff --git a/roles/apps/collabora/code/instance/templates/pod-spec.yml.j2 b/roles/apps/collabora/code/instance/templates/pod-spec.yml.j2
new file mode 100644
index 00000000..a01bafee
--- /dev/null
+++ b/roles/apps/collabora/code/instance/templates/pod-spec.yml.j2
@@ -0,0 +1,40 @@
+containers:
+- name: collabora-code
+ image: "collabora/code{% if 'custom_image' in collabora_code_instances[collabora_code_instance] %}/{{ collabora_code_instance }}{% endif %}:{{ collabora_code_instances[collabora_code_instance].version }}"
+ resources:
+ limits:
+ memory: "4Gi"
+ env:
+ - name: "DONT_GEN_SSL_CERT"
+ value: "1"
+ volumeMounts:
+ - name: temp
+ mountPath: /opt/cool/child-roots
+ - name: config
+ mountPath: /etc/coolwsd/coolwsd.xml
+ subPath: coolwsd.xml
+ readOnly: true
+ - name: config
+ mountPath: /etc/coolwsd/ca-chain.cert.pem
+ subPath: cert.pem
+ readOnly: true
+ - name: config
+ mountPath: /etc/coolwsd/cert.pem
+ subPath: cert.pem
+ readOnly: true
+ - name: config
+ mountPath: /etc/coolwsd/key.pem
+ subPath: key.pem
+ readOnly: true
+ ports:
+ - containerPort: 9980
+ hostPort: {{ collabora_code_instances[collabora_code_instance].port }}
+ hostIP: 127.0.0.1
+volumes:
+- name: config
+ hostPath:
+ path: "{{ collabora_code_instance_basepath }}/config/"
+ type: Directory
+- name: temp
+ emptyDir:
+ medium: Memory
diff --git a/roles/apps/collabora/code/tasks/custom-image.yml b/roles/apps/collabora/code/tasks/custom-image.yml
deleted file mode 100644
index 84f6b1ae..00000000
--- a/roles/apps/collabora/code/tasks/custom-image.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-- name: create build directory for custom image
- file:
- path: "{{ collabora_code_base_path }}/{{ item.key }}/build"
- state: directory
-
-- name: generate Dockerfile for custom image
- copy:
- content: |
- FROM {{ item.value.custom_image.from | default('collabora/code:' + item.value.version) }}
- {{ item.value.custom_image.dockerfile }}
- dest: "{{ collabora_code_base_path }}/{{ item.key }}/build/Dockerfile"
- register: collabora_code_custom_image_docker
-
-- name: build custom image
- docker_image:
- name: "collabora/code/{{ item.key }}:{{ item.value.version }}"
- state: present
- force_source: "{{ collabora_code_custom_image_docker is changed }}"
- source: build
- build:
- path: "{{ collabora_code_base_path }}/{{ item.key }}/build"
- network: host
- pull: yes
diff --git a/roles/apps/collabora/code/tasks/main.yml b/roles/apps/collabora/code/tasks/main.yml
index 84efec5c..11b3fee4 100644
--- a/roles/apps/collabora/code/tasks/main.yml
+++ b/roles/apps/collabora/code/tasks/main.yml
@@ -1,52 +1,7 @@
---
-- name: create collabora-code config subdirectory
+- name: instance specific tasks
loop: "{{ collabora_code_instances | list }}"
- file:
- path: "{{ collabora_code_base_path }}/{{ item }}/config"
- state: directory
- mode: 0750
-
-- name: generate configuration file
- loop: "{{ collabora_code_instances | dict2items }}"
loop_control:
- label: "{{ item.key }}"
- template:
- src: "config/{{ item.value.version | collabora_code_loolvcool | ternary('lool', 'cool') }}wsd.{{ item.value.version }}.xml.j2"
- dest: "{{ collabora_code_base_path }}/{{ item.key }}/config/{{ item.value.version | collabora_code_loolvcool | ternary('lool', 'cool') }}wsd.xml"
-
-- name: remove legacy configuration file
- loop: "{{ collabora_code_instances | dict2items }}"
- loop_control:
- label: "{{ item.key }}"
- file:
- path: "{{ collabora_code_base_path }}/{{ item.key }}/config/{{ item.value.version | collabora_code_loolvcool | ternary('cool', 'lool') }}wsd.xml"
- state: absent
-
-- name: build custom image
- loop: "{{ collabora_code_instances | dict2items }}"
- loop_control:
- label: "{{ item.key }}"
- when: "'custom_image' in item.value"
- include_tasks: custom-image.yml
-
-- name: install pod manifest
- loop: "{{ collabora_code_instances | dict2items }}"
- loop_control:
- label: "{{ item.key }}"
- vars:
- kubernetes_standalone_pod:
- name: "collabora-code-{{ item.key }}"
- spec: "{{ lookup('template', 'pod-spec.yml.j2') }}"
- mode: "0600"
- config_hash_items:
- - path: "{{ collabora_code_base_path }}/{{ item.key }}/config/{{ item.value.version | collabora_code_loolvcool | ternary('lool', 'cool') }}wsd.xml"
- properties:
- - checksum
+ loop_var: collabora_code_instance
include_role:
- name: kubernetes/standalone/pod
-
-- name: install nginx vhost config
- loop: "{{ collabora_code_instances | dict2items }}"
- loop_control:
- label: "{{ item.key }}"
- include_tasks: nginx-vhost.yml
+ name: apps/collabora/code/instance
diff --git a/roles/apps/collabora/code/tasks/nginx-vhost.yml b/roles/apps/collabora/code/tasks/nginx-vhost.yml
deleted file mode 100644
index afd8f1e0..00000000
--- a/roles/apps/collabora/code/tasks/nginx-vhost.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- name: render nginx-vhost custom config
- set_fact:
- collabora_code_nginx_vhost_custom: "{{ lookup('template', 'nginx-vhost.conf.j2') }}"
-
-- name: configure nginx vhost
- vars:
- nginx_vhost:
- name: "collabora-code-{{ item.key }}"
- template: generic
- tls:
- certificate_provider: "{{ acme_client }}"
- hostnames:
- - "{{ item.value.hostname }}"
- custom: "{{ collabora_code_nginx_vhost_custom }}"
- include_role:
- name: nginx/vhost
diff --git a/roles/apps/collabora/code/templates/config/loolwsd.6.4.0.14.xml.j2 b/roles/apps/collabora/code/templates/config/loolwsd.6.4.0.14.xml.j2
deleted file mode 100644
index cbdae29a..00000000
--- a/roles/apps/collabora/code/templates/config/loolwsd.6.4.0.14.xml.j2
+++ /dev/null
@@ -1,179 +0,0 @@
-<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>
- <mount_jail_tree desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool" default="true"></mount_jail_tree>
-
- <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>
- <batch_priority desc="A (lower) priority for use by batch eg. convert-to processes to avoid starving interactive ones" type="uint" default="5">5</batch_priority>
- <document_signing_url desc="The endpoint URL of signing server, if empty the document signing is disabled" type="string" default=""></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>
- <cleanup desc="Checks for resource consuming (bad) documents and kills associated kit process. A document is considered resource consuming (bad) if is in idle state for idle_time_secs period and memory usage passed limit_dirty_mem_mb or CPU usage passed limit_cpu_per" enable="false">
- <cleanup_interval_ms desc="Interval between two checks" type="uint" default="10000">10000</cleanup_interval_ms>
- <bad_behavior_period_secs desc="Minimum time period for a document to be in bad state before associated kit process is killed. If in this period the condition for bad document is not met once then this period is reset" type="uint" default="60">60</bad_behavior_period_secs>
- <idle_time_secs desc="Minimum idle time for a document to be candidate for bad state" type="uint" default="300">300</idle_time_secs>
- <limit_dirty_mem_mb desc="Minimum memory usage for a document to be candidate for bad state" type="uint" default="3072">3072</limit_dirty_mem_mb>
- <limit_cpu_per desc="Minimum CPU usage for a document to be candidate for bad state" type="uint" default="85">85</limit_cpu_per>
- </cleanup>
- </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" desc="Enable minimal client-site JS protocol logging from the start">false</protocol>
- <!-- lokit_sal_log example: Log WebDAV-related messages, that is interesting for debugging Insert - Image operation: "+TIMESTAMP+INFO.ucb.ucp.webdav+WARN.ucb.ucp.webdav"
- See also: https://docs.libreoffice.org/sal/html/sal_log.html -->
- <lokit_sal_log type="string" desc="Fine tune log messages from LOKit. Default is to suppress log messages from LOKit." default="-INFO-WARN">-INFO-WARN</lokit_sal_log>
- <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>
- <proxy_prefix type="bool" default="false" desc="Enable a ProxyPrefix to be passed int through which to redirect requests"></proxy_prefix>
- <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>
- <connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by loolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs>
- </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>
-
- <welcome>
- <enable type="bool" desc="Controls whether the welcome screen should be shown to the users on new install and updates." default="true">false</enable>
- <enable_button type="bool" desc="Controls whether the welcome screen should have an explanatory button instead of an X button to close the dialog." default="false">false</enable_button>
- <path desc="Path to 'welcome-$lang.html' files served on first start or when the version changes. When empty, defaults to the Release notes." type="path" relative="true" default="loleaflet/welcome"></path>
- </welcome>
-
- <user_interface>
- <mode type="string" desc="Controls the user interface style (classic|notebookbar)" default="classic">classic</mode>
- </user_interface>
-
- <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">
- <as_scheme type="bool" default="true" desc="When set we exclusively use the WOPI URI's scheme to enable SSL for storage">true</as_scheme>
- <enable type="bool" desc="If as_scheme is false or not set, this can be set to force SSL encryption between storage and loolwsd. When empty this defaults 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. If this is not empty, then SSL verification will be strict, otherwise cert of storage (WOPI-like host) will not be verified." 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/config/loolwsd.6.4.10.2.xml.j2 b/roles/apps/collabora/code/templates/config/loolwsd.6.4.10.2.xml.j2
deleted file mode 100644
index 7f6c7c0f..00000000
--- a/roles/apps/collabora/code/templates/config/loolwsd.6.4.10.2.xml.j2
+++ /dev/null
@@ -1,192 +0,0 @@
-<!-- -*- nxml-child-indent: 4; tab-width: 4; indent-tabs-mode: nil -*- -->
-
-<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>
- <mount_jail_tree desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool" default="true"></mount_jail_tree>
-
- <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>
- <batch_priority desc="A (lower) priority for use by batch eg. convert-to processes to avoid starving interactive ones" type="uint" default="5">5</batch_priority>
- <document_signing_url desc="The endpoint URL of signing server, if empty the document signing is disabled" type="string" default=""></document_signing_url>
- <redlining_as_comments desc="If true show red-lines as comments" type="bool" default="false">false</redlining_as_comments>
- <pdf_resolution_dpi desc="The resolution, in DPI, used to render PDF documents as image. Memory consumption grows proportionally. Must be a positive value less than 385. Defaults to 96." type="uint" default="96">96</pdf_resolution_dpi>
- <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>
- <cleanup desc="Checks for resource consuming (bad) documents and kills associated kit process. A document is considered resource consuming (bad) if is in idle state for idle_time_secs period and memory usage passed limit_dirty_mem_mb or CPU usage passed limit_cpu_per" enable="false">
- <cleanup_interval_ms desc="Interval between two checks" type="uint" default="10000">10000</cleanup_interval_ms>
- <bad_behavior_period_secs desc="Minimum time period for a document to be in bad state before associated kit process is killed. If in this period the condition for bad document is not met once then this period is reset" type="uint" default="60">60</bad_behavior_period_secs>
- <idle_time_secs desc="Minimum idle time for a document to be candidate for bad state" type="uint" default="300">300</idle_time_secs>
- <limit_dirty_mem_mb desc="Minimum memory usage for a document to be candidate for bad state" type="uint" default="3072">3072</limit_dirty_mem_mb>
- <limit_cpu_per desc="Minimum CPU usage for a document to be candidate for bad state" type="uint" default="85">85</limit_cpu_per>
- <lost_kit_grace_period_secs desc="The minimum grace period for a lost kit process (not referenced by loolwsd) to resolve its lost status before it is terminated. To disable the cleanup of lost kits use value 0" default="120">120</lost_kit_grace_period_secs>
- </cleanup>
- </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 (with the lowest numbers being the least verbose), or none (turns off logging), fatal, critical, error, warning, notice, information, debug, trace" default="warning">warning</level>
- <most_verbose_level_settable_from_client type="string" desc="A loggingleveloverride message from the client can not set a more verbose log level than this" default="notice">notice</most_verbose_level_settable_from_client>
- <least_verbose_level_settable_from_client type="string" desc="A loggingleveloverride message from a client can not set a less verbose log level than this" default="fatal">fatal</least_verbose_level_settable_from_client>
- <protocol type="bool" desc="Enable minimal client-site JS protocol logging from the start">false</protocol>
- <!-- lokit_sal_log example: Log WebDAV-related messages, that is interesting for debugging Insert - Image operation: "+TIMESTAMP+INFO.ucb.ucp.webdav+WARN.ucb.ucp.webdav"
- See also: https://docs.libreoffice.org/sal/html/sal_log.html -->
- <lokit_sal_log type="string" desc="Fine tune log messages from LOKit. Default is to suppress log messages from LOKit." default="-INFO-WARN">-INFO-WARN</lokit_sal_log>
- <file enable="false">
- <!-- If you use other path than /var/log and you run loolwsd from systemd, make sure that you enable that path in loolwsd.service (ReadWritePaths). -->
- <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>
-
- <trace_event desc="The possibility to turn on generation of a Chrome Trace Event file" enable="false">
- <path desc="Output path for the Trace Event file, to which they will be written if turned on at run-time" type="string" default="/var/log/loolwsd.trace.json">/var/log/loolwsd.trace.json</path>
- </trace_event>
-
- <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>
- <proxy_prefix type="bool" default="false" desc="Enable a ProxyPrefix to be passed int through which to redirect requests"></proxy_prefix>
- <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>
- <connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by loolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs>
- </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>
- <jwt_expiry_secs desc="Time in seconds before the Admin Console's JWT token expires" type="int" default="1800">1800</jwt_expiry_secs>
- <enable_macros_execution desc="Specifies whether the macro execution is enabled in general. This will enable Basic, Beanshell, Javascript and Python scripts. If it is set to false, the macro_security_level is ignored. If it is set to true, the mentioned entry specified the level of macro security." type="bool" default="false">{{ item.value.macros.allowed | default(false) | ternary('true', 'false') }}</enable_macros_execution>
- <macro_security_level desc="Level of Macro security. 1 (Medium) Confirmation required before executing macros from untrusted sources. 0 (Low, not recommended) All macros will be executed without confirmation." type="int" default="1">{{ item.value.macros.security_level | default('1') }}</macro_security_level>
- </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>
-
- <welcome>
- <enable type="bool" desc="Controls whether the welcome screen should be shown to the users on new install and updates." default="true">false</enable>
- <enable_button type="bool" desc="Controls whether the welcome screen should have an explanatory button instead of an X button to close the dialog." default="false">false</enable_button>
- <path desc="Path to 'welcome-$lang.html' files served on first start or when the version changes. When empty, defaults to the Release notes." type="path" relative="true" default="loleaflet/welcome"></path>
- </welcome>
-
- <user_interface>
- <mode type="string" desc="Controls the user interface style (classic|notebookbar)" default="classic">classic</mode>
- </user_interface>
-
- <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>
- <ssl desc="SSL settings">
- <as_scheme type="bool" default="true" desc="When set we exclusively use the WOPI URI's scheme to enable SSL for storage">true</as_scheme>
- <enable type="bool" desc="If as_scheme is false or not set, this can be set to force SSL encryption between storage and loolwsd. When empty this defaults 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. If this is not empty, then SSL verification will be strict, otherwise cert of storage (WOPI-like host) will not be verified." 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/config/loolwsd.6.4.14.3.xml.j2 b/roles/apps/collabora/code/templates/config/loolwsd.6.4.14.3.xml.j2
deleted file mode 100644
index e9ababf2..00000000
--- a/roles/apps/collabora/code/templates/config/loolwsd.6.4.14.3.xml.j2
+++ /dev/null
@@ -1,203 +0,0 @@
-<!-- -*- nxml-child-indent: 4; tab-width: 4; indent-tabs-mode: nil -*- -->
-<config>
-
- <!-- For more detailed documentation on typical configuration options please see:
- https://sdk.collaboraonline.com/docs/installation/Configuration.html -->
-
- <!-- 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>
- <mount_jail_tree desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool" default="true"></mount_jail_tree>
-
- <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>
- <hexify_embedded_urls desc="Enable to protect encoded URLs from getting decoded by intermediate hops. Particularly useful on Azure deployments" type="bool" default="false"></hexify_embedded_urls>
-
- <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>
- <batch_priority desc="A (lower) priority for use by batch eg. convert-to processes to avoid starving interactive ones" type="uint" default="5">5</batch_priority>
- <document_signing_url desc="The endpoint URL of signing server, if empty the document signing is disabled" type="string" default=""></document_signing_url>
- <redlining_as_comments desc="If true show red-lines as comments" type="bool" default="false">false</redlining_as_comments>
- <pdf_resolution_dpi desc="The resolution, in DPI, used to render PDF documents as image. Memory consumption grows proportionally. Must be a positive value less than 385. Defaults to 96." type="uint" default="96">96</pdf_resolution_dpi>
- <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>
- <cleanup desc="Checks for resource consuming (bad) documents and kills associated kit process. A document is considered resource consuming (bad) if is in idle state for idle_time_secs period and memory usage passed limit_dirty_mem_mb or CPU usage passed limit_cpu_per" enable="false">
- <cleanup_interval_ms desc="Interval between two checks" type="uint" default="10000">10000</cleanup_interval_ms>
- <bad_behavior_period_secs desc="Minimum time period for a document to be in bad state before associated kit process is killed. If in this period the condition for bad document is not met once then this period is reset" type="uint" default="60">60</bad_behavior_period_secs>
- <idle_time_secs desc="Minimum idle time for a document to be candidate for bad state" type="uint" default="300">300</idle_time_secs>
- <limit_dirty_mem_mb desc="Minimum memory usage for a document to be candidate for bad state" type="uint" default="3072">3072</limit_dirty_mem_mb>
- <limit_cpu_per desc="Minimum CPU usage for a document to be candidate for bad state" type="uint" default="85">85</limit_cpu_per>
- <lost_kit_grace_period_secs desc="The minimum grace period for a lost kit process (not referenced by loolwsd) to resolve its lost status before it is terminated. To disable the cleanup of lost kits use value 0" default="120">120</lost_kit_grace_period_secs>
- </cleanup>
- </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>
- <ver_suffix desc="Appended to etags to allow easy refresh of changed files during development" type="string" default=""></ver_suffix>
-
- <logging>
- <color type="bool">true</color>
- <level type="string" desc="Can be 0-8 (with the lowest numbers being the least verbose), or none (turns off logging), fatal, critical, error, warning, notice, information, debug, trace" default="warning">warning</level>
- <most_verbose_level_settable_from_client type="string" desc="A loggingleveloverride message from the client can not set a more verbose log level than this" default="notice">notice</most_verbose_level_settable_from_client>
- <least_verbose_level_settable_from_client type="string" desc="A loggingleveloverride message from a client can not set a less verbose log level than this" default="fatal">fatal</least_verbose_level_settable_from_client>
- <protocol type="bool" desc="Enable minimal client-site JS protocol logging from the start">false</protocol>
- <!-- lokit_sal_log example: Log WebDAV-related messages, that is interesting for debugging Insert - Image operation: "+TIMESTAMP+INFO.ucb.ucp.webdav+WARN.ucb.ucp.webdav"
- See also: https://docs.libreoffice.org/sal/html/sal_log.html -->
- <lokit_sal_log type="string" desc="Fine tune log messages from LOKit. Default is to suppress log messages from LOKit." default="-INFO-WARN">-INFO-WARN</lokit_sal_log>
- <file enable="false">
- <!-- If you use other path than /var/log and you run loolwsd from systemd, make sure that you enable that path in loolwsd.service (ReadWritePaths). -->
- <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>
-
- <trace_event desc="The possibility to turn on generation of a Chrome Trace Event file" enable="false">
- <path desc="Output path for the Trace Event file, to which they will be written if turned on at run-time" type="string" default="/var/log/loolwsd.trace.json">/var/log/loolwsd.trace.json</path>
- </trace_event>
-
- <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>
- <!-- this allows you to shift all of our URLs into a sub-path from
- https://my.com/loleaflet/a123... to https://my.com/my/sub/path/loleaflet/a123... -->
- <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>
- <connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by loolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs>
-
- <!-- this setting radically changes how online works, it should not be used in a production environment -->
- <proxy_prefix type="bool" default="false" desc="Enable a ProxyPrefix to be passed int through which to redirect requests"></proxy_prefix>
- </net>
-
- <ssl desc="SSL settings">
- <!-- switches from https:// + wss:// to http:// + ws:// -->
- <enable type="bool" desc="Controls whether SSL encryption between loolwsd and the network 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>
- <!-- SSL off-load can be done in a proxy, if so disable SSL, and enable termination below in production -->
- <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>
- <jwt_expiry_secs desc="Time in seconds before the Admin Console's JWT token expires" type="int" default="1800">1800</jwt_expiry_secs>
- <enable_macros_execution desc="Specifies whether the macro execution is enabled in general. This will enable Basic, Beanshell, Javascript and Python scripts. If it is set to false, the macro_security_level is ignored. If it is set to true, the mentioned entry specified the level of macro security." type="bool" default="false">{{ item.value.macros.allowed | default(false) | ternary('true', 'false') }}</enable_macros_execution>
- <macro_security_level desc="Level of Macro security. 1 (Medium) Confirmation required before executing macros from untrusted sources. 0 (Low, not recommended) All macros will be executed without confirmation." type="int" default="1">{{ item.value.macros.security_level | default('1') }}</macro_security_level>
- <enable_metrics_unauthenticated desc="When enabled, the /lool/getMetrics endpoint will not require authentication." type="bool" default="false">false</enable_metrics_unauthenticated>
- </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>
-
- <welcome>
- <enable type="bool" desc="Controls whether the welcome screen should be shown to the users on new install and updates." default="true">false</enable>
- <enable_button type="bool" desc="Controls whether the welcome screen should have an explanatory button instead of an X button to close the dialog." default="false">false</enable_button>
- <path desc="Path to 'welcome-$lang.html' files served on first start or when the version changes. When empty, defaults to the Release notes." type="path" relative="true" default="loleaflet/welcome"></path>
- </welcome>
-
- <user_interface>
- <mode type="string" desc="Controls the user interface style (classic|notebookbar)" default="classic">classic</mode>
- </user_interface>
-
- <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>
- <ssl desc="SSL settings">
- <as_scheme type="bool" default="true" desc="When set we exclusively use the WOPI URI's scheme to enable SSL for storage">true</as_scheme>
- <enable type="bool" desc="If as_scheme is false or not set, this can be set to force SSL encryption between storage and loolwsd. When empty this defaults 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. If this is not empty, then SSL verification will be strict, otherwise cert of storage (WOPI-like host) will not be verified." 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/config/loolwsd.6.4.3.3.xml.j2 b/roles/apps/collabora/code/templates/config/loolwsd.6.4.3.3.xml.j2
deleted file mode 100644
index 2542d252..00000000
--- a/roles/apps/collabora/code/templates/config/loolwsd.6.4.3.3.xml.j2
+++ /dev/null
@@ -1,180 +0,0 @@
-<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>
- <mount_jail_tree desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool" default="true"></mount_jail_tree>
-
- <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>
- <batch_priority desc="A (lower) priority for use by batch eg. convert-to processes to avoid starving interactive ones" type="uint" default="5">5</batch_priority>
- <document_signing_url desc="The endpoint URL of signing server, if empty the document signing is disabled" type="string" default=""></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>
- <cleanup desc="Checks for resource consuming (bad) documents and kills associated kit process. A document is considered resource consuming (bad) if is in idle state for idle_time_secs period and memory usage passed limit_dirty_mem_mb or CPU usage passed limit_cpu_per" enable="false">
- <cleanup_interval_ms desc="Interval between two checks" type="uint" default="10000">10000</cleanup_interval_ms>
- <bad_behavior_period_secs desc="Minimum time period for a document to be in bad state before associated kit process is killed. If in this period the condition for bad document is not met once then this period is reset" type="uint" default="60">60</bad_behavior_period_secs>
- <idle_time_secs desc="Minimum idle time for a document to be candidate for bad state" type="uint" default="300">300</idle_time_secs>
- <limit_dirty_mem_mb desc="Minimum memory usage for a document to be candidate for bad state" type="uint" default="3072">3072</limit_dirty_mem_mb>
- <limit_cpu_per desc="Minimum CPU usage for a document to be candidate for bad state" type="uint" default="85">85</limit_cpu_per>
- </cleanup>
- </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" desc="Enable minimal client-site JS protocol logging from the start">false</protocol>
- <!-- lokit_sal_log example: Log WebDAV-related messages, that is interesting for debugging Insert - Image operation: "+TIMESTAMP+INFO.ucb.ucp.webdav+WARN.ucb.ucp.webdav"
- See also: https://docs.libreoffice.org/sal/html/sal_log.html -->
- <lokit_sal_log type="string" desc="Fine tune log messages from LOKit. Default is to suppress log messages from LOKit." default="-INFO-WARN">-INFO-WARN</lokit_sal_log>
- <file enable="false">
- <!-- If you use other path than /var/log and you run loolwsd from systemd, make sure that you enable that path in loolwsd.service (ReadWritePaths). -->
- <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>
- <proxy_prefix type="bool" default="false" desc="Enable a ProxyPrefix to be passed int through which to redirect requests"></proxy_prefix>
- <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>
- <connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by loolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs>
- </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>
-
- <welcome>
- <enable type="bool" desc="Controls whether the welcome screen should be shown to the users on new install and updates." default="true">false</enable>
- <enable_button type="bool" desc="Controls whether the welcome screen should have an explanatory button instead of an X button to close the dialog." default="false">false</enable_button>
- <path desc="Path to 'welcome-$lang.html' files served on first start or when the version changes. When empty, defaults to the Release notes." type="path" relative="true" default="loleaflet/welcome"></path>
- </welcome>
-
- <user_interface>
- <mode type="string" desc="Controls the user interface style (classic|notebookbar)" default="classic">classic</mode>
- </user_interface>
-
- <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">
- <as_scheme type="bool" default="true" desc="When set we exclusively use the WOPI URI's scheme to enable SSL for storage">true</as_scheme>
- <enable type="bool" desc="If as_scheme is false or not set, this can be set to force SSL encryption between storage and loolwsd. When empty this defaults 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. If this is not empty, then SSL verification will be strict, otherwise cert of storage (WOPI-like host) will not be verified." 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/config/loolwsd.6.4.4.3.xml.j2 b/roles/apps/collabora/code/templates/config/loolwsd.6.4.4.3.xml.j2
deleted file mode 100644
index 2542d252..00000000
--- a/roles/apps/collabora/code/templates/config/loolwsd.6.4.4.3.xml.j2
+++ /dev/null
@@ -1,180 +0,0 @@
-<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>
- <mount_jail_tree desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool" default="true"></mount_jail_tree>
-
- <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>
- <batch_priority desc="A (lower) priority for use by batch eg. convert-to processes to avoid starving interactive ones" type="uint" default="5">5</batch_priority>
- <document_signing_url desc="The endpoint URL of signing server, if empty the document signing is disabled" type="string" default=""></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>
- <cleanup desc="Checks for resource consuming (bad) documents and kills associated kit process. A document is considered resource consuming (bad) if is in idle state for idle_time_secs period and memory usage passed limit_dirty_mem_mb or CPU usage passed limit_cpu_per" enable="false">
- <cleanup_interval_ms desc="Interval between two checks" type="uint" default="10000">10000</cleanup_interval_ms>
- <bad_behavior_period_secs desc="Minimum time period for a document to be in bad state before associated kit process is killed. If in this period the condition for bad document is not met once then this period is reset" type="uint" default="60">60</bad_behavior_period_secs>
- <idle_time_secs desc="Minimum idle time for a document to be candidate for bad state" type="uint" default="300">300</idle_time_secs>
- <limit_dirty_mem_mb desc="Minimum memory usage for a document to be candidate for bad state" type="uint" default="3072">3072</limit_dirty_mem_mb>
- <limit_cpu_per desc="Minimum CPU usage for a document to be candidate for bad state" type="uint" default="85">85</limit_cpu_per>
- </cleanup>
- </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" desc="Enable minimal client-site JS protocol logging from the start">false</protocol>
- <!-- lokit_sal_log example: Log WebDAV-related messages, that is interesting for debugging Insert - Image operation: "+TIMESTAMP+INFO.ucb.ucp.webdav+WARN.ucb.ucp.webdav"
- See also: https://docs.libreoffice.org/sal/html/sal_log.html -->
- <lokit_sal_log type="string" desc="Fine tune log messages from LOKit. Default is to suppress log messages from LOKit." default="-INFO-WARN">-INFO-WARN</lokit_sal_log>
- <file enable="false">
- <!-- If you use other path than /var/log and you run loolwsd from systemd, make sure that you enable that path in loolwsd.service (ReadWritePaths). -->
- <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>
- <proxy_prefix type="bool" default="false" desc="Enable a ProxyPrefix to be passed int through which to redirect requests"></proxy_prefix>
- <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>
- <connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by loolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs>
- </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>
-
- <welcome>
- <enable type="bool" desc="Controls whether the welcome screen should be shown to the users on new install and updates." default="true">false</enable>
- <enable_button type="bool" desc="Controls whether the welcome screen should have an explanatory button instead of an X button to close the dialog." default="false">false</enable_button>
- <path desc="Path to 'welcome-$lang.html' files served on first start or when the version changes. When empty, defaults to the Release notes." type="path" relative="true" default="loleaflet/welcome"></path>
- </welcome>
-
- <user_interface>
- <mode type="string" desc="Controls the user interface style (classic|notebookbar)" default="classic">classic</mode>
- </user_interface>
-
- <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">
- <as_scheme type="bool" default="true" desc="When set we exclusively use the WOPI URI's scheme to enable SSL for storage">true</as_scheme>
- <enable type="bool" desc="If as_scheme is false or not set, this can be set to force SSL encryption between storage and loolwsd. When empty this defaults 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. If this is not empty, then SSL verification will be strict, otherwise cert of storage (WOPI-like host) will not be verified." 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/config/loolwsd.6.4.6.2.xml.j2 b/roles/apps/collabora/code/templates/config/loolwsd.6.4.6.2.xml.j2
deleted file mode 100644
index 2542d252..00000000
--- a/roles/apps/collabora/code/templates/config/loolwsd.6.4.6.2.xml.j2
+++ /dev/null
@@ -1,180 +0,0 @@
-<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>
- <mount_jail_tree desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool" default="true"></mount_jail_tree>
-
- <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>
- <batch_priority desc="A (lower) priority for use by batch eg. convert-to processes to avoid starving interactive ones" type="uint" default="5">5</batch_priority>
- <document_signing_url desc="The endpoint URL of signing server, if empty the document signing is disabled" type="string" default=""></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>
- <cleanup desc="Checks for resource consuming (bad) documents and kills associated kit process. A document is considered resource consuming (bad) if is in idle state for idle_time_secs period and memory usage passed limit_dirty_mem_mb or CPU usage passed limit_cpu_per" enable="false">
- <cleanup_interval_ms desc="Interval between two checks" type="uint" default="10000">10000</cleanup_interval_ms>
- <bad_behavior_period_secs desc="Minimum time period for a document to be in bad state before associated kit process is killed. If in this period the condition for bad document is not met once then this period is reset" type="uint" default="60">60</bad_behavior_period_secs>
- <idle_time_secs desc="Minimum idle time for a document to be candidate for bad state" type="uint" default="300">300</idle_time_secs>
- <limit_dirty_mem_mb desc="Minimum memory usage for a document to be candidate for bad state" type="uint" default="3072">3072</limit_dirty_mem_mb>
- <limit_cpu_per desc="Minimum CPU usage for a document to be candidate for bad state" type="uint" default="85">85</limit_cpu_per>
- </cleanup>
- </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" desc="Enable minimal client-site JS protocol logging from the start">false</protocol>
- <!-- lokit_sal_log example: Log WebDAV-related messages, that is interesting for debugging Insert - Image operation: "+TIMESTAMP+INFO.ucb.ucp.webdav+WARN.ucb.ucp.webdav"
- See also: https://docs.libreoffice.org/sal/html/sal_log.html -->
- <lokit_sal_log type="string" desc="Fine tune log messages from LOKit. Default is to suppress log messages from LOKit." default="-INFO-WARN">-INFO-WARN</lokit_sal_log>
- <file enable="false">
- <!-- If you use other path than /var/log and you run loolwsd from systemd, make sure that you enable that path in loolwsd.service (ReadWritePaths). -->
- <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>
- <proxy_prefix type="bool" default="false" desc="Enable a ProxyPrefix to be passed int through which to redirect requests"></proxy_prefix>
- <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>
- <connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by loolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs>
- </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>
-
- <welcome>
- <enable type="bool" desc="Controls whether the welcome screen should be shown to the users on new install and updates." default="true">false</enable>
- <enable_button type="bool" desc="Controls whether the welcome screen should have an explanatory button instead of an X button to close the dialog." default="false">false</enable_button>
- <path desc="Path to 'welcome-$lang.html' files served on first start or when the version changes. When empty, defaults to the Release notes." type="path" relative="true" default="loleaflet/welcome"></path>
- </welcome>
-
- <user_interface>
- <mode type="string" desc="Controls the user interface style (classic|notebookbar)" default="classic">classic</mode>
- </user_interface>
-
- <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">
- <as_scheme type="bool" default="true" desc="When set we exclusively use the WOPI URI's scheme to enable SSL for storage">true</as_scheme>
- <enable type="bool" desc="If as_scheme is false or not set, this can be set to force SSL encryption between storage and loolwsd. When empty this defaults 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. If this is not empty, then SSL verification will be strict, otherwise cert of storage (WOPI-like host) will not be verified." 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/config/loolwsd.6.4.7.3.xml.j2 b/roles/apps/collabora/code/templates/config/loolwsd.6.4.7.3.xml.j2
deleted file mode 100644
index bd6eab16..00000000
--- a/roles/apps/collabora/code/templates/config/loolwsd.6.4.7.3.xml.j2
+++ /dev/null
@@ -1,184 +0,0 @@
-<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>
- <mount_jail_tree desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool" default="true"></mount_jail_tree>
-
- <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>
- <batch_priority desc="A (lower) priority for use by batch eg. convert-to processes to avoid starving interactive ones" type="uint" default="5">5</batch_priority>
- <document_signing_url desc="The endpoint URL of signing server, if empty the document signing is disabled" type="string" default=""></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>
- <cleanup desc="Checks for resource consuming (bad) documents and kills associated kit process. A document is considered resource consuming (bad) if is in idle state for idle_time_secs period and memory usage passed limit_dirty_mem_mb or CPU usage passed limit_cpu_per" enable="false">
- <cleanup_interval_ms desc="Interval between two checks" type="uint" default="10000">10000</cleanup_interval_ms>
- <bad_behavior_period_secs desc="Minimum time period for a document to be in bad state before associated kit process is killed. If in this period the condition for bad document is not met once then this period is reset" type="uint" default="60">60</bad_behavior_period_secs>
- <idle_time_secs desc="Minimum idle time for a document to be candidate for bad state" type="uint" default="300">300</idle_time_secs>
- <limit_dirty_mem_mb desc="Minimum memory usage for a document to be candidate for bad state" type="uint" default="3072">3072</limit_dirty_mem_mb>
- <limit_cpu_per desc="Minimum CPU usage for a document to be candidate for bad state" type="uint" default="85">85</limit_cpu_per>
- </cleanup>
- </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" desc="Enable minimal client-site JS protocol logging from the start">false</protocol>
- <!-- lokit_sal_log example: Log WebDAV-related messages, that is interesting for debugging Insert - Image operation: "+TIMESTAMP+INFO.ucb.ucp.webdav+WARN.ucb.ucp.webdav"
- See also: https://docs.libreoffice.org/sal/html/sal_log.html -->
- <lokit_sal_log type="string" desc="Fine tune log messages from LOKit. Default is to suppress log messages from LOKit." default="-INFO-WARN">-INFO-WARN</lokit_sal_log>
- <file enable="false">
- <!-- If you use other path than /var/log and you run loolwsd from systemd, make sure that you enable that path in loolwsd.service (ReadWritePaths). -->
- <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>
- <proxy_prefix type="bool" default="false" desc="Enable a ProxyPrefix to be passed int through which to redirect requests"></proxy_prefix>
- <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>
- <connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by loolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs>
- </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>
- <jwt_expiry_secs desc="Time in seconds before the Admin Console's JWT token expires" type="int" default="1800">1800</jwt_expiry_secs>
- <enable_macros_execution desc="Specifies whether the macro execution is enabled in general. This will enable Basic, Beanshell, Javascript and Python scripts. If it is set to false, the macro_security_level is ignored. If it is set to true, the mentioned entry specified the level of macro security." type="bool" default="false">{{ item.value.macros.allowed | default(false) | ternary('true', 'false') }}</enable_macros_execution>
- <macro_security_level desc="Level of Macro security. 1 (Medium) Confirmation required before executing macros from untrusted sources. 0 (Low, not recommended) All macros will be executed without confirmation." type="int" default="1">{{ item.value.macros.security_level | default('1') }}</macro_security_level>
- </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>
-
- <welcome>
- <enable type="bool" desc="Controls whether the welcome screen should be shown to the users on new install and updates." default="true">false</enable>
- <enable_button type="bool" desc="Controls whether the welcome screen should have an explanatory button instead of an X button to close the dialog." default="false">false</enable_button>
- <path desc="Path to 'welcome-$lang.html' files served on first start or when the version changes. When empty, defaults to the Release notes." type="path" relative="true" default="loleaflet/welcome"></path>
- </welcome>
-
- <user_interface>
- <mode type="string" desc="Controls the user interface style (classic|notebookbar)" default="classic">classic</mode>
- </user_interface>
-
- <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">
- <as_scheme type="bool" default="true" desc="When set we exclusively use the WOPI URI's scheme to enable SSL for storage">true</as_scheme>
- <enable type="bool" desc="If as_scheme is false or not set, this can be set to force SSL encryption between storage and loolwsd. When empty this defaults 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. If this is not empty, then SSL verification will be strict, otherwise cert of storage (WOPI-like host) will not be verified." 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/config/loolwsd.6.4.7.5.xml.j2 b/roles/apps/collabora/code/templates/config/loolwsd.6.4.7.5.xml.j2
deleted file mode 100644
index d3d5686f..00000000
--- a/roles/apps/collabora/code/templates/config/loolwsd.6.4.7.5.xml.j2
+++ /dev/null
@@ -1,184 +0,0 @@
-<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>
- <mount_jail_tree desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool" default="true"></mount_jail_tree>
-
- <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>
- <batch_priority desc="A (lower) priority for use by batch eg. convert-to processes to avoid starving interactive ones" type="uint" default="5">5</batch_priority>
- <document_signing_url desc="The endpoint URL of signing server, if empty the document signing is disabled" type="string" default=""></document_signing_url>
- <redlining_as_comments desc="If true show red-lines as comments" type="bool" default="false">false</redlining_as_comments>
- <pdf_resolution_dpi desc="The resolution, in DPI, used to render PDF documents as image. Memory consumption grows proportionally. Must be a positive value less than 385. Defaults to 96." type="uint" default="96">96</pdf_resolution_dpi>
- <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>
- <cleanup desc="Checks for resource consuming (bad) documents and kills associated kit process. A document is considered resource consuming (bad) if is in idle state for idle_time_secs period and memory usage passed limit_dirty_mem_mb or CPU usage passed limit_cpu_per" enable="false">
- <cleanup_interval_ms desc="Interval between two checks" type="uint" default="10000">10000</cleanup_interval_ms>
- <bad_behavior_period_secs desc="Minimum time period for a document to be in bad state before associated kit process is killed. If in this period the condition for bad document is not met once then this period is reset" type="uint" default="60">60</bad_behavior_period_secs>
- <idle_time_secs desc="Minimum idle time for a document to be candidate for bad state" type="uint" default="300">300</idle_time_secs>
- <limit_dirty_mem_mb desc="Minimum memory usage for a document to be candidate for bad state" type="uint" default="3072">3072</limit_dirty_mem_mb>
- <limit_cpu_per desc="Minimum CPU usage for a document to be candidate for bad state" type="uint" default="85">85</limit_cpu_per>
- </cleanup>
- </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" desc="Enable minimal client-site JS protocol logging from the start">false</protocol>
- <!-- lokit_sal_log example: Log WebDAV-related messages, that is interesting for debugging Insert - Image operation: "+TIMESTAMP+INFO.ucb.ucp.webdav+WARN.ucb.ucp.webdav"
- See also: https://docs.libreoffice.org/sal/html/sal_log.html -->
- <lokit_sal_log type="string" desc="Fine tune log messages from LOKit. Default is to suppress log messages from LOKit." default="-INFO-WARN">-INFO-WARN</lokit_sal_log>
- <file enable="false">
- <!-- If you use other path than /var/log and you run loolwsd from systemd, make sure that you enable that path in loolwsd.service (ReadWritePaths). -->
- <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>
- <proxy_prefix type="bool" default="false" desc="Enable a ProxyPrefix to be passed int through which to redirect requests"></proxy_prefix>
- <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>
- <connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by loolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs>
- </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>
- <jwt_expiry_secs desc="Time in seconds before the Admin Console's JWT token expires" type="int" default="1800">1800</jwt_expiry_secs>
- <enable_macros_execution desc="Specifies whether the macro execution is enabled in general. This will enable Basic, Beanshell, Javascript and Python scripts. If it is set to false, the macro_security_level is ignored. If it is set to true, the mentioned entry specified the level of macro security." type="bool" default="false">{{ item.value.macros.allowed | default(false) | ternary('true', 'false') }}</enable_macros_execution>
- <macro_security_level desc="Level of Macro security. 1 (Medium) Confirmation required before executing macros from untrusted sources. 0 (Low, not recommended) All macros will be executed without confirmation." type="int" default="1">{{ item.value.macros.security_level | default('1') }}</macro_security_level>
- </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>
-
- <welcome>
- <enable type="bool" desc="Controls whether the welcome screen should be shown to the users on new install and updates." default="true">false</enable>
- <enable_button type="bool" desc="Controls whether the welcome screen should have an explanatory button instead of an X button to close the dialog." default="false">false</enable_button>
- <path desc="Path to 'welcome-$lang.html' files served on first start or when the version changes. When empty, defaults to the Release notes." type="path" relative="true" default="loleaflet/welcome"></path>
- </welcome>
-
- <user_interface>
- <mode type="string" desc="Controls the user interface style (classic|notebookbar)" default="classic">classic</mode>
- </user_interface>
-
- <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">
- <as_scheme type="bool" default="true" desc="When set we exclusively use the WOPI URI's scheme to enable SSL for storage">true</as_scheme>
- <enable type="bool" desc="If as_scheme is false or not set, this can be set to force SSL encryption between storage and loolwsd. When empty this defaults 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. If this is not empty, then SSL verification will be strict, otherwise cert of storage (WOPI-like host) will not be verified." 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/config/loolwsd.6.4.8.1.xml.j2 b/roles/apps/collabora/code/templates/config/loolwsd.6.4.8.1.xml.j2
deleted file mode 100644
index 4daa414c..00000000
--- a/roles/apps/collabora/code/templates/config/loolwsd.6.4.8.1.xml.j2
+++ /dev/null
@@ -1,188 +0,0 @@
-<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>
- <mount_jail_tree desc="Controls whether the systemplate and lotemplate contents are mounted or not, which is much faster than the default of linking/copying each file." type="bool" default="true"></mount_jail_tree>
-
- <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>
- <batch_priority desc="A (lower) priority for use by batch eg. convert-to processes to avoid starving interactive ones" type="uint" default="5">5</batch_priority>
- <document_signing_url desc="The endpoint URL of signing server, if empty the document signing is disabled" type="string" default=""></document_signing_url>
- <redlining_as_comments desc="If true show red-lines as comments" type="bool" default="false">false</redlining_as_comments>
- <pdf_resolution_dpi desc="The resolution, in DPI, used to render PDF documents as image. Memory consumption grows proportionally. Must be a positive value less than 385. Defaults to 96." type="uint" default="96">96</pdf_resolution_dpi>
- <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>
- <cleanup desc="Checks for resource consuming (bad) documents and kills associated kit process. A document is considered resource consuming (bad) if is in idle state for idle_time_secs period and memory usage passed limit_dirty_mem_mb or CPU usage passed limit_cpu_per" enable="false">
- <cleanup_interval_ms desc="Interval between two checks" type="uint" default="10000">10000</cleanup_interval_ms>
- <bad_behavior_period_secs desc="Minimum time period for a document to be in bad state before associated kit process is killed. If in this period the condition for bad document is not met once then this period is reset" type="uint" default="60">60</bad_behavior_period_secs>
- <idle_time_secs desc="Minimum idle time for a document to be candidate for bad state" type="uint" default="300">300</idle_time_secs>
- <limit_dirty_mem_mb desc="Minimum memory usage for a document to be candidate for bad state" type="uint" default="3072">3072</limit_dirty_mem_mb>
- <limit_cpu_per desc="Minimum CPU usage for a document to be candidate for bad state" type="uint" default="85">85</limit_cpu_per>
- </cleanup>
- </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" desc="Enable minimal client-site JS protocol logging from the start">false</protocol>
- <!-- lokit_sal_log example: Log WebDAV-related messages, that is interesting for debugging Insert - Image operation: "+TIMESTAMP+INFO.ucb.ucp.webdav+WARN.ucb.ucp.webdav"
- See also: https://docs.libreoffice.org/sal/html/sal_log.html -->
- <lokit_sal_log type="string" desc="Fine tune log messages from LOKit. Default is to suppress log messages from LOKit." default="-INFO-WARN">-INFO-WARN</lokit_sal_log>
- <file enable="false">
- <!-- If you use other path than /var/log and you run loolwsd from systemd, make sure that you enable that path in loolwsd.service (ReadWritePaths). -->
- <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>
-
- <event_trace>
- <path type="string" desc="Event Trace file path." default="/var/log/loolwsd.trace">/var/log/loolwsd.trace</path>
- </event_trace>
-
- <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>
- <proxy_prefix type="bool" default="false" desc="Enable a ProxyPrefix to be passed int through which to redirect requests"></proxy_prefix>
- <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>
- <connection_timeout_secs desc="Specifies the connection, send, recv timeout in seconds for connections initiated by loolwsd (such as WOPI connections)." type="int" default="30"></connection_timeout_secs>
- </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>
- <jwt_expiry_secs desc="Time in seconds before the Admin Console's JWT token expires" type="int" default="1800">1800</jwt_expiry_secs>
- <enable_macros_execution desc="Specifies whether the macro execution is enabled in general. This will enable Basic, Beanshell, Javascript and Python scripts. If it is set to false, the macro_security_level is ignored. If it is set to true, the mentioned entry specified the level of macro security." type="bool" default="false">{{ item.value.macros.allowed | default(false) | ternary('true', 'false') }}</enable_macros_execution>
- <macro_security_level desc="Level of Macro security. 1 (Medium) Confirmation required before executing macros from untrusted sources. 0 (Low, not recommended) All macros will be executed without confirmation." type="int" default="1">{{ item.value.macros.security_level | default('1') }}</macro_security_level>
- </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>
-
- <welcome>
- <enable type="bool" desc="Controls whether the welcome screen should be shown to the users on new install and updates." default="true">false</enable>
- <enable_button type="bool" desc="Controls whether the welcome screen should have an explanatory button instead of an X button to close the dialog." default="false">false</enable_button>
- <path desc="Path to 'welcome-$lang.html' files served on first start or when the version changes. When empty, defaults to the Release notes." type="path" relative="true" default="loleaflet/welcome"></path>
- </welcome>
-
- <user_interface>
- <mode type="string" desc="Controls the user interface style (classic|notebookbar)" default="classic">classic</mode>
- </user_interface>
-
- <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">
- <as_scheme type="bool" default="true" desc="When set we exclusively use the WOPI URI's scheme to enable SSL for storage">true</as_scheme>
- <enable type="bool" desc="If as_scheme is false or not set, this can be set to force SSL encryption between storage and loolwsd. When empty this defaults 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. If this is not empty, then SSL verification will be strict, otherwise cert of storage (WOPI-like host) will not be verified." 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
deleted file mode 100644
index 67502e20..00000000
--- a/roles/apps/collabora/code/templates/nginx-vhost.conf.j2
+++ /dev/null
@@ -1,99 +0,0 @@
-client_max_body_size 128M;
-
-# static files
-{% if item.value.version | collabora_code_loolvcool %}
-location ^~ /loleaflet {
-{% else %}
-location ^~ /browser {
-{% endif %}
- include snippets/proxy-nobuff.conf;
- include snippets/proxy-forward-headers.conf;
-
- proxy_set_header Host $http_host;
- proxy_pass http://127.0.0.1:{{ item.value.port }};
-
- proxy_redirect http://$host/ https://$host/;
- proxy_redirect http://$host:9980/ https://$host/;
-}
-
-# WOPI discovery URL
-location ^~ /hosting/discovery {
- include snippets/proxy-nobuff.conf;
- include snippets/proxy-forward-headers.conf;
-
- proxy_set_header Host $http_host;
- proxy_pass http://127.0.0.1:{{ item.value.port }};
-
- proxy_redirect http://$host/ https://$host/;
- proxy_redirect http://$host:9980/ https://$host/;
-}
-
-# Capabilities
-location ^~ /hosting/capabilities {
- include snippets/proxy-nobuff.conf;
- include snippets/proxy-forward-headers.conf;
-
- proxy_set_header Host $http_host;
- proxy_pass http://127.0.0.1:{{ item.value.port }};
-
- proxy_redirect http://$host/ https://$host/;
- proxy_redirect http://$host:9980/ https://$host/;
-}
-
-# main websocket
-{% if item.value.version | collabora_code_loolvcool %}
-location ~ ^/lool/(.*)/ws$ {
-{% else %}
-location ~ ^/cool/(.*)/ws$ {
-{% endif %}
- include snippets/proxy-nobuff.conf;
- include snippets/proxy-forward-headers.conf;
-
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection $connection_upgrade;
-
- proxy_read_timeout 36000s;
-
- proxy_set_header Host $http_host;
- proxy_pass http://127.0.0.1:{{ item.value.port }};
-
- proxy_redirect http://$host/ https://$host/;
- proxy_redirect http://$host:9980/ https://$host/;
-}
-
-# download, presentation and image upload
-{% if item.value.version | collabora_code_loolvcool %}
-location ~ ^/lool {
-{% else %}
-location ~ ^/(c|l)ool {
-{% endif %}
- include snippets/proxy-nobuff.conf;
- include snippets/proxy-forward-headers.conf;
-
- proxy_set_header Host $http_host;
- proxy_pass http://127.0.0.1:{{ item.value.port }};
-
- proxy_redirect http://$host/ https://$host/;
- proxy_redirect http://$host:9980/ https://$host/;
-}
-
-# Admin Console websocket
-{% if item.value.version | collabora_code_loolvcool %}
-location ^~ /lool/adminws {
-{% else %}
-location ^~ /cool/adminws {
-{% endif %}
- include snippets/proxy-nobuff.conf;
- include snippets/proxy-forward-headers.conf;
-
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection $connection_upgrade;
-
- proxy_read_timeout 36000s;
-
- proxy_set_header Host $http_host;
- proxy_pass http://127.0.0.1:{{ item.value.port }};
-
- proxy_redirect http://$host/ https://$host/;
- proxy_redirect http://$host:9980/ https://$host/;
-}
diff --git a/roles/apps/collabora/code/templates/pod-spec.yml.j2 b/roles/apps/collabora/code/templates/pod-spec.yml.j2
deleted file mode 100644
index 22dfaf49..00000000
--- a/roles/apps/collabora/code/templates/pod-spec.yml.j2
+++ /dev/null
@@ -1,30 +0,0 @@
-containers:
-- name: collabora-code
- image: "collabora/code{% if 'custom_image' in item.value %}/{{ item.key }}{% endif %}:{{ item.value.version }}"
- resources:
- limits:
- memory: "4Gi"
- env:
- - name: "DONT_GEN_SSL_CERT"
- value: "1"
- - name: "extra_params"
- value: "--o:ssl.enable=false --o:ssl.termination=true"
- volumeMounts:
- - name: config
-{% if item.value.version | collabora_code_loolvcool %}
- mountPath: /etc/loolwsd/loolwsd.xml
- subPath: loolwsd.xml
-{% else %}
- mountPath: /etc/coolwsd/coolwsd.xml
- subPath: coolwsd.xml
-{% endif %}
- readOnly: true
- ports:
- - containerPort: 9980
- hostPort: {{ item.value.port }}
- hostIP: 127.0.0.1
-volumes:
-- name: config
- hostPath:
- path: "{{ collabora_code_base_path }}/{{ item.key }}/config/"
- type: Directory
diff --git a/roles/apps/nextcloud/base/defaults/main.yml b/roles/apps/nextcloud/base/defaults/main.yml
new file mode 100644
index 00000000..1a8a6d52
--- /dev/null
+++ b/roles/apps/nextcloud/base/defaults/main.yml
@@ -0,0 +1,9 @@
+---
+nextcloud_app_uid: "950"
+nextcloud_app_gid: "950"
+
+nextcloud_db_uid: "951"
+nextcloud_db_gid: "951"
+
+nextcloud_redis_uid: "952"
+nextcloud_redis_gid: "952"
diff --git a/roles/apps/nextcloud/base/tasks/main.yml b/roles/apps/nextcloud/base/tasks/main.yml
new file mode 100644
index 00000000..4c85a35c
--- /dev/null
+++ b/roles/apps/nextcloud/base/tasks/main.yml
@@ -0,0 +1,51 @@
+---
+- name: add group for nextcloud app
+ group:
+ name: nc-app
+ gid: "{{ nextcloud_app_gid }}"
+
+- name: add user for nextcloud app
+ user:
+ name: nc-app
+ uid: "{{ nextcloud_app_uid }}"
+ group: nc-app
+ password: "!"
+
+- name: add group for nextcloud db
+ group:
+ name: nc-db
+ gid: "{{ nextcloud_db_gid }}"
+
+- name: add user for nextcloud db
+ user:
+ name: nc-db
+ uid: "{{ nextcloud_db_uid }}"
+ group: nc-db
+ password: "!"
+
+- name: add group for nextcloud redis
+ group:
+ name: nc-redis
+ gid: "{{ nextcloud_redis_gid }}"
+
+- name: add user for nextcloud redis
+ user:
+ name: nc-redis
+ uid: "{{ nextcloud_redis_uid }}"
+ group: nc-redis
+ password: "!"
+
+- name: install template systemd unit for cron trigger
+ template:
+ src: cron@.service.j2
+ dest: /etc/systemd/system/nextcloud-cron@.service
+
+- name: install management scripts
+ loop:
+ - nextcloud-upgrade
+ - nextcloud-occ
+ - nextcloud-cron
+ template:
+ src: "{{ item }}.j2"
+ dest: "/usr/local/bin/{{ item }}"
+ mode: 0755
diff --git a/roles/apps/nextcloud/templates/cron@.service.j2 b/roles/apps/nextcloud/base/templates/cron@.service.j2
index 822f64b4..d8cde0a3 100644
--- a/roles/apps/nextcloud/templates/cron@.service.j2
+++ b/roles/apps/nextcloud/base/templates/cron@.service.j2
@@ -3,7 +3,7 @@ Description=Nextcloud cron.php job for %i
[Service]
Type=oneshot
-ExecStart={{ nextcloud_base_path }}/%i/config/run-cron.sh
+ExecStart=/usr/local/bin/nextcloud-cron %i
NoNewPrivileges=yes
PrivateTmp=yes
PrivateDevices=yes
diff --git a/roles/apps/nextcloud/base/templates/nextcloud-cron.j2 b/roles/apps/nextcloud/base/templates/nextcloud-cron.j2
new file mode 100755
index 00000000..cf1d9715
--- /dev/null
+++ b/roles/apps/nextcloud/base/templates/nextcloud-cron.j2
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+INST_NAME="$1"
+shift
+
+if [ -z "$INST_NAME" ]; then
+ echo "Usage: $0 <instance>"
+ exit 1
+fi
+
+set -eu
+
+pod_id=$(crictl pods -q --state ready --name "^nextcloud-$INST_NAME-{{ ansible_nodename }}$")
+if [ -z "$pod_id" ]; then echo "Pod not found"; exit 1; fi
+
+container_id=$(crictl ps -q --name '^nextcloud$' -p "$pod_id")
+if [ -z "$container_id" ]; then echo "Container not found"; exit 1; fi
+
+exec crictl exec "$container_id" bash -c 'php -f /var/www/html/occ status -e; if [ $? -eq 0 ]; then php -f /var/www/html/cron.php; else echo "not running cron script when in maintenance mode"; fi'
diff --git a/roles/apps/nextcloud/templates/nextcloud-occ.j2 b/roles/apps/nextcloud/base/templates/nextcloud-occ.j2
index f12f1259..01383c95 100755
--- a/roles/apps/nextcloud/templates/nextcloud-occ.j2
+++ b/roles/apps/nextcloud/base/templates/nextcloud-occ.j2
@@ -16,4 +16,4 @@ if [ -z "$pod_id" ]; then echo "Pod not found"; exit 1; fi
container_id=$(crictl ps -q --name '^nextcloud$' -p "$pod_id")
if [ -z "$container_id" ]; then echo "Container not found"; exit 1; fi
-exec crictl exec -it "$container_id" php /var/www/html/occ $@
+exec crictl exec -it "$container_id" php -f /var/www/html/occ $@
diff --git a/roles/apps/nextcloud/templates/nextcloud-upgrade.j2 b/roles/apps/nextcloud/base/templates/nextcloud-upgrade.j2
index f59f3be6..f6edcb44 100755
--- a/roles/apps/nextcloud/templates/nextcloud-upgrade.j2
+++ b/roles/apps/nextcloud/base/templates/nextcloud-upgrade.j2
@@ -9,6 +9,13 @@ fi
set -eu
+CURRENT_VERSION=$(nextcloud-occ "$INST_NAME" status -n --no-warnings --output plain | tr -d '\r' | awk -F : '/versionstring/ { print($2) }' | tr -d ' ')
+if [ "$CURRENT_VERSION" = "$VERSION" ]; then
+ echo "The current running version of nextcloud is already $CURRENT_VERSION, nothing to do here."
+ exit 0
+fi
+echo "will upgrade nextcloud instance $INST_NAME from '$CURRENT_VERSION' to '$VERSION'"
+
K8S_CONFIG_HASH_D="/etc/kubernetes/config-hashes/"
K8S_CONFIG_HASH_FILE="$K8S_CONFIG_HASH_D/nextcloud-$INST_NAME.yml"
K8S_MANIFEST_D="/etc/kubernetes/manifests/"
@@ -24,7 +31,7 @@ function cleanup {
}
trap cleanup EXIT
-IMAGE_BUILD_D="{{ nextcloud_base_path }}/$INST_NAME/build"
+IMAGE_BUILD_D=$(cat "$K8S_CONFIG_HASH_FILE" | grep "build/Dockerfile:" | tr -d ":" | xargs dirname)
IMAGE_NAME="nextcloud"
if [ -e "$IMAGE_BUILD_D/Dockerfile" ]; then
## this only works if docker is installed...
@@ -40,15 +47,9 @@ else
crictl pull "docker.io/library/nextcloud:$VERSION"
echo ""
fi
-{% if nextcloud_zfs is defined %}
-echo "*** creating ZFS snapshot"
-echo ""
-
-IMAGE_NAME_ESCAPED=${IMAGE_NAME/\//\\/}
-CURRENT_VERSION=$(cat "$K8S_MANIFEST_FILE" | awk '/image: "'"$IMAGE_NAME_ESCAPED"':.*"/ { print($2) }' | tr -d '"' | cut -d ':' -f 2)
-zfs snapshot "{{ nextcloud_zfs.pool }}/{{ nextcloud_zfs.name }}/$INST_NAME@upgrade_$CURRENT_VERSION-to-$VERSION""_$(date '+%Y-%m-%m_%H:%M:%S')"
-{% endif %}
+INSTANCE_BASE_D=$(dirname "$IMAGE_BUILD_D")
+"$INSTANCE_BASE_D/upgrade.sh" prepare "$CURRENT_VERSION" "$VERSION"
echo "*** Rebuilding config-hash file"
echo ""
@@ -68,4 +69,6 @@ cat "$TMP_D/config-hash.yml" > "$K8S_CONFIG_HASH_FILE"
cat "$TMP_D/manifest.yml" > "$K8S_MANIFEST_FILE"
echo ""
+"$INSTANCE_BASE_D/upgrade.sh" finalize "$CURRENT_VERSION" "$VERSION"
+
exit 0
diff --git a/roles/apps/nextcloud/defaults/main.yml b/roles/apps/nextcloud/defaults/main.yml
index f194a6f9..631b0a0a 100644
--- a/roles/apps/nextcloud/defaults/main.yml
+++ b/roles/apps/nextcloud/defaults/main.yml
@@ -1,31 +1,11 @@
---
-nextcloud_app_uid: "950"
-nextcloud_app_gid: "950"
-
-nextcloud_db_uid: "951"
-nextcloud_db_gid: "951"
-
-nextcloud_redis_uid: "952"
-nextcloud_redis_gid: "952"
-
-# nextcloud_base_path: /srv/nextcloud
-
-# nextcloud_zfs:
-# pool: storage
-# name: nextcloud
-# properties:
-# compression: lz4
-
# nextcloud_instances:
# example:
# new: yes
# version: 17.0.0
# port: 8100
-# hostnames:
-# - wolke.example.com
-# - cloud.example.com
-# zfs_properties:
-# quota: 100G
+# storage:
+# type: ...
# database:
# type: mariadb
# version: 10.4.8
@@ -34,3 +14,10 @@ nextcloud_redis_gid: "952"
# from: foo/bar:1.0 # optional
# dockerfile: |
# RUN apt-get install ...
+# publish:
+# zone: "{{ apps_publish_zone__foo }}"
+# hostnames:
+# - wolke.example.com
+# - cloud.example.com
+# tls:
+# certificate_provider: ...
diff --git a/roles/apps/nextcloud/instance/defaults/main.yml b/roles/apps/nextcloud/instance/defaults/main.yml
new file mode 100644
index 00000000..1a8a6d52
--- /dev/null
+++ b/roles/apps/nextcloud/instance/defaults/main.yml
@@ -0,0 +1,9 @@
+---
+nextcloud_app_uid: "950"
+nextcloud_app_gid: "950"
+
+nextcloud_db_uid: "951"
+nextcloud_db_gid: "951"
+
+nextcloud_redis_uid: "952"
+nextcloud_redis_gid: "952"
diff --git a/roles/apps/nextcloud/tasks/custom-image.yml b/roles/apps/nextcloud/instance/tasks/custom-image.yml
index 3d9e31d1..f9e130a2 100644
--- a/roles/apps/nextcloud/tasks/custom-image.yml
+++ b/roles/apps/nextcloud/instance/tasks/custom-image.yml
@@ -1,31 +1,31 @@
---
- name: create build directory for custom image
file:
- path: "{{ nextcloud_base_path }}/{{ item.key }}/build"
+ path: "{{ nextcloud_instance_basepath }}/build"
state: directory
- name: generate Dockerfile for custom image
copy:
content: |
- FROM {{ item.value.custom_image.from | default('nextcloud:' + item.value.version) }}
+ FROM {{ nextcloud_instances[nextcloud_instance].custom_image.from | default('nextcloud:' + nextcloud_instances[nextcloud_instance].version) }}
RUN set -x \
&& addgroup --gid {{ nextcloud_app_gid }} nc-app \
&& adduser --uid {{ nextcloud_app_uid }} --gid {{ nextcloud_app_gid }} --system --no-create-home --home /var/www/html --disabled-login --disabled-password nc-app
- {% if 'custom_image' in item.value %}
+ {% if 'custom_image' in nextcloud_instances[nextcloud_instance] %}
- {{ item.value.custom_image.dockerfile }}
+ {{ nextcloud_instances[nextcloud_instance].custom_image.dockerfile }}
{% endif %}
- dest: "{{ nextcloud_base_path }}/{{ item.key }}/build/Dockerfile"
+ dest: "{{ nextcloud_instance_basepath }}/build/Dockerfile"
register: nextcloud_custom_image_docker
- name: build custom image
docker_image:
- name: "nextcloud/{{ item.key }}:{{ item.value.version }}"
+ name: "nextcloud/{{ nextcloud_instance }}:{{ nextcloud_instances[nextcloud_instance].version }}"
state: present
force_source: "{{ nextcloud_custom_image_docker is changed }}"
source: build
build:
- path: "{{ nextcloud_base_path }}/{{ item.key }}/build"
+ path: "{{ nextcloud_instance_basepath }}/build"
network: host
pull: yes
diff --git a/roles/apps/nextcloud/instance/tasks/main.yml b/roles/apps/nextcloud/instance/tasks/main.yml
new file mode 100644
index 00000000..71a3ee79
--- /dev/null
+++ b/roles/apps/nextcloud/instance/tasks/main.yml
@@ -0,0 +1,196 @@
+---
+- name: prepare storage volume
+ vars:
+ storage_volume: "{{ nextcloud_instances[nextcloud_instance].storage }}"
+ include_role:
+ name: "storage/{{ nextcloud_instances[nextcloud_instance].storage.type }}/volume"
+
+- set_fact:
+ nextcloud_instance_basepath: "{{ storage_volume_mountpoint }}"
+
+- name: create nextcloud app subdirectory
+ file:
+ path: "{{ nextcloud_instance_basepath }}/nextcloud"
+ owner: "{{ nextcloud_app_uid }}"
+ group: "{{ nextcloud_app_gid }}"
+ state: directory
+
+- name: create nextcloud database subdirectory
+ file:
+ path: "{{ nextcloud_instance_basepath }}/{{ nextcloud_instances[nextcloud_instance].database.type }}"
+ owner: "{{ nextcloud_db_uid }}"
+ group: "{{ nextcloud_db_gid }}"
+ state: directory
+
+- name: create nextcloud redis subdirectory
+ file:
+ path: "{{ nextcloud_instance_basepath }}/redis"
+ owner: "{{ nextcloud_redis_uid }}"
+ group: "{{ nextcloud_redis_gid }}"
+ state: directory
+
+
+- name: create auxiliary config directory
+ file:
+ path: "{{ nextcloud_instance_basepath }}/config"
+ state: directory
+
+- name: create apache vhost config
+ template:
+ src: apache-site.conf.j2
+ dest: "{{ nextcloud_instance_basepath }}/config/apache-site.conf"
+
+- name: configure apache to run on port 8080 only
+ copy:
+ content: |
+ Listen 8080
+ dest: "{{ nextcloud_instance_basepath }}/config/ports.conf"
+
+
+- name: create tls directory
+ file:
+ path: "{{ nextcloud_instance_basepath }}/tls"
+ owner: "{{ nextcloud_app_uid }}"
+ group: "{{ nextcloud_app_gid }}"
+ mode: 0500
+ state: directory
+
+- name: generate/install TLS certificates for publishment
+ vars:
+ x509_certificate_name: "nextcloud-{{ nextcloud_instance }}_publish"
+ x509_certificate_hostnames: []
+ x509_certificate_config:
+ ca: "{{ nextcloud_instances[nextcloud_instance].publish.zone.certificate_ca_config }}"
+ cert:
+ common_name: "nextcloud-{{ nextcloud_instance }}.{{ inventory_hostname }}"
+ extended_key_usage:
+ - serverAuth
+ extended_key_usage_critical: yes
+ create_subject_key_identifier: yes
+ not_after: +100w
+ x509_certificate_renewal:
+ install:
+ - dest: "{{ nextcloud_instance_basepath }}/tls/cert.pem"
+ src:
+ - cert
+ owner: "{{ nextcloud_app_uid }}"
+ mode: "0400"
+ - dest: "{{ nextcloud_instance_basepath }}/tls/key.pem"
+ src:
+ - key
+ owner: "{{ nextcloud_app_uid }}"
+ mode: "0400"
+ include_role:
+ name: "x509/{{ nextcloud_instances[nextcloud_instance].publish.zone.certificate_provider }}/cert"
+
+
+- name: build custom image
+ # when: "'custom_image' in nextcloud_instances[nextcloud_instance]"
+ include_tasks: custom-image.yml
+
+- name: install pod manifest
+ vars:
+ kubernetes_standalone_pod:
+ name: "nextcloud-{{ nextcloud_instance }}"
+ spec: "{{ lookup('template', 'pod-spec-with-{{ nextcloud_instances[nextcloud_instance].database.type }}.yml.j2') }}"
+ mode: "0600"
+ config_hash_items:
+ - path: "{{ nextcloud_instance_basepath }}/config/apache-site.conf"
+ properties:
+ - checksum
+ - path: "{{ nextcloud_instance_basepath }}/config/ports.conf"
+ properties:
+ - checksum
+ - path: "{{ nextcloud_instance_basepath }}/build/Dockerfile"
+ properties:
+ - checksum
+ include_role:
+ name: kubernetes/standalone/pod
+
+
+- name: install upgrade helper script
+ template:
+ src: upgrade.sh.j2
+ dest: "{{ nextcloud_instance_basepath }}/upgrade.sh"
+ mode: 0755
+
+
+- name: install systemd timer unit
+ template:
+ src: cron-.timer.j2
+ dest: "/etc/systemd/system/nextcloud-cron-{{ nextcloud_instance }}.timer"
+
+- name: start/enable cron trigger systemd timer
+ systemd:
+ daemon_reload: yes
+ name: "nextcloud-cron-{{ nextcloud_instance }}.timer"
+ state: started
+ enabled: yes
+
+
+- name: configure nginx vhost for publishment
+ vars:
+ nginx_vhost__yaml: |
+ name: "nextcloud-{{ nextcloud_instance }}.{{ inventory_hostname }}"
+ template: generic
+ {% if 'tls' in nextcloud_instances[nextcloud_instance].publish %}
+ tls:
+ {{ nextcloud_instances[nextcloud_instance].publish.tls | to_nice_yaml(indent=2) | indent(2) }}
+ {% endif %}
+ hostnames:
+ {% for hostname in nextcloud_instances[nextcloud_instance].publish.hostnames %}
+ - {{ hostname }}
+ {% endfor %}
+ locations:
+ '/':
+ {% if nextcloud_instances[nextcloud_instance].publish.zone.publisher == inventory_hostname %}
+ proxy_pass: "https://127.0.0.1:{{ nextcloud_instances[nextcloud_instance].port }}"
+ {% else %}
+ proxy_pass: "https://{{ ansible_default_ipv4.address }}:{{ nextcloud_instances[nextcloud_instance].port }}"
+ {% endif %}
+ proxy_redirect:
+ - redirect: "https://$host:8080/"
+ replacement: "https://$host/"
+ proxy_ssl:
+ trusted_certificate: "/etc/ssl/apps-publish-{{ nextcloud_instances[nextcloud_instance].publish.zone.name }}/apps-publish-{{ nextcloud_instances[nextcloud_instance].publish.zone.name }}-ca-crt.pem"
+ verify: "on"
+ name: "nextcloud-{{ nextcloud_instance }}.{{ inventory_hostname }}"
+ protocols: "TLSv1.3"
+ extra_directives: |-
+ client_max_body_size 0;
+ types {
+ text/javascript js mjs;
+ }
+ nginx_vhost: "{{ nginx_vhost__yaml | from_yaml }}"
+ include_role:
+ name: nginx/vhost
+ apply:
+ delegate_to: "{{ nextcloud_instances[nextcloud_instance].publish.zone.publisher }}"
+
+
+# TODO:
+# do this automatically!
+- name: print info for new instance
+ when: "'new' in nextcloud_instances[nextcloud_instance] and nextcloud_instances[nextcloud_instance].new"
+ pause:
+ seconds: 5
+ prompt: |
+ ************* {{ nextcloud_instance }} is a new instance
+ **
+ ** Go to https://{{ nextcloud_instances[nextcloud_instance].publish.hostnames[0] }} and finalize the
+ ** installation. After that run the following commands:
+ **
+ ** $ nextcloud-occ {{ nextcloud_instance }} config:system:set default_phone_region --value='at'
+ ** $ nextcloud-occ {{ nextcloud_instance }} config:system:set memcache.locking --value '\OC\Memcache\Redis'
+ ** $ nextcloud-occ {{ nextcloud_instance }} config:system:set redis host --value '127.0.0.1'
+ ** $ nextcloud-occ {{ nextcloud_instance }} config:system:set redis port --type integer --value 6379
+ ** $ nextcloud-occ {{ nextcloud_instance }} config:system:set redis timeout --type float --value 0.0
+ ** $ nextcloud-occ {{ nextcloud_instance }} config:system:set redis password
+ ** $ nextcloud-occ {{ nextcloud_instance }} config:system:set maintenance_window_start --type integer --value 23
+ **
+ ** in case you want to use an exteranl collabora/code server:
+ **
+ ** $ nextcloud-occ {{ nextcloud_instance }} app:disable richdocumentscode
+ ** $ nextcloud-occ {{ nextcloud_instance }} app:remove richdocumentscode
+ **
+ ****************************************
diff --git a/roles/apps/nextcloud/instance/templates/apache-site.conf.j2 b/roles/apps/nextcloud/instance/templates/apache-site.conf.j2
new file mode 100644
index 00000000..8df06113
--- /dev/null
+++ b/roles/apps/nextcloud/instance/templates/apache-site.conf.j2
@@ -0,0 +1,20 @@
+IncludeOptional mods-available/socache_shmcb.load
+IncludeOptional mods-available/ssl.load
+IncludeOptional mods-available/ssl.conf
+
+<VirtualHost *:8080>
+ ServerAdmin webmaster@localhost
+ DocumentRoot /var/www/html
+
+ UseCanonicalName Off
+ UseCanonicalPhysicalPort Off
+
+ ServerName nextcloud-{{ nextcloud_instance }}.{{ inventory_hostname }}
+ SSLEngine on
+ SSLCertificateFile "/etc/ssl/publish/cert.pem"
+ SSLCertificateKeyFile "/etc/ssl/publish/key.pem"
+ SSLProtocol TLSv1.3
+
+ ErrorLog ${APACHE_LOG_DIR}/error.log
+ CustomLog ${APACHE_LOG_DIR}/access.log combined
+</VirtualHost>
diff --git a/roles/apps/nextcloud/instance/templates/cron-.timer.j2 b/roles/apps/nextcloud/instance/templates/cron-.timer.j2
new file mode 100644
index 00000000..eead0fd0
--- /dev/null
+++ b/roles/apps/nextcloud/instance/templates/cron-.timer.j2
@@ -0,0 +1,9 @@
+[Unit]
+Description=Nextcloud cron.php job timer for {{ nextcloud_instance }}
+
+[Timer]
+OnCalendar=*:{{ 5 | random(seed=nextcloud_instance) }}/5
+Unit=nextcloud-cron@{{ nextcloud_instance }}.service
+
+[Install]
+WantedBy=timers.target
diff --git a/roles/apps/nextcloud/instance/templates/pod-spec-with-mariadb.yml.j2 b/roles/apps/nextcloud/instance/templates/pod-spec-with-mariadb.yml.j2
new file mode 100644
index 00000000..c1a4f2ea
--- /dev/null
+++ b/roles/apps/nextcloud/instance/templates/pod-spec-with-mariadb.yml.j2
@@ -0,0 +1,110 @@
+securityContext:
+ allowPrivilegeEscalation: false
+containers:
+- name: nextcloud
+{# image: "nextcloud{% if 'custom_image' in nextcloud_instances[nextcloud_instance] %}/{{ nextcloud_instance }}{% endif %}:{{ nextcloud_instances[nextcloud_instance].version }}" #}
+ image: "nextcloud/{{ nextcloud_instance }}:{{ nextcloud_instances[nextcloud_instance].version }}"
+ securityContext:
+ runAsUser: {{ nextcloud_app_uid }}
+ runAsGroup: {{ nextcloud_app_gid }}
+ resources:
+ limits:
+ memory: "4Gi"
+{% if 'new' in nextcloud_instances[nextcloud_instance] and nextcloud_instances[nextcloud_instance].new %}
+ env:
+ - name: NEXTCLOUD_TRUSTED_DOMAINS
+ value: "{{ nextcloud_instances[nextcloud_instance].publish.hostnames | join(' ') }}"
+ - name: MYSQL_HOST
+ value: 127.0.0.1
+ - name: MYSQL_DATABASE
+ value: nextcloud
+ - name: MYSQL_USER
+ value: nextcloud
+ - name: MYSQL_PASSWORD
+ value: "{{ nextcloud_instances[nextcloud_instance].database.password }}"
+{% endif %}
+ volumeMounts:
+ - name: nextcloud
+ mountPath: /var/www/html
+ - name: config
+ mountPath: /etc/apache2/sites-available/000-default.conf
+ subPath: apache-site.conf
+ readOnly: true
+ - name: config
+ mountPath: /etc/apache2/ports.conf
+ subPath: ports.conf
+ readOnly: true
+ - name: tls
+ mountPath: /etc/ssl/publish
+ readOnly: true
+ ports:
+ - containerPort: 8080
+ hostPort: {{ nextcloud_instances[nextcloud_instance].port }}
+ hostIP: 127.0.0.1
+- name: redis
+ image: "redis:{{ nextcloud_instances[nextcloud_instance].redis.version }}"
+ args:
+ - --bind 127.0.0.1
+ securityContext:
+ runAsUser: {{ nextcloud_redis_uid }}
+ runAsGroup: {{ nextcloud_redis_gid }}
+ resources:
+ limits:
+ memory: "512Mi"
+ volumeMounts:
+ - name: redis
+ mountPath: /data
+- name: database
+ image: "mariadb:{{ nextcloud_instances[nextcloud_instance].database.version }}"
+ args:
+ - --transaction-isolation=READ-COMMITTED
+ - --log-bin=binlog
+ - --binlog-format=ROW
+{% for arg in (nextcloud_instances[nextcloud_instance].database.extra_args | default([])) %}
+ - {{ arg }}
+{% endfor %}
+ securityContext:
+ runAsUser: {{ nextcloud_db_uid }}
+ runAsGroup: {{ nextcloud_db_gid }}
+ resources:
+ limits:
+ memory: "2Gi"
+ env:
+ - name: MARIADB_AUTO_UPGRADE
+ value: "true"
+ - name: MARIADB_DISABLE_UPGRADE_BACKUP
+ value: "true"
+{% if 'new' in nextcloud_instances[nextcloud_instance] and nextcloud_instances[nextcloud_instance].new %}
+ - name: MARIADB_RANDOM_ROOT_PASSWORD
+ value: "true"
+ - name: MARIADB_DATABASE
+ value: nextcloud
+ - name: MARIADB_USER
+ value: nextcloud
+ - name: MARIADB_PASSWORD
+ value: "{{ nextcloud_instances[nextcloud_instance].database.password }}"
+{% endif %}
+ volumeMounts:
+ - name: database
+ mountPath: /var/lib/mysql
+volumes:
+- name: config
+ hostPath:
+ path: "{{ nextcloud_instance_basepath }}/config/"
+ type: Directory
+- name: tls
+ hostPath:
+ path: "{{ nextcloud_instance_basepath }}/tls/"
+ type: Directory
+- name: nextcloud
+ hostPath:
+ path: "{{ nextcloud_instance_basepath }}/nextcloud"
+ type: Directory
+- name: redis
+ hostPath:
+ path: "{{ nextcloud_instance_basepath }}/redis"
+ type: Directory
+- name: database
+ hostPath:
+ path: "{{ nextcloud_instance_basepath }}/{{ nextcloud_instances[nextcloud_instance].database.type }}"
+ type: Directory
diff --git a/roles/apps/nextcloud/instance/templates/upgrade.sh.j2 b/roles/apps/nextcloud/instance/templates/upgrade.sh.j2
new file mode 100644
index 00000000..62f6641e
--- /dev/null
+++ b/roles/apps/nextcloud/instance/templates/upgrade.sh.j2
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+set -e
+
+if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
+ echo "Usage: $0 (preapre|finalize) <old-version> <new-version>"
+ exit 1
+fi
+
+COMMAND="$1"
+OLD_VERSION="$2"
+NEW_VERSION="$3"
+POD_NAME="{{ nextcloud_instance }}-$(hostname)"
+
+maintenance_mode() {
+ POD_ID=$(crictl pods --name "$POD_NAME" --state ready -q)
+ CONTAINER_ID=$(crictl ps --pod "$POD_ID" --name nextcloud -q)
+ crictl exec "$CONTAINER_ID" php -f /var/www/html/occ maintenance:mode "$1"
+}
+
+wait_for_cronjobs() {
+ POD_ID=$(crictl pods --name "$POD_NAME" --state ready -q)
+ CONTAINER_ID=$(crictl ps --pod "$POD_ID" --name nextcloud -q)
+ crictl exec "$CONTAINER_ID" bash -c 'echo -n "waiting for running cron script "; while [ -n "$(pgrep -a php | grep cron.php)" ]; do echo -n "."; sleep 1; done; echo ""'
+}
+
+wait_for_upgrade_complete() {
+ NEW_VERSION="$1"
+
+ set +e
+ echo -n "waiting for new version to be ready "
+ while true; do
+ POD_ID=$(crictl pods --name "$POD_NAME" --state ready -q)
+ if [ -z $POD_ID ]; then continue; fi
+ CONTAINER_ID=$(crictl ps --pod "$POD_ID" --name nextcloud -q)
+ if [ -z $CONTAINER_ID ]; then continue; fi
+ STATUS_OUTPUT=$(crictl exec "$CONTAINER_ID" php -f /var/www/html/occ status -n --no-warnings --output plain)
+ if [ $? -eq 0 ]; then
+ RUNNING_VERSION=$(echo "$STATUS_OUTPUT" | awk -F : '/versionstring/ { print($2) }' | tr -d ' ')
+ if [ "$RUNNING_VERSION" = "$NEW_VERSION" ]; then
+ break
+ fi
+ echo -n "."
+ fi
+ sleep 1
+ done
+ echo ""
+ set -e
+ crictl exec "$CONTAINER_ID" bash -c 'echo -n "waiting for apache to start "; while [ -z "$(pgrep apache2)" ]; do echo -n "."; sleep 1; done; echo ""'
+}
+
+storage_snapshot() {
+ OLD_VERSION="$1"
+ NEW_VERSION="$2"
+
+{% if nextcloud_instances[nextcloud_instance].storage.type == 'zfs' %}
+ ZFS_VOLUME=$(findmnt -no source -T "{{ nextcloud_instance_basepath }}")
+ echo "creating snapshot for zfs volume: $ZFS_VOLUME"
+ zfs snapshot "$ZFS_VOLUME@upgrade_$OLD_VERSION-to-$NEW_VERSION""_$(date '+%Y-%m-%m_%H:%M:%S')"
+{% endif %}
+}
+
+case "$COMMAND" in
+ prepare)
+ maintenance_mode --on
+ wait_for_cronjobs
+ storage_snapshot "$OLD_VERSION" "$NEW_VERSION"
+ ;;
+ finalize)
+ wait_for_upgrade_complete "$NEW_VERSION"
+ maintenance_mode --off
+ ;;
+ *)
+ echo "unknown command: $COMMAND, must be prepare or finalize"
+ exit 1
+ ;;
+esac
diff --git a/roles/apps/nextcloud/meta/main.yml b/roles/apps/nextcloud/meta/main.yml
new file mode 100644
index 00000000..c00c47ce
--- /dev/null
+++ b/roles/apps/nextcloud/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+ - role: apps/nextcloud/base
diff --git a/roles/apps/nextcloud/tasks/main.yml b/roles/apps/nextcloud/tasks/main.yml
index d1a11b19..6e81f351 100644
--- a/roles/apps/nextcloud/tasks/main.yml
+++ b/roles/apps/nextcloud/tasks/main.yml
@@ -1,240 +1,7 @@
---
-- name: create zfs datasets
- when: nextcloud_zfs is defined
- block:
- - name: create zfs base dataset
- zfs:
- name: "{{ nextcloud_zfs.pool }}/{{ nextcloud_zfs.name }}"
- state: present
- extra_zfs_properties: "{{ nextcloud_zfs.properties | dehumanize_zfs_properties | default(omit) }}"
-
- - name: create zfs volumes for instances
- loop: "{{ nextcloud_instances | dict2items }}"
- loop_control:
- label: "{{ item.key }} ({{ (item.value.zfs_properties | default({})).items() | map('join', '=') | join(', ') }})"
- zfs:
- name: "{{ nextcloud_zfs.pool }}/{{ nextcloud_zfs.name }}/{{ item.key }}"
- state: present
- extra_zfs_properties: "{{ item.value.zfs_properties | dehumanize_zfs_properties | default(omit) }}"
-
- - name: configure nextcloud base bath
- set_fact:
- nextcloud_base_path: "{{ (zfs_pools[nextcloud_zfs.pool].mountpoint, nextcloud_zfs.name) | path_join }}"
-
-
-- name: create instance subdirectories
- when: nextcloud_zfs is not defined
+- name: instance specific tasks
loop: "{{ nextcloud_instances | list }}"
- file:
- path: "{{ nextcloud_base_path }}/{{ item }}"
- state: directory
-
-
-
-- name: add group for nextcloud app
- group:
- name: nc-app
- gid: "{{ nextcloud_app_gid }}"
-
-- name: add user for nextcloud app
- user:
- name: nc-app
- uid: "{{ nextcloud_app_uid }}"
- group: nc-app
- password: "!"
-
-- name: create nextcloud app subdirectory
- loop: "{{ nextcloud_instances | list }}"
- file:
- path: "{{ nextcloud_base_path }}/{{ item }}/nextcloud"
- owner: "{{ nextcloud_app_uid }}"
- group: "{{ nextcloud_app_gid }}"
- state: directory
-
-
-- name: add group for nextcloud db
- group:
- name: nc-db
- gid: "{{ nextcloud_db_gid }}"
-
-- name: add user for nextcloud db
- user:
- name: nc-db
- uid: "{{ nextcloud_db_uid }}"
- group: nc-db
- password: "!"
-
-- name: create nextcloud database subdirectory
- loop: "{{ nextcloud_instances | dict2items }}"
- loop_control:
- label: "{{ item.key }} ({{ item.value.database.type }})"
- file:
- path: "{{ nextcloud_base_path }}/{{ item.key }}/{{ item.value.database.type }}"
- owner: "{{ nextcloud_db_uid }}"
- group: "{{ nextcloud_db_gid }}"
- state: directory
-
-
-- name: add group for nextcloud redis
- group:
- name: nc-redis
- gid: "{{ nextcloud_redis_gid }}"
-
-- name: add user for nextcloud redis
- user:
- name: nc-redis
- uid: "{{ nextcloud_redis_uid }}"
- group: nc-redis
- password: "!"
-
-- name: create nextcloud database subdirectory
- loop: "{{ nextcloud_instances | list }}"
- file:
- path: "{{ nextcloud_base_path }}/{{ item }}/redis"
- owner: "{{ nextcloud_redis_uid }}"
- group: "{{ nextcloud_redis_gid }}"
- state: directory
-
-
-- name: create auxiliary config directory
- loop: "{{ nextcloud_instances | list }}"
- file:
- path: "{{ nextcloud_base_path }}/{{ item }}/config"
- state: directory
-
-- name: create apache vhost config
- loop: "{{ nextcloud_instances | list }}"
- template:
- src: apache-site.conf.j2
- dest: "{{ nextcloud_base_path }}/{{ item }}/config/apache-site.conf"
-
-- name: configure apache to run on port 8080 only
- loop: "{{ nextcloud_instances | list }}"
- copy:
- content: |
- Listen 8080
- dest: "{{ nextcloud_base_path }}/{{ item }}/config/ports.conf"
-
-
-- name: build custom image
- loop: "{{ nextcloud_instances | dict2items }}"
- loop_control:
- label: "{{ item.key }}"
- # when: "'custom_image' in item.value"
- include_tasks: custom-image.yml
-
-- name: install pod manifest
- loop: "{{ nextcloud_instances | dict2items }}"
loop_control:
- label: "{{ item.key }}"
- vars:
- kubernetes_standalone_pod:
- name: "nextcloud-{{ item.key }}"
- spec: "{{ lookup('template', 'pod-spec-with-{{ item.value.database.type }}.yml.j2') }}"
- mode: "0600"
- config_hash_items:
- - path: "{{ nextcloud_base_path }}/{{ item.key }}/config/apache-site.conf"
- properties:
- - checksum
- - path: "{{ nextcloud_base_path }}/{{ item.key }}/config/ports.conf"
- properties:
- - checksum
- - path: "{{ nextcloud_base_path }}/{{ item.key }}/build/Dockerfile"
- properties:
- - checksum
+ loop_var: nextcloud_instance
include_role:
- name: kubernetes/standalone/pod
-
-
-- name: install cron trigger script
- loop: "{{ nextcloud_instances | list }}"
- template:
- src: run-cron.sh.j2
- dest: "{{ nextcloud_base_path }}/{{ item }}/config/run-cron.sh"
- mode: 0755
-
-- name: install template systemd unit for cron trigger
- template:
- src: cron@.service.j2
- dest: /etc/systemd/system/nextcloud-cron@.service
-
-- name: install systemd timer unit
- loop: "{{ nextcloud_instances | list }}"
- template:
- src: cron-.timer.j2
- dest: "/etc/systemd/system/nextcloud-cron-{{ item }}.timer"
-
-- name: start/enable cron trigger systemd timer
- loop: "{{ nextcloud_instances | list }}"
- systemd:
- daemon_reload: yes
- name: "nextcloud-cron-{{ item }}.timer"
- state: started
- enabled: yes
-
-
-- name: configure nginx vhost
- loop: "{{ nextcloud_instances | dict2items }}"
- loop_control:
- label: "{{ item.key }}"
- vars:
- nginx_vhost:
- name: "nextcloud-{{ item.key }}"
- template: generic
- tls:
- certificate_provider: "{{ acme_client }}"
- hostnames: "{{ item.value.hostnames }}"
- locations:
- '/':
- proxy_pass: "http://127.0.0.1:{{ item.value.port }}"
- proxy_redirect:
- - redirect: "http://$host/"
- replacement: "https://$host/"
- - redirect: "http://$host:8080/"
- replacement: "https://$host/"
- extra_directives: |-
- client_max_body_size 0;
- types {
- text/javascript js mjs;
- }
- include_role:
- name: nginx/vhost
-
-
-- name: install management scripts
- loop:
- - nextcloud-upgrade
- - nextcloud-occ
- template:
- src: "{{ item }}.j2"
- dest: "/usr/local/bin/{{ item }}"
- mode: 0755
-
-## TODO:
-# do this automatically!
-- name: print info for new instance
- loop: "{{ nextcloud_instances | dict2items }}"
- loop_control:
- label: "{{ item.key }}"
- when: "'new' in item.value and item.value.new"
- pause:
- seconds: 5
- prompt: |
- ************* {{ item.key }} is a new instance
- **
- ** Go to https://{{ item.value.hostnames[0] }} and finalize the
- ** installation. After that run the following commands:
- **
- ** $ nextcloud-occ {{ item.key }} config:system:set default_phone_region --value='at'
- ** $ nextcloud-occ {{ item.key }} config:system:set memcache.locking --value '\OC\Memcache\Redis'
- ** $ nextcloud-occ {{ item.key }} config:system:set redis host --value '127.0.0.1'
- ** $ nextcloud-occ {{ item.key }} config:system:set redis port --type integer --value 6379
- ** $ nextcloud-occ {{ item.key }} config:system:set redis timeout --type float --value 0.0
- ** $ nextcloud-occ {{ item.key }} config:system:set redis password
- **
- ** in case you want to use an exteranl collabora/code server:
- **
- ** $ nextcloud-occ {{ item.key }} app:disable richdocumentscode
- ** $ nextcloud-occ {{ item.key }} app:remove richdocumentscode
- **
- ****************************************
+ name: apps/nextcloud/instance
diff --git a/roles/apps/nextcloud/templates/apache-site.conf.j2 b/roles/apps/nextcloud/templates/apache-site.conf.j2
deleted file mode 100644
index a52a7fc5..00000000
--- a/roles/apps/nextcloud/templates/apache-site.conf.j2
+++ /dev/null
@@ -1,10 +0,0 @@
-<VirtualHost *:8080>
- ServerAdmin webmaster@localhost
- DocumentRoot /var/www/html
-
- UseCanonicalName Off
- UseCanonicalPhysicalPort Off
-
- ErrorLog ${APACHE_LOG_DIR}/error.log
- CustomLog ${APACHE_LOG_DIR}/access.log combined
-</VirtualHost>
diff --git a/roles/apps/nextcloud/templates/cron-.timer.j2 b/roles/apps/nextcloud/templates/cron-.timer.j2
deleted file mode 100644
index 0c3f7cd7..00000000
--- a/roles/apps/nextcloud/templates/cron-.timer.j2
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Nextcloud cron.php job timer for %i
-
-[Timer]
-OnCalendar=*:{{ 5 | random(seed=item) }}/5
-Unit=nextcloud-cron@{{ item }}.service
-
-[Install]
-WantedBy=timers.target
diff --git a/roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j2 b/roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j2
deleted file mode 100644
index a49bc3ea..00000000
--- a/roles/apps/nextcloud/templates/pod-spec-with-mariadb.yml.j2
+++ /dev/null
@@ -1,101 +0,0 @@
-securityContext:
- allowPrivilegeEscalation: false
-containers:
-- name: nextcloud
-{# image: "nextcloud{% if 'custom_image' in item.value %}/{{ item.key }}{% endif %}:{{ item.value.version }}" #}
- image: "nextcloud/{{ item.key }}:{{ item.value.version }}"
- securityContext:
- runAsUser: {{ nextcloud_app_uid }}
- runAsGroup: {{ nextcloud_app_gid }}
- resources:
- limits:
- memory: "4Gi"
-{% if 'new' in item.value and item.value.new %}
- env:
- - name: NEXTCLOUD_TRUSTED_DOMAINS
- value: "{{ item.value.hostnames | join(' ') }}"
- - name: OVERWRITEPROTOCOL
- value: "https"
- - name: MYSQL_HOST
- value: 127.0.0.1
- - name: MYSQL_DATABASE
- value: nextcloud
- - name: MYSQL_USER
- value: nextcloud
- - name: MYSQL_PASSWORD
- value: "{{ item.value.database.password }}"
-{% endif %}
- volumeMounts:
- - name: nextcloud
- mountPath: /var/www/html
- - name: config
- mountPath: /etc/apache2/sites-available/000-default.conf
- subPath: apache-site.conf
- readOnly: true
- - name: config
- mountPath: /etc/apache2/ports.conf
- subPath: ports.conf
- readOnly: true
- ports:
- - containerPort: 8080
- hostPort: {{ item.value.port }}
- hostIP: 127.0.0.1
-- name: redis
- image: "redis:{{ item.value.redis.version }}"
- args:
- - --bind 127.0.0.1
- securityContext:
- runAsUser: {{ nextcloud_redis_uid }}
- runAsGroup: {{ nextcloud_redis_gid }}
- resources:
- limits:
- memory: "512Mi"
- volumeMounts:
- - name: redis
- mountPath: /data
-- name: database
- image: "mariadb:{{ item.value.database.version }}"
- args:
- - --transaction-isolation=READ-COMMITTED
- - --log-bin=binlog
- - --binlog-format=ROW
-{% for arg in (item.value.database.extra_args | default([])) %}
- - {{ arg }}
-{% endfor %}
- securityContext:
- runAsUser: {{ nextcloud_db_uid }}
- runAsGroup: {{ nextcloud_db_gid }}
- resources:
- limits:
- memory: "2Gi"
-{% if 'new' in item.value and item.value.new %}
- env:
- - name: MYSQL_RANDOM_ROOT_PASSWORD
- value: "true"
- - name: MYSQL_DATABASE
- value: nextcloud
- - name: MYSQL_USER
- value: nextcloud
- - name: MYSQL_PASSWORD
- value: "{{ item.value.database.password }}"
-{% endif %}
- volumeMounts:
- - name: database
- mountPath: /var/lib/mysql
-volumes:
-- name: config
- hostPath:
- path: "{{ nextcloud_base_path }}/{{ item.key }}/config/"
- type: Directory
-- name: nextcloud
- hostPath:
- path: "{{ nextcloud_base_path }}/{{ item.key }}/nextcloud"
- type: Directory
-- name: redis
- hostPath:
- path: "{{ nextcloud_base_path }}/{{ item.key }}/redis"
- type: Directory
-- name: database
- hostPath:
- path: "{{ nextcloud_base_path }}/{{ item.key }}/{{ item.value.database.type }}"
- type: Directory
diff --git a/roles/apps/nextcloud/templates/run-cron.sh.j2 b/roles/apps/nextcloud/templates/run-cron.sh.j2
deleted file mode 100644
index 455bc3ec..00000000
--- a/roles/apps/nextcloud/templates/run-cron.sh.j2
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-POD_NAME="{{ item }}-$(hostname)"
-POD_ID=$(crictl pods --name "$POD_NAME" --state ready -q)
-CONTAINER_ID=$(crictl ps --pod "$POD_ID" --name nextcloud -q)
-
-exec crictl exec "$CONTAINER_ID" php -f /var/www/html/cron.php
diff --git a/roles/apps/onlyoffice/defaults/main.yml b/roles/apps/onlyoffice/defaults/main.yml
index 1ea4773a..7e33368d 100644
--- a/roles/apps/onlyoffice/defaults/main.yml
+++ b/roles/apps/onlyoffice/defaults/main.yml
@@ -1,30 +1,21 @@
---
-# onlyoffice_app_uid: "960"
-# onlyoffice_app_gid: "960"
-
-onlyoffice_db_uid: "961"
-onlyoffice_db_gid: "961"
-
-# onlyoffice_amqp_uid: "962"
-# onlyoffice_amqp_gid: "962"
-
-# onlyoffice_base_path: /srv/onlyoffice
-
-# onlyoffice_zfs:
-# pool: storage
-# name: onlyoffice
-# properties:
-# compression: lz4
-
# onlyoffice_instances:
# example:
# version: 6.2.1.24
# port: 8600
# hostname: office.example.com
# jwt_secret: very-secure-password
+# storage:
+# type: ...
# database:
# version: 9.5.25
# password: secret
# amqp:
# version: 3.8.14
# password: secret
+# publish:
+# zone: "{{ apps_publish_zone__foo }}"
+# hostnames:
+# - office.example.com
+# tls:
+# certificate_provider: ...
diff --git a/roles/apps/onlyoffice/instance/tasks/main.yml b/roles/apps/onlyoffice/instance/tasks/main.yml
new file mode 100644
index 00000000..2ca6026d
--- /dev/null
+++ b/roles/apps/onlyoffice/instance/tasks/main.yml
@@ -0,0 +1,88 @@
+---
+- name: prepare storage volume
+ vars:
+ storage_volume: "{{ onlyoffice_instances[onlyoffice_instance].storage }}"
+ include_role:
+ name: "storage/{{ onlyoffice_instances[onlyoffice_instance].storage.type }}/volume"
+
+- set_fact:
+ onlyoffice_instance_basepath: "{{ storage_volume_mountpoint }}"
+
+- name: create onlyoffice database subdirectory
+ file:
+ path: "{{ onlyoffice_instance_basepath }}/postgres"
+ state: directory
+
+- name: create onlyoffice tls subdirectory
+ file:
+ path: "{{ onlyoffice_instance_basepath }}/tls"
+ state: directory
+ mode: 0700
+
+- name: generate/install TLS certificates for publishment
+ vars:
+ x509_certificate_name: "onlyoffice-{{ onlyoffice_instance }}_publish"
+ x509_certificate_hostnames: []
+ x509_certificate_config:
+ ca: "{{ onlyoffice_instances[onlyoffice_instance].publish.zone.certificate_ca_config }}"
+ cert:
+ common_name: "onlyoffice-{{ onlyoffice_instance }}.{{ inventory_hostname }}"
+ extended_key_usage:
+ - serverAuth
+ extended_key_usage_critical: yes
+ create_subject_key_identifier: yes
+ not_after: +100w
+ x509_certificate_renewal:
+ install:
+ - dest: "{{ onlyoffice_instance_basepath }}/tls/onlyoffice.crt"
+ src:
+ - cert
+ mode: "0400"
+ - dest: "{{ onlyoffice_instance_basepath }}/tls/onlyoffice.key"
+ src:
+ - key
+ mode: "0400"
+ include_role:
+ name: "x509/{{ onlyoffice_instances[onlyoffice_instance].publish.zone.certificate_provider }}/cert"
+
+- name: install pod manifest
+ vars:
+ kubernetes_standalone_pod:
+ name: "onlyoffice-{{ onlyoffice_instance }}"
+ spec: "{{ lookup('template', 'pod-spec.yml.j2') }}"
+ mode: "0600"
+ include_role:
+ name: kubernetes/standalone/pod
+
+- name: configure nginx vhost for publishment
+ vars:
+ nginx_vhost__yaml: |
+ name: "onlyoffice-{{ onlyoffice_instance }}.{{ inventory_hostname }}"
+ template: generic
+ {% if 'tls' in onlyoffice_instances[onlyoffice_instance].publish %}
+ tls:
+ {{ onlyoffice_instances[onlyoffice_instance].publish.tls | to_nice_yaml(indent=2) | indent(2) }}
+ {% endif %}
+ hostnames:
+ {% for hostname in onlyoffice_instances[onlyoffice_instance].publish.hostnames %}
+ - {{ hostname }}
+ {% endfor %}
+ locations:
+ '/':
+ {% if onlyoffice_instances[onlyoffice_instance].publish.zone.publisher == inventory_hostname %}
+ proxy_pass: "https://127.0.0.1:{{ onlyoffice_instances[onlyoffice_instance].port }}"
+ {% else %}
+ proxy_pass: "https://{{ ansible_default_ipv4.address }}:{{ onlyoffice_instances[onlyoffice_instance].port }}"
+ {% endif %}
+ proxy_ssl:
+ trusted_certificate: "/etc/ssl/apps-publish-{{ onlyoffice_instances[onlyoffice_instance].publish.zone.name }}/apps-publish-{{ onlyoffice_instances[onlyoffice_instance].publish.zone.name }}-ca-crt.pem"
+ verify: "on"
+ name: "onlyoffice-{{ onlyoffice_instance }}.{{ inventory_hostname }}"
+ protocols: "TLSv1.2 TLSv1.3"
+ extra_directives: |-
+ client_max_body_size 0;
+ nginx_vhost: "{{ nginx_vhost__yaml | from_yaml }}"
+ include_role:
+ name: nginx/vhost
+ apply:
+ delegate_to: "{{ onlyoffice_instances[onlyoffice_instance].publish.zone.publisher }}"
diff --git a/roles/apps/onlyoffice/instance/templates/pod-spec.yml.j2 b/roles/apps/onlyoffice/instance/templates/pod-spec.yml.j2
new file mode 100644
index 00000000..ec70f8c1
--- /dev/null
+++ b/roles/apps/onlyoffice/instance/templates/pod-spec.yml.j2
@@ -0,0 +1,75 @@
+terminationGracePeriodSeconds: 120
+containers:
+- name: documentserver
+ image: "onlyoffice/documentserver:{{ onlyoffice_instances[onlyoffice_instance].version }}"
+ resources:
+ limits:
+ memory: "4Gi"
+ env:
+ - name: "DB_TYPE"
+ value: "postgres"
+ - name: "DB_HOST"
+ value: "127.0.0.1"
+ - name: "DB_PORT"
+ value: "5432"
+ - name: "DB_NAME"
+ value: "onlyoffice"
+ - name: "DB_USER"
+ value: "onlyoffice"
+ - name: "DB_PWD"
+ value: "{{ onlyoffice_instances[onlyoffice_instance].database.password }}"
+ - name: "AMQP_TYPE"
+ value: "rabbitmq"
+ - name: "AMQP_URI"
+ value: "amqp://onlyoffice:{{ onlyoffice_instances[onlyoffice_instance].amqp.password }}@127.0.0.1:5672"
+ - name: "JWT_ENABLED"
+ value: "true"
+ - name: "JWT_SECRET"
+ value: "{{ onlyoffice_instances[onlyoffice_instance].jwt_secret }}"
+ volumeMounts:
+ - name: tls
+ mountPath: /var/www/onlyoffice/Data/certs/
+ readOnly: true
+ ports:
+ - containerPort: 443
+ hostPort: {{ onlyoffice_instances[onlyoffice_instance].port }}
+ hostIP: 127.0.0.1
+
+- name: postgresql
+ image: "postgres:{{ onlyoffice_instances[onlyoffice_instance].database.version }}"
+ args:
+ - postgres
+ - -c
+ - listen_addresses=127.0.0.1
+ env:
+ - name: "POSTGRES_DB"
+ value: "onlyoffice"
+ - name: "POSTGRES_USER"
+ value: "onlyoffice"
+ - name: "POSTGRES_PASSWORD"
+ value: "{{ onlyoffice_instances[onlyoffice_instance].database.password }}"
+ volumeMounts:
+ - name: postgres
+ mountPath: /var/lib/postgresql/data
+
+- name: rabbitmq
+ image: "rabbitmq:{{ onlyoffice_instances[onlyoffice_instance].amqp.version }}"
+ env:
+ - name: "RABBITMQ_NODENAME"
+ value: "rabbit@localhost"
+ - name: "RABBITMQ_NODE_IP_ADDRESS"
+ value: "127.0.0.1"
+ - name: "RABBITMQ_DEFAULT_USER"
+ value: "onlyoffice"
+ - name: "RABBITMQ_DEFAULT_PASS"
+ value: "{{ onlyoffice_instances[onlyoffice_instance].amqp.password }}"
+
+volumes:
+- name: tls
+ hostPath:
+ path: "{{ onlyoffice_instance_basepath }}/tls"
+ type: Directory
+- name: postgres
+ hostPath:
+ path: "{{ onlyoffice_instance_basepath }}/postgres"
+ type: Directory
diff --git a/roles/apps/onlyoffice/tasks/main.yml b/roles/apps/onlyoffice/tasks/main.yml
index 960e811b..a42ee589 100644
--- a/roles/apps/onlyoffice/tasks/main.yml
+++ b/roles/apps/onlyoffice/tasks/main.yml
@@ -1,153 +1,7 @@
---
-- name: create zfs datasets
- when: onlyoffice_zfs is defined
- block:
- - name: create zfs base dataset
- zfs:
- name: "{{ onlyoffice_zfs.pool }}/{{ onlyoffice_zfs.name }}"
- state: present
- extra_zfs_properties: "{{ onlyoffice_zfs.properties | dehumanize_zfs_properties | default(omit) }}"
-
- - name: create zfs volumes for instances
- loop: "{{ onlyoffice_instances | dict2items }}"
- loop_control:
- label: "{{ item.key }} ({{ (item.value.zfs_properties | default({})).items() | map('join', '=') | join(', ') }})"
- zfs:
- name: "{{ onlyoffice_zfs.pool }}/{{ onlyoffice_zfs.name }}/{{ item.key }}"
- state: present
- extra_zfs_properties: "{{ item.value.zfs_properties | dehumanize_zfs_properties | default(omit) }}"
-
- - name: configure onlyoffice base bath
- set_fact:
- onlyoffice_base_path: "{{ (zfs_pools[onlyoffice_zfs.pool].mountpoint, onlyoffice_zfs.name) | path_join }}"
-
-
-- name: create instance subdirectories
- when: onlyoffice_zfs is not defined
+- name: instance specific tasks
loop: "{{ onlyoffice_instances | list }}"
- file:
- path: "{{ onlyoffice_base_path }}/{{ item }}"
- state: directory
-
-
-# TODO: run documentserver components as non-root
-# - name: add group for onlyoffice app
-# group:
-# name: oo-app
-# gid: "{{ onlyoffice_app_gid }}"
-
-# - name: add user for onlyoffice app
-# user:
-# name: oo-app
-# uid: "{{ onlyoffice_app_uid }}"
-# group: oo-app
-# password: "!"
-
-# - name: create onlyoffice app subdirectory
-# loop: "{{ onlyoffice_instances | list }}"
-# file:
-# path: "{{ onlyoffice_base_path }}/{{ item }}/onlyoffice"
-# owner: "{{ onlyoffice_app_uid }}"
-# group: "{{ onlyoffice_app_gid }}"
-# state: directory
-
-
-- name: add group for onlyoffice db
- group:
- name: oo-db
- gid: "{{ onlyoffice_db_gid }}"
-
-- name: add user for onlyoffice db
- user:
- name: oo-db
- uid: "{{ onlyoffice_db_uid }}"
- group: oo-db
- password: "!"
-
-- name: create onlyoffice database subdirectory
- loop: "{{ onlyoffice_instances | dict2items}}"
loop_control:
- label: "{{ item.key }}"
- file:
- path: "{{ onlyoffice_base_path }}/{{ item.key }}/postgres"
- owner: "{{ onlyoffice_db_uid }}"
- group: "{{ onlyoffice_db_gid }}"
- state: directory
-
-
-# TODO: run documentserver components as non-root
-# - name: add group for onlyoffice aqmp
-# group:
-# name: oo-aqmp
-# gid: "{{ onlyoffice_aqmp_gid }}"
-
-# - name: add user for onlyoffice aqmp
-# user:
-# name: oo-aqmp
-# uid: "{{ onlyoffice_aqmp_uid }}"
-# group: oo-aqmp
-# password: "!"
-
-# - name: create onlyoffice aqmp subdirectory
-# loop: "{{ onlyoffice_instances | list }}"
-# file:
-# path: "{{ onlyoffice_base_path }}/{{ item }}/onlyoffice"
-# owner: "{{ onlyoffice_aqmp_uid }}"
-# group: "{{ onlyoffice_aqmp_gid }}"
-# state: directory
-
-# TODO: AQMP config?
-# - name: create onlyoffice rabbitmq subdirectory
-# loop: "{{ onlyoffice_instances | dict2items}}"
-# loop_control:
-# label: "{{ item.key }}"
-# file:
-# path: "{{ onlyoffice_base_path }}/{{ item.key }}/rabbitmq"
-# state: directory
-
-# - name: install rabbitmq config snipped
-# loop: "{{ onlyoffice_instances | dict2items}}"
-# loop_control:
-# label: "{{ item.key }}"
-# copy:
-# dest: "{{ onlyoffice_base_path }}/{{ item.key }}/rabbitmq/config"
-# content: |
-# management.tcp.ip = 127.0.0.1
-
-
-- name: install pod manifest
- loop: "{{ onlyoffice_instances | dict2items }}"
- loop_control:
- label: "{{ item.key }}"
- vars:
- kubernetes_standalone_pod:
- name: "onlyoffice-{{ item.key }}"
- spec: "{{ lookup('template', 'pod-spec.yml.j2') }}"
- mode: "0600"
-# TODO: AQMP config?
-# config_hash_items:
-# - path: "{{ onlyoffice_base_path }}/{{ item.key }}/rabbitmq/config"
-# properties:
-# - checksum
- include_role:
- name: kubernetes/standalone/pod
-
-- name: configure nginx vhost
- loop: "{{ onlyoffice_instances | dict2items }}"
- loop_control:
- label: "{{ item.key }}"
- vars:
- nginx_vhost:
- name: "onlyoffice-{{ item.key }}"
- template: generic
- tls:
- certificate_provider: "{{ acme_client }}"
- hostnames:
- - "{{ item.value.hostname }}"
- locations:
- '/':
- proxy_pass: "http://127.0.0.1:{{ item.value.port }}"
- extra_directives: |-
- client_max_body_size 0;
+ loop_var: onlyoffice_instance
include_role:
- name: nginx/vhost
+ name: apps/onlyoffice/instance
diff --git a/roles/apps/onlyoffice/templates/pod-spec.yml.j2 b/roles/apps/onlyoffice/templates/pod-spec.yml.j2
deleted file mode 100644
index 620e0d18..00000000
--- a/roles/apps/onlyoffice/templates/pod-spec.yml.j2
+++ /dev/null
@@ -1,102 +0,0 @@
-{# TODO:
-securityContext:
- allowPrivilegeEscalation: false
-#}
-terminationGracePeriodSeconds: 120
-containers:
-{# TODO: only listen to localhost #}
-- name: documentserver
- image: "onlyoffice/documentserver:{{ item.value.version }}"
- resources:
- limits:
- memory: "4Gi"
-{# TODO:
- securityContext:
- allowPrivilegeEscalation: false
- runAsUser: {{ onlyoffice_amqp_uid }}
- runAsGroup: {{ onlyoffice_amqp_gid }}
-#}
- env:
- - name: "DB_TYPE"
- value: "postgres"
- - name: "DB_HOST"
- value: "127.0.0.1"
- - name: "DB_PORT"
- value: "5432"
- - name: "DB_NAME"
- value: "onlyoffice"
- - name: "DB_USER"
- value: "onlyoffice"
- - name: "DB_PWD"
- value: "{{ item.value.database.password }}"
- - name: "AMQP_TYPE"
- value: "rabbitmq"
- - name: "AMQP_URI"
- value: "amqp://onlyoffice:{{ item.value.amqp.password }}@127.0.0.1:5672"
- - name: "JWT_ENABLED"
- value: "true"
- - name: "JWT_SECRET"
- value: "{{ item.value.jwt_secret }}"
- ports:
- - containerPort: 80
- hostPort: {{ item.value.port }}
- hostIP: 127.0.0.1
-
-- name: postgresql
- image: "postgres:{{ item.value.database.version }}"
- args:
- - postgres
- - -c
- - listen_addresses=127.0.0.1
- securityContext:
- allowPrivilegeEscalation: false
- runAsUser: {{ onlyoffice_db_uid }}
- runAsGroup: {{ onlyoffice_db_gid }}
- env:
- - name: "POSTGRES_DB"
- value: "onlyoffice"
- - name: "POSTGRES_USER"
- value: "onlyoffice"
- - name: "POSTGRES_PASSWORD"
- value: "{{ item.value.database.password }}"
- volumeMounts:
- - name: postgres
- mountPath: /var/lib/postgresql/data
-
-{# TODO: only listen to localhost #}
-- name: rabbitmq
- image: "rabbitmq:{{ item.value.amqp.version }}"
-{# TODO:
- securityContext:
- allowPrivilegeEscalation: false
- runAsUser: {{ onlyoffice_amqp_uid }}
- runAsGroup: {{ onlyoffice_amqp_gid }}
-#}
- env:
- - name: "RABBITMQ_NODENAME"
- value: "rabbit@localhost"
- - name: "RABBITMQ_NODE_IP_ADDRESS"
- value: "127.0.0.1"
- - name: "RABBITMQ_DEFAULT_USER"
- value: "onlyoffice"
- - name: "RABBITMQ_DEFAULT_PASS"
- value: "{{ item.value.amqp.password }}"
-{# TODO: AQMP config?
- volumeMounts:
- - name: rabbitmq
- mountPath: /etc/rabbitmq/conf.d/k8s.conf
- subPath: config
- readOnly: true
-#}
-
-volumes:
-- name: postgres
- hostPath:
- path: "{{ onlyoffice_base_path }}/{{ item.key }}/postgres"
- type: Directory
-{# TODO: AQMP config?
-- name: rabbitmq
- hostPath:
- path: "{{ onlyoffice_base_path }}/{{ item.key }}/rabbitmq"
- type: Directory
-#}
diff --git a/roles/core/base/tasks/Debian.yml b/roles/core/base/tasks/Debian.yml
index 4d2abc17..43f1876e 100644
--- a/roles/core/base/tasks/Debian.yml
+++ b/roles/core/base/tasks/Debian.yml
@@ -156,6 +156,15 @@
state: "{{ base_enable_fstrim | ternary('started', 'stopped') }}"
enabled: "{{ base_enable_fstrim }}"
+- name: configure timezone
+ timezone:
+ name: "{{ base_timezone }}"
+ register: etc_localtime
+
+- name: make sure legacy /etc/timezone is in sync with /etc/localtime
+ when: etc_localtime is changed
+ command: dpkg-reconfigure -f noninteractive tzdata
+
- name: remove cloud-init bullshit
loop:
- /var/log/cloud-init.log
diff --git a/roles/core/base/tasks/OpenBSD.yml b/roles/core/base/tasks/OpenBSD.yml
index fbc06379..7ff4f324 100644
--- a/roles/core/base/tasks/OpenBSD.yml
+++ b/roles/core/base/tasks/OpenBSD.yml
@@ -13,3 +13,7 @@
openbsd_pkg:
name: "{{ base_packages_extra }}"
state: present
+
+- name: configure timezone
+ timezone:
+ name: "{{ base_timezone }}"
diff --git a/roles/core/base/tasks/main.yml b/roles/core/base/tasks/main.yml
index fe4a396c..a70bc7ad 100644
--- a/roles/core/base/tasks/main.yml
+++ b/roles/core/base/tasks/main.yml
@@ -34,7 +34,3 @@
copy:
src: "{{ global_files_dir }}/common/htoprc"
dest: "{{ item }}/.config/htop/"
-
-- name: configure timezone
- timezone:
- name: "{{ base_timezone }}"
diff --git a/roles/greenbone/server/templates/docker-compose-22.4.yml.j2 b/roles/greenbone/server/templates/docker-compose-22.4.yml.j2
index 85742836..8c007ee9 100644
--- a/roles/greenbone/server/templates/docker-compose-22.4.yml.j2
+++ b/roles/greenbone/server/templates/docker-compose-22.4.yml.j2
@@ -1,65 +1,65 @@
services:
vulnerability-tests:
- image: greenbone/vulnerability-tests
+ image: registry.community.greenbone.net/community/vulnerability-tests
environment:
STORAGE_PATH: /var/lib/openvas/22.04/vt-data/nasl
volumes:
- vt_data_vol:/mnt
notus-data:
- image: greenbone/notus-data
+ image: registry.community.greenbone.net/community/notus-data
volumes:
- notus_data_vol:/mnt
scap-data:
- image: greenbone/scap-data
+ image: registry.community.greenbone.net/community/scap-data
volumes:
- scap_data_vol:/mnt
cert-bund-data:
- image: greenbone/cert-bund-data
+ image: registry.community.greenbone.net/community/cert-bund-data
volumes:
- cert_data_vol:/mnt
dfn-cert-data:
- image: greenbone/dfn-cert-data
+ image: registry.community.greenbone.net/community/dfn-cert-data
volumes:
- cert_data_vol:/mnt
depends_on:
- cert-bund-data
data-objects:
- image: greenbone/data-objects
+ image: registry.community.greenbone.net/community/data-objects
volumes:
- data_objects_vol:/mnt
report-formats:
- image: greenbone/report-formats
+ image: registry.community.greenbone.net/community/report-formats
volumes:
- data_objects_vol:/mnt
depends_on:
- data-objects
gpg-data:
- image: greenbone/gpg-data
+ image: registry.community.greenbone.net/community/gpg-data
volumes:
- gpg_data_vol:/mnt
redis-server:
- image: greenbone/redis-server
+ image: registry.community.greenbone.net/community/redis-server
restart: on-failure
volumes:
- redis_socket_vol:/run/redis/
pg-gvm:
- image: greenbone/pg-gvm:stable
+ image: registry.community.greenbone.net/community/pg-gvm:stable
restart: on-failure
volumes:
- psql_data_vol:/var/lib/postgresql
- psql_socket_vol:/var/run/postgresql
gvmd:
- image: greenbone/gvmd:stable
+ image: registry.community.greenbone.net/community/gvmd:stable
restart: on-failure
volumes:
- gvmd_data_vol:/var/lib/gvm
@@ -86,7 +86,7 @@ services:
condition: service_completed_successfully
gsa:
- image: greenbone/gsa:stable
+ image: registry.community.greenbone.net/community/gsa:stable
restart: on-failure
ports:
- 127.0.0.1:9392:80
@@ -94,9 +94,73 @@ services:
- gvmd_socket_vol:/run/gvmd
depends_on:
- gvmd
+ # Sets log level of openvas to the set LOG_LEVEL within the env
+ # and changes log output to /var/log/openvas instead /var/log/gvm
+ # to reduce likelyhood of unwanted log interferences
+ configure-openvas:
+ image: registry.community.greenbone.net/community/openvas-scanner:stable
+ volumes:
+ - openvas_data_vol:/mnt
+ - openvas_log_data_vol:/var/log/openvas
+ command:
+ - /bin/sh
+ - -c
+ - |
+ printf "table_driven_lsc = yes\nopenvasd_server = http://openvasd:80\n" > /mnt/openvas.conf
+ sed "s/level=.*/level=INFO/" /etc/openvas/openvas_log.conf | sed 's/gvm/openvas/' > /mnt/openvas_log.conf
+ chmod 644 /mnt/openvas.conf
+ chmod 644 /mnt/openvas_log.conf
+ touch /var/log/openvas/openvas.log
+ chmod 666 /var/log/openvas/openvas.log
+
+ # shows logs of openvas
+ openvas:
+ image: registry.community.greenbone.net/community/openvas-scanner:stable
+ restart: on-failure
+ volumes:
+ - openvas_data_vol:/etc/openvas
+ - openvas_log_data_vol:/var/log/openvas
+ command:
+ - /bin/sh
+ - -c
+ - |
+ cat /etc/openvas/openvas.conf
+ tail -f /var/log/openvas/openvas.log
+ depends_on:
+ configure-openvas:
+ condition: service_completed_successfully
+
+ openvasd:
+ image: registry.community.greenbone.net/community/openvas-scanner:stable
+ restart: on-failure
+ environment:
+ # `service_notus` is set to disable everything but notus,
+ # if you want to utilize openvasd directly removed `OPENVASD_MODE`
+ OPENVASD_MODE: service_notus
+ GNUPGHOME: /etc/openvas/gnupg
+ LISTENING: 0.0.0.0:80
+ volumes:
+ - openvas_data_vol:/etc/openvas
+ - openvas_log_data_vol:/var/log/openvas
+ - gpg_data_vol:/etc/openvas/gnupg
+ - notus_data_vol:/var/lib/notus
+ # enable port forwarding when you want to use the http api from your host machine
+ # ports:
+ # - 127.0.0.1:3000:80
+ depends_on:
+ vulnerability-tests:
+ condition: service_completed_successfully
+ configure-openvas:
+ condition: service_completed_successfully
+ gpg-data:
+ condition: service_completed_successfully
+ networks:
+ default:
+ aliases:
+ - openvasd
ospd-openvas:
- image: greenbone/ospd-openvas:stable
+ image: registry.community.greenbone.net/community/ospd-openvas:stable
restart: on-failure
hostname: ospd-openvas.local
cap_add:
@@ -111,8 +175,6 @@ services:
"-f",
"--config",
"/etc/gvm/ospd-openvas.conf",
- "--mqtt-broker-address",
- "mqtt-broker",
"--notus-feed-dir",
"/var/lib/notus/advisories",
"-m",
@@ -124,6 +186,8 @@ services:
- notus_data_vol:/var/lib/notus
- ospd_openvas_socket_vol:/run/ospd
- redis_socket_vol:/run/redis/
+ - openvas_data_vol:/etc/openvas/
+ - openvas_log_data_vol:/var/log/openvas
depends_on:
redis-server:
condition: service_started
@@ -131,32 +195,11 @@ services:
condition: service_completed_successfully
vulnerability-tests:
condition: service_completed_successfully
-
- mqtt-broker:
- restart: on-failure
- image: greenbone/mqtt-broker
- networks:
- default:
- aliases:
- - mqtt-broker
- - broker
-
- notus-scanner:
- restart: on-failure
- image: greenbone/notus-scanner:stable
- volumes:
- - notus_data_vol:/var/lib/notus
- - gpg_data_vol:/etc/openvas/gnupg
- environment:
- NOTUS_SCANNER_MQTT_BROKER_ADDRESS: mqtt-broker
- NOTUS_SCANNER_PRODUCTS_DIRECTORY: /var/lib/notus/products
- depends_on:
- - mqtt-broker
- - gpg-data
- - vulnerability-tests
+ configure-openvas:
+ condition: service_completed_successfully
gvm-tools:
- image: greenbone/gvm-tools
+ image: registry.community.greenbone.net/community/gvm-tools
volumes:
- gvmd_socket_vol:/run/gvmd
- ospd_openvas_socket_vol:/run/ospd
@@ -177,3 +220,5 @@ volumes:
gvmd_socket_vol:
ospd_openvas_socket_vol:
redis_socket_vol:
+ openvas_data_vol:
+ openvas_log_data_vol:
diff --git a/roles/installer/debian/preseed/defaults/main.yml b/roles/installer/debian/preseed/defaults/main.yml
index 1a8b5b67..ffc9521c 100644
--- a/roles/installer/debian/preseed/defaults/main.yml
+++ b/roles/installer/debian/preseed/defaults/main.yml
@@ -10,7 +10,7 @@ debian_preseed_locales:
debian_preseed_keyboard_layout: de
debian_preseed_keyboard_variant: nodeadkeys
-debian_preseed_timezone: Europe/Vienna
+debian_preseed_timezone: "{{ base_timezone | default('Europe/Vienna') }}"
# debian_preseed_force_net_ifnames_policy: path
debian_preseed_no_netplan: no
diff --git a/roles/installer/openbsd/autoinstall/defaults/main.yml b/roles/installer/openbsd/autoinstall/defaults/main.yml
index b166c191..4d8fd865 100644
--- a/roles/installer/openbsd/autoinstall/defaults/main.yml
+++ b/roles/installer/openbsd/autoinstall/defaults/main.yml
@@ -14,3 +14,5 @@ obsd_autoinstall_file_sets:
#- xfont
#- xserv
#- xshare
+
+obsd_autoinstall_timezone: "{{ base_timezone | default('Europe/Vienna') }}"
diff --git a/roles/installer/openbsd/autoinstall/templates/auto_install.conf.j2 b/roles/installer/openbsd/autoinstall/templates/auto_install.conf.j2
index 8c28d6e6..10fa17be 100644
--- a/roles/installer/openbsd/autoinstall/templates/auto_install.conf.j2
+++ b/roles/installer/openbsd/autoinstall/templates/auto_install.conf.j2
@@ -23,7 +23,7 @@ Setup a user = no
Start sshd(8) by default = yes
Allow root ssh login = prohibit-password
-What timezone are you in = Europe/Vienna
+What timezone are you in = {{ obsd_autoinstall_timezone }}
Location of sets = cd0
Pathname to the sets = /
diff --git a/roles/installer/raspios/image/defaults/main.yml b/roles/installer/raspios/image/defaults/main.yml
index 3f6ab3a3..35a76e38 100644
--- a/roles/installer/raspios/image/defaults/main.yml
+++ b/roles/installer/raspios/image/defaults/main.yml
@@ -13,5 +13,5 @@ raspios_keep_boot_dir_mounted: no
# line: 'dtparam=i2c_vc=on'
raspios_locale: en_US.UTF-8
-raspios_timezone: Europe/Vienna
+raspios_timezone: "{{ base_timezone | default('Europe/Vienna') }}"
raspios_keyboard_layout: de
diff --git a/roles/installer/ubuntu/autoinstall/defaults/main.yml b/roles/installer/ubuntu/autoinstall/defaults/main.yml
index 50a35ae1..16d08a19 100644
--- a/roles/installer/ubuntu/autoinstall/defaults/main.yml
+++ b/roles/installer/ubuntu/autoinstall/defaults/main.yml
@@ -6,7 +6,7 @@ ubuntu_autoinstall_locale: en_US
ubuntu_autoinstall_keyboard_layout: de
ubuntu_autoinstall_keyboard_variant: nodeadkeys
-ubuntu_autoinstall_timezone: Europe/Vienna
+ubuntu_autoinstall_timezone: "{{ base_timezone | default('Europe/Vienna') }}"
# ubuntu_autoinstall_kernel_image:
ubuntu_autoinstall_virtual_machine: no
diff --git a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2 b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
index 1de70b70..24cce9b7 100644
--- a/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
+++ b/roles/installer/ubuntu/autoinstall/templates/autoinstall.yml.j2
@@ -237,6 +237,9 @@ autoinstall:
dpkg -l | grep "^rc" | awk "{ print(\$2) }" | xargs -r dpkg -P
sed '/^PasswordAuthentication /d' -i '/etc/ssh/sshd_config'
rm -f '/etc/ssh/sshd_config.d/50-cloud-init.conf'
+ swapoff -a
+ sed -e '/^\/swapfile/d' -e '/^\/swap\.img/d' -i /etc/fstab
+ rm -f /swapfile /swap.img
rm -f /root/post-cleanup.sh
{% if ubuntu_autoinstall_poweroff_when_done %}
poweroff
@@ -262,7 +265,6 @@ autoinstall:
{% endfor %}
late-commands:
- - curtin in-target --target=/target -- swapoff -a; sed -e '/^\/swapfile/d' -e '/^\/swap\.img/d' -i /etc/fstab; rm -f /swapfile /swap.img
{% if ansible_port is defined %}
- curtin in-target --target=/target -- sed -e 's/^\s*#*\s*Port\s\s*[0-9][0-9]*$/Port {{ ansible_port }}/' -i /etc/ssh/sshd_config
- curtin in-target --target=/target -- bash -c "mkdir -p /etc/systemd/system/ssh.socket.d; echo -e '[Socket]\nListenStream=\nListenStream={{ ansible_port }}' > /etc/systemd/system/ssh.socket.d/port.conf"
@@ -272,7 +274,7 @@ autoinstall:
- curtin in-target --target=/target -- apt-get -y -q purge systemd-oomd
{% endif %}
{% if (install_codename | ubuntu_release_compare('>=', 'noble')) %}
- - curtin in-target --target=/target -- apt-get -y -q purge ubuntu-kernel-accessories ubuntu-pro-client lxd-installer
+ - curtin in-target --target=/target -- apt-get -y -q purge ubuntu-kernel-accessories ubuntu-pro-client lxd-installer unminimize
{% endif %}
{% if ubuntu_autoinstall_desktop is undefined %}
- curtin in-target --target=/target -- apt-mark manual iputils-ping isc-dhcp-client netcat-openbsd netplan.io sudo
diff --git a/roles/kubernetes/base/tasks/cri_docker.yml b/roles/kubernetes/base/tasks/cri_docker.yml
index 6d114b87..252eb7e6 100644
--- a/roles/kubernetes/base/tasks/cri_docker.yml
+++ b/roles/kubernetes/base/tasks/cri_docker.yml
@@ -24,6 +24,7 @@
- "native.cgroupdriver=systemd"
bridge: "none"
iptables: false
+ ip6tables: false
log-driver: "json-file"
log-opts:
max-size: "10M"
diff --git a/roles/monitoring/prometheus/server/defaults/main/main.yml b/roles/monitoring/prometheus/server/defaults/main/main.yml
index 25cffa5b..dd290e9e 100644
--- a/roles/monitoring/prometheus/server/defaults/main/main.yml
+++ b/roles/monitoring/prometheus/server/defaults/main/main.yml
@@ -75,5 +75,27 @@ prometheus_server_web_listen_address: 127.0.0.1:9090
# - node
# - blackbox
+prometheus_server_remote_write_receiver: no
+
+# prometheus_server_remote_write_destinations:
+# example:
+# url: "https://mon.example.com/prometheus/api/v1/write"
+# basic_auth:
+# username: remote
+# password_file: /etc/prometheus/prometheus-remote.secret
+# tls_config:
+# ca: |
+# -----BEGIN CERTIFICATE-----
+# ...
+# -----END CERTIFICATE-----
+# write_relabel_configs:
+# - source_labels: ['__name__']
+# regex: 'go_gc_.*'
+# action: 'drop'
+# - source_labels: ['job']
+# regex: 'alertmanager'
+# action: 'drop'
+
# prometheus_server_secret_files:
# user: secret
+# remote: othersecret
diff --git a/roles/monitoring/prometheus/server/defaults/main/rules_prometheus.yml b/roles/monitoring/prometheus/server/defaults/main/rules_prometheus.yml
index 4db6cd17..5cb27264 100644
--- a/roles/monitoring/prometheus/server/defaults/main/rules_prometheus.yml
+++ b/roles/monitoring/prometheus/server/defaults/main/rules_prometheus.yml
@@ -93,13 +93,13 @@ prometheus_server_rules_prometheus:
description: "Prometheus has no target in service discovery\n VALUE = {{ '{{' }} $value {{ '}}' }}\n LABELS = {{ '{{' }} $labels {{ '}}' }}"
- alert: PrometheusTargetScrapingSlow
- expr: prometheus_target_interval_length_seconds{quantile="0.9"} > 60
+ expr: prometheus_target_interval_length_seconds{quantile="0.9"} / on (interval, instance, job) prometheus_target_interval_length_seconds{quantile="0.5"} > 1.05
for: 5m
labels:
severity: warning
annotations:
summary: Prometheus target scraping slow (instance {{ '{{' }} $labels.instance {{ '}}' }})
- description: "Prometheus is scraping exporters slowly\n VALUE = {{ '{{' }} $value {{ '}}' }}\n LABELS = {{ '{{' }} $labels {{ '}}' }}"
+ description: "Prometheus is scraping exporters slowly since it exceeded the requested interval time\n VALUE = {{ '{{' }} $value {{ '}}' }}\n LABELS = {{ '{{' }} $labels {{ '}}' }}"
- alert: PrometheusLargeScrape
expr: increase(prometheus_target_scrapes_exceeded_sample_limit_total[10m]) > 10
diff --git a/roles/monitoring/prometheus/server/templates/prometheus.service.j2 b/roles/monitoring/prometheus/server/templates/prometheus.service.j2
index e65e9425..86c30cbd 100644
--- a/roles/monitoring/prometheus/server/templates/prometheus.service.j2
+++ b/roles/monitoring/prometheus/server/templates/prometheus.service.j2
@@ -6,7 +6,7 @@ After=time-sync.target
[Service]
Restart=on-failure
User=prometheus
-ExecStart=/usr/bin/prometheus --config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/metrics2/ --storage.tsdb.retention.time={{ prometheus_server_retention }}{% if prometheus_server_web_external_url is defined %} --web.external-url={{ prometheus_server_web_external_url }}{% endif %}{% if prometheus_server_web_route_prefix is defined %} --web.route-prefix={{ prometheus_server_web_route_prefix }}{% endif %}{% if prometheus_server_auth_users is defined %} --web.config.file=/etc/prometheus/prometheus-web.yml{% endif %} --web.listen-address={{ prometheus_server_web_listen_address }}
+ExecStart=/usr/bin/prometheus --config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/lib/prometheus/metrics2/ --storage.tsdb.retention.time={{ prometheus_server_retention }}{% if prometheus_server_web_external_url is defined %} --web.external-url={{ prometheus_server_web_external_url }}{% endif %}{% if prometheus_server_web_route_prefix is defined %} --web.route-prefix={{ prometheus_server_web_route_prefix }}{% endif %}{% if prometheus_server_auth_users is defined %} --web.config.file=/etc/prometheus/prometheus-web.yml{% endif %}{% if prometheus_server_remote_write_receiver %} --web.enable-remote-write-receiver{% endif %} --web.listen-address={{ prometheus_server_web_listen_address }}
ExecReload=/bin/kill -HUP $MAINPID
TimeoutStopSec=20s
SendSIGKILL=no
diff --git a/roles/monitoring/prometheus/server/templates/prometheus.yml.j2 b/roles/monitoring/prometheus/server/templates/prometheus.yml.j2
index 85adfa52..d72a4815 100644
--- a/roles/monitoring/prometheus/server/templates/prometheus.yml.j2
+++ b/roles/monitoring/prometheus/server/templates/prometheus.yml.j2
@@ -96,3 +96,10 @@ scrape_configs:
- targets: ['{{ config.url }}']
{% endfor %}
{% endfor %}
+{% if prometheus_server_remote_write_destinations is defined %}
+
+remote_write:
+{% for name, config in prometheus_server_remote_write_destinations.items() %}
+ - {{ config | combine({'name': name }) | to_nice_yaml(indent=2) | indent(4) }}
+{% endfor %}
+{% endif %}
diff --git a/roles/x509/acmetool/base/templates/responses.j2 b/roles/x509/acmetool/base/templates/responses.j2
index 981eba90..81f4f8a4 100644
--- a/roles/x509/acmetool/base/templates/responses.j2
+++ b/roles/x509/acmetool/base/templates/responses.j2
@@ -3,6 +3,7 @@
"acme-agreement:https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017-w-v1.3-notice.pdf": true
"acme-agreement:https://letsencrypt.org/documents/LE-SA-v1.3-August-10-2022.pdf": true
"acme-agreement:https://letsencrypt.org/documents/LE-SA-v1.3-September-21-2022.pdf": true
+"acme-agreement:https://letsencrypt.org/documents/LE-SA-v1.4-April-3-2024.pdf": true
"acmetool-quickstart-choose-server": {{ acmetool_directory_server }}
"acmetool-quickstart-choose-method": webroot
"acmetool-quickstart-webroot-path": "{{ acmetool_challenge_webroot_path | default('/var/run/acme/acme-challenge') }}"
diff --git a/skillz/host_vars/sk-cloudio.yml b/skillz/host_vars/sk-cloudio.yml
index 87caa6eb..9eb8ad1e 100644
--- a/skillz/host_vars/sk-cloudio.yml
+++ b/skillz/host_vars/sk-cloudio.yml
@@ -1,76 +1,246 @@
$ANSIBLE_VAULT;1.2;AES256;skillz
-35373564613862653031656530303761643561373963613630643865303535353930663533366138
-6161343836613030386234643062396466656566663230350a393731396661356364383064326333
-65626563396562346665333234356438636534626639346366333165656131373864386662616237
-6336333665343461610a303666303334363735626166376666633535393030333635616431616631
-33383561643831386566396562396635396265633132323139393039306365613962376164646162
-39363663316630396436373139643863306138653937313031353463393764613962363333323539
-63303963363665653431333962323064316639646561373963393834643861326534646265663263
-36356663623963303564373934636262393064383734653733333133383630303431663932396163
-34636366336137626432626331383433323430383364623964383261306238663039363766386663
-66333161313638323137366562323366353635646133333239303933633663643532653531616465
-38396432623065653539653235636164626238343034373462363530383565363365353638396438
-65616638316335343430633836383635386232346334323837306563613237343263613632323330
-66626532316464333163373532636333623933393536323232383331653737313363316233626665
-61393034346265316233646535306331363561353938356533366362616135653139613962646430
-61663262623432333762326565333837623861383639646164323734313663646265616334343564
-36643261303035353065363761623737636266383164633961353439306536346533306432323232
-38316537653436383235343030326335383165633933626539616166613430646432353135356361
-31366663316363636266636364376133656438333365643465613230323739636237396338613263
-38663832396435373137306130383762323731333635356363333732623337333764343034323366
-66663063343765623164373666343665613133396166316439646663353461643935356532383130
-61663236393534386332336163626235326135396632306538616563356233653738346235383361
-31636465623236393231623133333335663337376265343532633234626134653337653639386231
-33313161663634386165343130633837353735663463663438616233643332313164663666333634
-30306261366538616635613635353136303635343639356266646436393737363133333438313534
-66393963633438353536303364313163653764666531323934373732333861313864653831326563
-38396661633232316364396565393137376231636533316533306533633536613964303861623032
-30613663623266616366616139383466303663313531383761633364356264643438616134336664
-62613762383662373065316637373039303639313637333235643737343137356536356231383363
-66333435323530636534366464363662303837373564643639346138383562373533336636616364
-36303538373037626566343335633237313364353736366236633665356435373037613666303039
-61643161363239383333323830646335326139623231393564636466623734343665346335363762
-63623361333935326530633363663062663263623062333038343836633462363965333735656630
-31616239356439616662363031303238333862303664353338333264353537346231343963643136
-36663539316466346636636162643936663961386666316630323539633830376336333931633034
-63313436663037643261313763356434643865366465346538656439323436656336303962323338
-34656638373137326138623661383333313166333664666466663963343864663961373765643236
-32323536393538356239396331643835653131643162353938336130663333333034613461646261
-34356132333065656334313930633666626132323962643666323165366131393736626163346337
-32626265336138313566383437313636333466343764646235343830306662626233623930323932
-62373935383566343132373539343138353437343664613632393564313563386136346364653336
-39653836636362316236323339343964323761393463373830343933306365323239633966386637
-31353032353066356333636130363064343266323566663932313866323631643530666662366630
-39633163373966363133616162366665396431323636306463336236633636323437393966663361
-65393835393562626435383534323130346432373631666334326164653931613538393366623938
-36646265373133356532656564653135623833333335376637333939653364373235623763373134
-34343762323830343031376539393861633861633130613439613433306362363864313130366238
-61346338646664333533616361326364376663316236356137313262616665373837333762363466
-36363935646630656232313533373066613536353739366237313963316631643766643136386237
-36316363333066616537353239333536356534333239636238376461316266333361376164393633
-39316339626430343965323761303366623464353561363466306230376530376236303135663762
-34323531306432323964383133363839626530396130653665353061623030363632363462323164
-38383337336334303565343330363238373865333032333933626162656236333635396634616137
-37363465306362646535396163626462353634313966613464393034323537316164643866636438
-63366666613735643330656661346230626230373365393532633830343333353336646465353532
-61353530326666646261343936313736646161363166306330663633663638396238363161666131
-33383830303161353136666235333532326139346136613531353163353431396362393332633038
-35363033663434666334346430663665663163626162316339383964316639353564343464626331
-65663531386430623561666162633732333937653962613261653164303535616337386134343265
-30373334353866666364663732383061336164366161393130613263356666623937616238396331
-38353039623865663730653734663534636130373133623835613431393433396430303431313331
-39373564643338323362326562663564326561326563663134376231393361616335633365313635
-32333234643239623932646561616565646461623238356661613865633161353265613635323434
-34393931633134313837336630316465623463323263666432653337336131663735383561353032
-31363637636565343733303535363062343666616134623162656565343631386336333832343262
-39303130396635613262316362326266643636666534353664636632666364393863633133336231
-34663335333630353838636533313863366336373366643765663438666166356135393937383466
-62346532653266626338613630383666393433633036386333663234383731303836373838396461
-31336235663264353737346533393136366232613239383032613861613564643165346263333636
-66323164666334613338316462626434666239643737393134306532366362663562626434653465
-39633862356566383337306533646438346539646232396565313466613364653265636364643938
-66376233393239326230303334363335643765323739316437626261643162643035636532313962
-38646338663464376131306134363537386463353935326230303635633261643962616430363861
-30393636613938306137666665306430323833353064363561666262343633353135383964653830
-31353865663838343834323635303263396337333132653764373631663830323939396330356635
-626462343535393634396163356565313632
+66353130383062316462386138393335326535393536316339393131633237376230323634346639
+3266363564396662313666663961653938663061616262380a363961346366333566366438336636
+32326631663164383838383330363839313631346139303039663835353963366330356366616435
+3735643034343738640a386433623163613964666561373436316363616238356233313730323038
+65393034326539636232343734383331666332346561393633616535666334313736373536663031
+30393733623535303639396462623236303062373937646235636138346339313964373634646632
+33356464316534366638666634636234313238343037376430643237336337323565666535363666
+33306537613534313733616333633461366632616562366639353231376637313365303961636339
+38336238386266376361363339623036386136326363343766623962623330643732386432623166
+36643536623230663338623064633837393866386361643439313965643432333034306533626664
+38633632323432303966343266313666643563323733313364306633346135643234623830613465
+37373234376261666364616564653339356234336437383337366435626130636265653634653734
+65663738646137393734343066303139323033383864353134363666333131613230636462613638
+66636564333063643930353961623033353561386662613862356661383065636435343736303262
+38373434383338353562623032326462373735376632303464663835393763316465343238626231
+30623734366161303838626539383933376364356232626239613732613933376264356665613537
+65623331313537306230356632343133356131373331663030656332636430396664633661363039
+64383736333862613565346135666164333732313733663934376435303535386538353465633163
+66353833376462623230623535666339663431393232353964373038376430643139333134306336
+65643635313263613632386331626433363638303432623032633963313165313031626463326638
+36666532623533363635353161326331333462343633623965646433313965373537653463343061
+34336237616461663436306165353837643633346362323762313734313739643363326239353437
+38343038373531333666663430386662663365646464306530333035613038383630386332383030
+63323133353435336338346564343435636264643961393261376130383932326330663030346538
+33376632306338626231666338376139356639323734636664343666616138353131616262343436
+61373866366139333437336336343362636331356161363165366561316462613434346461643939
+35326366313864346235316362663961313330336263643733333539633630363666303835643332
+30313833616439373165333862346134613163326138323164353937336639376136393338366530
+36383637653462373064653566643733396136616135373163656431306436343235366232666564
+66646231376431386636323530663930313531353633353232653833323963646333346530643266
+32626564623761323065666236316664396663303738353935613333646431333233303062633330
+66373735316337663239346338633765363466333236323836663163616631343730623265323261
+30666634376265383736636164363236636638376234653761313133666365346466306261353334
+34306631643333666262336233306365386365623264663664613136393963376466323438393931
+61346535333164303030623261303134653939333338663634636661373063393165616530303638
+34303832386464643435386338313339316665313662336233356664653439353031363663333532
+36383036633336343332326530303831366631396236396666663032396166656538666566623138
+34383661373733326664353730306338666362363164623736323661343163653866343636633462
+61643032613563663537656135353037666430393631623232363866346162396361633736383031
+66353034623664643366623262663764313364356333313165306664613732666562366566623663
+66356464323364643733363965306132663366376462346261366365333966333334383630633532
+32373235393439623737623336313035633137646435643863363566373035663033353937623433
+66343636656537666530663138373837306533366464643264343937313963633434316564303731
+30363535313365656136326563306136656635616131396565313962646162353638346231616332
+63373263353435316236633934316232656631646136343764373562373730613735663262633162
+36633139316465323733383362623734383639393462366262313335313862656161313234643838
+35663030353837323863303935663166643732383634383666323631306335353164323464626635
+36626661383462303536626438346139376338313863643836336130303037623065376638613631
+32623034383762386535386331376464346139663462333033656235336537656566373861346366
+39303464393639616637316665663261663236663461363830366163396333653664353731666331
+63336464343866393962303338623962316330663333653334356130333166666161373339366237
+61316465626430343264323037633439313135356334373732343632303164313036336362326432
+39613639656266303762363632666461366531653437393537303530613861343536663230323238
+39613736356566613733303636613966393437363265316263376637306663313337343366393366
+65623861643763343866343063313731396466316339356565336566316432326535363239663039
+38653961393935343962346235376536323463663639643235663130616235376366356366313535
+61346438313361333165386631623933386439323035303765616535343735383030333832373432
+30373466323538356232663637346338653435306261373332393935613366626565653766656533
+66616638653263343766363962633337313930323262646230396563633061363230336133646633
+65663138626239643631663338313435313431663365303238626433633039633762353761316265
+35353463616566653534363535646439343161393639363532366265303565343761653062373038
+31313636363331396237663132366632626663313038356163323065383939346361313066363764
+34363063626263626433353439646237316631363933386637623130666336343164633437326337
+35373633363538333834316566376634393434333336663333653265363234366430643165633830
+66396162313130316539316134333538653935306635353137383065646465623337346366373539
+61376237393335346538643463366134383333396137653262623839343961663036663962666262
+33616532646638346261666238623166623133303438643462383430393032346334663161366333
+39323964353037666165653935616431306263616634353239633730346164376333386430353334
+37373233663565353337316238343766313766633737356562663038363234636431353665306535
+30373035653330303437306230646337343966306161623666313532653862646331646633656563
+37663539613730646235613031326534616531346661663765393730393935316365366164323164
+32383363313862323931376234323330353637373930353432653536636564663738613130613934
+38303235663939663630316566333338336539393933323766613161623162653532346236353936
+32383864306363353936663265653565396438366534396633663139306264666562323237653837
+38373062316232653866623435353463313265323139343334346337313130636165356665363030
+66346630303431633066333139626661616631386232633765613166303231626231653438363331
+38306134663063613766363037626338393464396237656337343362366261396166343538393162
+35373730356532656166396163663830623137623531633066373832303130653131333639383062
+34623738326562643264636166343865363333343633356136353633333063636239663136366333
+66366635333966636632386330643265393865386534333865313464663531633231663839616534
+33326565363134633662363166363666643538643637383765613730346331626537303235366561
+33666132633836323133373131653363326438346664623039303762393139666331626161343437
+39303136383734343664646638326432613965616165323734356632323634303337663430373439
+36346231333863636338383964633230353832373434623234333130383137386666626339313064
+35653862313663633061396530303665303963396438346337386262616164663334613632316565
+38333763643936336336656361633165353733333936643835633337626434303631326162643739
+35363732666639323836383662313431376537346162333361656232636165626636316366623065
+63333638656130666632633837626266363237313935346164383331333532653134386330383435
+30613137306466643130633134353464613131323831613765656533396438643061383165373131
+61663262663661316161653236353831316337386336313432646366336635323936623738636139
+63323364366330306631343836363431363630623963653237386232366464633733663561323764
+64343463313432303434383432316639663262383538316633393733623839663639373636336566
+37656138323431373537303738646336323261316532343465616661653735636532396639633936
+64616537333833623634656436656361636465653039653931653239623765626563316363316535
+64323830666561316639333330643237313136626363333661386565653164353537396565323431
+35363665383061363434623464383737303361633039623738393966666434353862353234326336
+66666532646163303337626236653263386230333864323963376238353461313966643762653063
+30373662613434346163313933386664633933616134613134356230353561633966353233396162
+62623232663165623562363661613137353038646162653135326663386132646231303038303338
+35613534333837323465623361363061336163323361616538643566376438653933653965636536
+37303961353165623361346535383832393632663166393766396230643939313530623765356334
+36663237393634323037623431643361623830373536663532313736633035623062346363623766
+34613861323864663662383231366335386362323865623137613032636235373163626537393661
+64663638343662623364303035343432623335323533663864616436356233383732383662333066
+39663765623334623662353133373835326133333062323963376431663134353761613464643061
+35623737643336653962343431306431303132343935303932613764313838303230653664643562
+35666436616663633939323932373539396161306664636637623663313334656165393963363137
+38643461316430383732666536633335663233336639653239653630333762353065633432666661
+63363931623335613466393461333431613764636438613733383062353763343530343631663037
+37313861333962313831646337376134356133323233396365613030643430303364326232636462
+61386564663161313964323234313034343666303130316662353638666661373439383335616564
+35323863643965656566313465613166326362616539643030306165336439393930373465663530
+30316265346165333030616433326332643362633135393065623239613736353465633562663864
+36663932356430303163336136353964393366316236336432313738653236353261623732633334
+31643938656264303330393961376236626563643630393730373334643064343237386532643138
+34333864326335393336363963393532623036326532366138643432636462643238376635363062
+63336263303536376636303937363937373633356466346438306138326232613935373433346231
+33313864353830663264343838396365326437613330363365663031353566643661366631353134
+34646132613137613266303365366236626131363033346330616438323861316438316430303962
+38653165343638316363623361353435383166333162613139636331373138333232623830376334
+39636166373138663265393037663062363433326337376134376265373630396566333038343265
+36333464383566303466303938623932313033336131316430383937313164343663646335353731
+33653262353736373338306439326333303365343937393766306234393034643730613263393132
+62666163663031323433623630666161656536626232373433633733343936643265636536656638
+30353734386463313534623531383537353338306431353135393130306564643036386334333335
+65323238356239633731353865626236646334623038333365373664653431306335623133313731
+64646237333566613638333039376533663763393064633237323566326166363764633935656262
+61363566363736616437306230333732613335313463643236613139326538313762396137626135
+36653161353033666265646665353531653035386336666235626162646561383138653165303132
+38323162313266643165373837326662346266653030393331333237323230366564643138303939
+64353730303938356430353066343630636234326636623135383131393663323033613130633034
+62623734653662393831376664633564643736663839356365326134636533326364356563393030
+66633164663930336530323461646165393038363731373437613535313930316561333064323337
+64353033373265323334393530316234363330373766333730646439363739613365653337333033
+65346466323965376462646364366133666664353766396165363466646235313035613333313565
+65633032306435613030363461303037616639353463313565646432353565353239313634313535
+63353739393361663735623839326562656336363464373934633562396534633132623730313562
+37343361373366336665323232353234613431336437393266643663666137306662653061376435
+35623062333938653733313134383735356463646332333437653766366164663164326465303265
+61383730623663306566376631353531613763626135643866346139306162313964383839653333
+38646635663034643136646635393131373737646133306665346338343162653430353332323930
+30613966343162303334383437303464353232303961316363633839633130653432346132633337
+33373263303930383565323136306131316564396338343630346535326533626661366565356166
+30643937666466613633346439393336633665303831623337663439326230653637613939616438
+33373634303833636665643866333031316435336465326632376431306636366330363935636236
+65346566363438633664393937373330666262323739336539383337613662663661363163633133
+61663063376361316637653530326364313733383662376461326664373330363630336439313632
+64616266343038656262663730393636316535666363303730343631323764303930633339616563
+33303332313431356339393363366330323430306137353062353235653534303836393636306466
+30623231626234623435613366363437326165356431636464663631306237323533383565383733
+36336138323032303364346134613565626137633662353536363937323931393363633636316133
+64356339316534653965303530656266633761653764393633643562623132663230393931313539
+63343865636631336163623933393737373339303737313466663764656130316263303063616664
+36613933376361633134366136346239333738393063373033663831303562396237306531356136
+65393734663638326138663331303163383764363639633033393330386638646430623030653331
+33393036393462653232386334656635616437316237653663646438366464386239373864663462
+64646466336665316135336665643137366333316534316661336530623665376132353533633532
+35623636396264323034316339363336306538306465663561326566396434636434616338623930
+35393861393365653136323764353433386662323139393231343262346432303261313661383162
+30663966613661316432373361653034613839613761386266396134373261613161623565666537
+38326564663338393261653435323238666565363061306137636266393431613162373561653930
+30636137323362613662353930323333376635323134316430636135623061663762313639306433
+38313466656439643965376163346562303737333663353562373165303339393530303935323639
+36386333376361383365346333366463623032653231346130323032356632353331663964313035
+38666235633061616536376266613132386432376561316132666234333930616462386237356238
+33386561383331313738653538646533333964383333396364663166363161616436633734653835
+37316135353065633932656439656165663437373934336237386666663134623362383439653238
+64643664656365303131306266306139353164623935626561643366633330383837373032313838
+33616432643662326430663932353734386634373131633039646237376563393262333838393234
+63376334333862656434313934313965353263363032383261326433643939646464346164313131
+34356361636163616164663432343132343131363533376638656635366436646434373235353831
+65326436616536376533613232636233356164626137343831313065373064336235643535323536
+30323030353639633534313164353835353161653939643638303436396136333033353838633064
+30303233616632303765346137653739343531366134653235323032666630626338646663613762
+62303966323064353765666564333065663331343239653436626430326332316436346632346334
+65646130656331393430656364616161333831363130636438353166613936616165336361373465
+64643839333763346562656661353036333838326235343439316337353937343966303536626133
+63313966306636616334656633616338616334313039653530373566613838393262616663393366
+30396162623163663162633861666663356132653836636664333030646162333737623335363737
+65646233386363636265346438626634376661396236333830356135316234396237643431643761
+33366139663730323934643331633434303365613532656238643934303634636433646261353434
+34306434626439323465393365303737663866306534666534643631636337623666303037353034
+34313839383930313062613634366430353133363739636665353138383034353963633333653765
+36393332383739326136646231363436303765346430373865643866383332343231653235393164
+34663935663365303031376463376665666236666438376536303335653636616331643637633762
+65643139613364623733663362346633316535633261666238363663633166643239356134616439
+31396130356435656132323634393364666238656632633264643132323761366266326136386232
+32373438353538396262373163396431323030633365353765373463643934666638373366663939
+32643061386265316334623764373632346436396336616539333661616335613937613833326165
+61616163366635643630633138323937633332313733363130396365363333383865363731363861
+34396262386333646661613032303239636436313364326631303339613733333039663539306336
+32636661656464353861643937356234313838303737373631633438366161636436363837306131
+33653534623437633061383262346137613437343834633431613664633061313731396263643034
+32643235356532623932656462393234346438383738333933396632656165636661646330653136
+30323366613831623639613062613030363065633161316330663539306436666363386665353132
+34306565623762663461393837653937333039636530613164343066613262373835373837613631
+33636333643664343133343632633333366233356133343436393732393736366637353338633132
+31626432643366373938323530353465383561343734616132353066616565633263396262663965
+32353031323861633239306538666364323063353064396538326136663839346333623630336664
+35366563653831663732363034366632626133326437366339333663376263343030383833643761
+66333438616636653434326139363965343061313262636632316533356261343362313339613036
+31393538383932346432626665383731363434333062633733383638376635633762333735393832
+65303036393139386534663965663562383062356533303462333864613163646235313033613430
+38633338383366383538396535353436643832626637336337313464633464616465663866393437
+63393339336364626138393966616330663531376265356635323335633863653132636561396339
+66383537663966343465306263303739663433613366333730643137303565323963326639336538
+63623864623038666234363837623930616235363338653636623331613463653438633330353662
+61616337396234396633623938383163306230333135383561316333353032363833643934653632
+61373833633237303365666661663265386238363735666234323438623737383231303966613231
+62623237636162666466333437613534356166633061363834663337363934626564333631343435
+31363735353066636233643361323665316538323762643963376166616462313664393664373361
+64663533376532336633633835646266396531343663653036336166326264313965646662636130
+66376637316539666163643537393966376239633761643734316432663165383566303164653135
+33333032343133653066623761316566333831643339323838623465633365333332346534363231
+65353538326265303435353261346362353662623636343438373535633732633331353463326465
+35653539633437373334643233643862383836353163346661616330666166316162616134643462
+36663833353639613561323865306166376236313332313430656238346331346638326239336165
+38353162393539343036386564626639303637626661343838383465396536303536306238333664
+63343539666334393238336134336364333265623438643337363936336531643863366637656436
+31383066316434323136363563616138653761376436323765663031303533373065633032623131
+37646164336332663039656663333735623236393464616436373062333763653361643238643439
+37303738393935346334623466656536666436333636333961316637376363643261393636366436
+31326433663832643264373165343835306535643737316661393661333130666332366161643262
+39623130636163373834333131623136656531623437343161343264373339376262343537343433
+31373839653464636231613436643032316433616661383664383431393065663662386631323161
+31326135373639383034646330303664643864663166653034313237336638303863323266326630
+33376539303730666530633935383531616261373964333633306236626431383734313639313433
+39353737383164346538663931626565666633626232306535663735643864396264323234396130
+38346537326663626330633733646433616462353264623139393835303037313065373935396435
+62633234666135353838303663383464313863626266636165666332373431343438343835386666
+66356534336130303235666439303561343364626263373432303065376263633365663131663436
+36373538343730366236613737353561313133613636656634343961636665366266366633376433
+36626165343632346631633830306134333862346161623630393564653864363435383235343765
+31633435613666653734383038646237376637633665303830636333313863323062623634303761
+34393163646263383739313538656662613136343033363834393535656435633530306266336631
+66303430353636323339383464616131643137373034346266346431323635323862643263366230
+65663864373262666165313339656432643762363064353139663035333037616164663166306163
+64613231383836343263376638366438373839376236663231336663626239396630396364336335
+37313766653233393062313833373631386139346666333239613566393337366461633961636437
+31653034653064373937333962653933653830646435366639396538613665333565363366346335
+61323961383533356462646133626231376666383131633636313639396435396431666663363666
+63373130303966653966663338396561646435613934376566393965376137353730633335663637
+38646336643830303661303337316366333738393634303262306530366361336137343832353037
+33663039643462663462643338326431393833626664343332326362613663663232633538383733
+3263
diff --git a/skillz/sk-cloudio.yml b/skillz/sk-cloudio.yml
index 15e8bfec..a0ff8f51 100644
--- a/skillz/sk-cloudio.yml
+++ b/skillz/sk-cloudio.yml
@@ -6,9 +6,9 @@
- role: core/base
- role: core/sshd/base
- role: core/zsh
- - role: core/cpu-microcode
+ - role: core/ntp
-- name: Payload Setup
+- name: Infra
hosts: sk-cloudio
roles:
- role: core/users
@@ -17,15 +17,20 @@
- role: storage/zfs/sanoid
- role: kubernetes/base
- role: kubernetes/standalone/base
+ - role: x509/static-ca/base
- role: x509/acmetool/base
- role: nginx/base
+ - role: apps/publish/base
- role: mail/postfix/base
+
+- name: Apps
+ hosts: sk-cloudio
+ roles:
- role: apps/nextcloud
- - role: apps/collabora/code
+# - role: apps/collabora/code
- role: apps/onlyoffice
- #- role: apps/etherpad-lite
- - role: apps/coturn
- - role: apps/jitsi/meet
- - role: apps/keycloak
- #- role: apps/pigallery2
- - role: apps/wikijs
+
+# - role: apps/coturn
+# - role: apps/jitsi/meet
+# - role: apps/wikijs
+# - role: apps/keycloak
diff --git a/skillz/sk-tomnext-nc.yml b/skillz/sk-tomnext-nc.yml
index 9b756a18..fbc7aeb0 100644
--- a/skillz/sk-tomnext-nc.yml
+++ b/skillz/sk-tomnext-nc.yml
@@ -1,24 +1,28 @@
---
- name: Basic Setup
hosts: sk-tomnext-nc
- roles:
- - role: apt-repo/base
- - role: core/base
- - role: core/sshd/base
- - role: core/zsh
-
-- name: Payload Setup
- hosts: sk-tomnext-nc
- roles:
- - role: core/users
- - role: storage/zfs/base
- - role: apt-repo/spreadspace
- - role: storage/zfs/sanoid
- - role: kubernetes/base
- - role: kubernetes/standalone/base
- - role: x509/acmetool/base
- - role: nginx/base
- - role: mail/postfix/base
- - role: apps/nextcloud
- - role: apps/collabora/code
- - role: apps/onlyoffice
+ tasks:
+ - debug:
+ msg: "this is a legacy host please use branch legacy/skillz"
+# roles:
+# - role: apt-repo/base
+# - role: core/base
+# - role: core/sshd/base
+# - role: core/zsh
+#
+#- name: Payload Setup
+# hosts: sk-tomnext-nc
+# roles:
+# - role: core/users
+# - role: storage/zfs/base
+# - role: apt-repo/spreadspace
+# - role: storage/zfs/sanoid
+# - role: kubernetes/base
+# - role: kubernetes/standalone/base
+# - role: x509/acmetool/base
+# - role: nginx/base
+# - role: mail/postfix/base
+# - role: apps/nextcloud
+# - role: apps/collabora/code
+# - role: apps/onlyoffice
+#