From 94bff4d4e0f9e40fb91b028bd219d10add276d7c Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Mon, 11 Apr 2022 00:57:07 +0300
Subject: [PATCH] fix(collabora-online): remove domains var as it's no longer
 used. (#2469)

* fix(collabora-online): remove domains var as it's no longer used.

* add ui for the new env var that replaced the domains

* reduce logging
---
 charts/stable/collabora-online/Chart.yaml     |  2 +-
 charts/stable/collabora-online/questions.yaml | 13 +++++--------
 charts/stable/collabora-online/values.yaml    |  4 ++--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/charts/stable/collabora-online/Chart.yaml b/charts/stable/collabora-online/Chart.yaml
index 005aa826f10..5d0d7338b1a 100644
--- a/charts/stable/collabora-online/Chart.yaml
+++ b/charts/stable/collabora-online/Chart.yaml
@@ -22,7 +22,7 @@ sources:
 - https://sdk.collaboraonline.com/contents.html
 - https://github.com/CollaboraOnline/online/tree/master/kubernetes/helm
 type: application
-version: 11.0.14
+version: 11.0.15
 annotations:
   truecharts.org/catagories: |
     - office
diff --git a/charts/stable/collabora-online/questions.yaml b/charts/stable/collabora-online/questions.yaml
index 2131101a6b7..d3cfb034ccc 100644
--- a/charts/stable/collabora-online/questions.yaml
+++ b/charts/stable/collabora-online/questions.yaml
@@ -111,15 +111,12 @@ questions:
       additional_attrs: true
       type: dict
       attrs:
-        - variable: domain
-          label: "Domain(s) using collabora"
-          description: 'Use pipe "|" to separate multiple domains'
+        - variable: aliasgroup1
+          label: "aliasgroup1"
+          description: "Comma separated hosts list."
           schema:
             type: string
-            default: 'nextcloud.domain.tld|othernextcloud.domain.tld'
-            valid_chars: '^((([a-z\d](-?[a-z\d]){0,62})\.)*(([a-z\d](-?[a-z\d]){0,62})\.)([a-z](-?[a-z\d]){1,62})|((\d{1,3}\.){3}\d{1,3}))((\|((([a-z\d](-?[a-z\d]){0,62})\.)*(([a-z\d](-?[a-z\d]){0,62})\.)([a-z](-?[a-z\d]){1,62})|((\d{1,3}\.){3}\d{1,3})))*)$'
-            required: true
-
+            default: ""
         - variable: dictionaries
           label: "Dictionaries to use, leave empty to use all"
           schema:
@@ -130,7 +127,7 @@ questions:
           description: 'e.g. "--o:welcome.enable=false", See more on /etc/loolwsd/loowsd.xml. Separate params with space'
           schema:
             type: string
-            default: "--o:welcome.enable=false --o:user_interface.mode=notebookbar --o:ssl.termination=true --o:ssl.enable=false"
+            default: "--o:welcome.enable=false --o:logging.level=information --o:user_interface.mode=notebookbar --o:ssl.termination=true --o:ssl.enable=false"
         - variable: DONT_GEN_SSL_CERT
           label: "DONT_GEN_SSL_CERT"
           description: "When set to true it does NOT generate an SSL cert, you have to use your own"
diff --git a/charts/stable/collabora-online/values.yaml b/charts/stable/collabora-online/values.yaml
index b9e5a809d34..d9d51159c58 100644
--- a/charts/stable/collabora-online/values.yaml
+++ b/charts/stable/collabora-online/values.yaml
@@ -20,8 +20,8 @@ service:
 secret:
   username: admin
   password: changeme
+
 env:
-  domain: nextcloud\.domain\.tld
   dictionaries: de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru
-  extra_params: "-o:welcome.enable=false -o:user_interface.mode=notebookbar -o:ssl.termination=true -o:ssl.enable=false"
+  extra_params: "--o:welcome.enable=false --o:logging.level=information --o:user_interface.mode=notebookbar --o:ssl.termination=true --o:ssl.enable=false "
   server_name: collabora\.domain\.tld