From 17abed04cb926913512bfdeb48f996992104f74f Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Tue, 2 Apr 2024 12:23:43 +0300 Subject: [PATCH] collabora: fix server name (#2327) --- library/ix-dev/charts/collabora/Chart.yaml | 2 +- .../ix-dev/charts/collabora/templates/_configuration.tpl | 2 +- library/ix-dev/charts/collabora/templates/_persistance.tpl | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/library/ix-dev/charts/collabora/Chart.yaml b/library/ix-dev/charts/collabora/Chart.yaml index 5536f9fcd1..d511bd06a4 100644 --- a/library/ix-dev/charts/collabora/Chart.yaml +++ b/library/ix-dev/charts/collabora/Chart.yaml @@ -4,7 +4,7 @@ description: Collabora is a collaborative online office suite based on LibreOffi annotations: title: Collabora type: application -version: 2.0.8 +version: 2.0.9 apiVersion: v2 appVersion: 23.05.9.4.1 kubeVersion: '>=1.16.0-0' diff --git a/library/ix-dev/charts/collabora/templates/_configuration.tpl b/library/ix-dev/charts/collabora/templates/_configuration.tpl index aebb3af85a..09fdf793f0 100644 --- a/library/ix-dev/charts/collabora/templates/_configuration.tpl +++ b/library/ix-dev/charts/collabora/templates/_configuration.tpl @@ -35,7 +35,7 @@ configmap: gzip on; client_body_temp_path /var/tmp/firmware; server { - server_name {{ $nginx }}; + server_name {{ $nginx | trimAll "https://" }}; listen 0.0.0.0:{{ .Values.collaboraNetwork.webPort }} default_server ssl http2; ssl_certificate "/etc/certs/server.crt"; ssl_certificate_key "/etc/certs/server.key"; diff --git a/library/ix-dev/charts/collabora/templates/_persistance.tpl b/library/ix-dev/charts/collabora/templates/_persistance.tpl index e898b49ded..2dd480e4f9 100644 --- a/library/ix-dev/charts/collabora/templates/_persistance.tpl +++ b/library/ix-dev/charts/collabora/templates/_persistance.tpl @@ -10,6 +10,13 @@ persistence: nginx: nginx: mountPath: /tmp + varcache: + enabled: true + type: emptyDir + targetSelector: + nginx: + nginx: + mountPath: /var/cache/nginx {{- if .Values.collaboraNetwork.certificateID }} nginx-conf: enabled: true