From 0cb9a9cf654410f9f200e96e990f0ebe7d5d0e16 Mon Sep 17 00:00:00 2001
From: thiuda <thiuda@mailbox.org>
Date: Sun, 29 Jan 2023 22:35:07 +0100
Subject: [PATCH] use tiredofit image

---
 defaults/main.yml               |  5 +++--
 tasks/main.yml                  |  7 +++++++
 templates/.env.j2               |  7 +++++++
 templates/docker-compose.yml.j2 | 15 ++++++++-------
 4 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 templates/.env.j2

diff --git a/defaults/main.yml b/defaults/main.yml
index 45fcc4b..d55d115 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,9 +1,10 @@
 ---
 collabora_domain: collabora.example.url
 collabora_cert_domain: example.url
-collabora_image: collabora/code
-collabora_version: 22.05.9.3.1
+collabora_image: tiredofit/collabora-online
+collabora_version: 2.4.19
 collabora_container_hostname: collabora
+collabora_allowed_hosts: "host2.example.url"
 collabora_port: 9980
 collabora_admin: testuser
 collabora_secret: test123
diff --git a/tasks/main.yml b/tasks/main.yml
index 46d9af8..96e1dd2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -17,6 +17,13 @@
     dest: "{{ compose_dir }}/collabora/docker-compose.yml"
     mode: 0700
 
+- name: Upload env collabora
+  become: true
+  template:
+    src: "templates/.env.j2"
+    dest: "{{ compose_dir }}/collabora/.env"
+    mode: 0600
+
 - name: Update and start services
   become: true
   docker_compose:
diff --git a/templates/.env.j2 b/templates/.env.j2
new file mode 100644
index 0000000..d835bf9
--- /dev/null
+++ b/templates/.env.j2
@@ -0,0 +1,7 @@
+ADMIN_USER={{ collabora_admin }}
+ADMIN_PASS={{ collabora_secret }}
+ALLOWED_HOSTS={{ collabora_domain }}
+ENABLE_TLS=FALSE
+ENABLE_TLS_REVERSE_PROXY=TRUE
+INTERFACE=notebookbar
+PRESPAWN_CHILD_PROCESSES
diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2
index 5b70b39..26f27c9 100644
--- a/templates/docker-compose.yml.j2
+++ b/templates/docker-compose.yml.j2
@@ -7,14 +7,15 @@ services:
   collabora:
     image: "{{ collabora_image }}:{{ collabora_version }}"
     container_name: {{ collabora_container_hostname }}
-    hostname: {{ collabora_container_hostname }}
+    hostname: {{ collabora_domain }}
     restart: unless-stopped
+    cap_add:
+      - MKNOD
+      - NET_ADMIN
+    privileged: true
     ports: 
       - "127.0.0.1:{{ collabora_port }}:9980"
     volumes:
-      - /etc/localtime:/etc/localtime:ro
-    environment:
-      - "extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:num_prespawn_children=4"
-      - username={{ collabora_admin }}
-      - password={{ collabora_secret }}
-      - server_name={{ collabora_domain }}
+      - ./logs:/logs
+    env_file:
+      - ./.env