diff --git a/mycloud-collabora/Chart.yaml b/mycloud-collabora/Chart.yaml index 926d55c..32029a3 100644 --- a/mycloud-collabora/Chart.yaml +++ b/mycloud-collabora/Chart.yaml @@ -6,4 +6,4 @@ maintainers: - name: WrenIX url: https://wrenix.eu -version: 0.1.0 +version: 0.1.1 diff --git a/mycloud-collabora/README.md b/mycloud-collabora/README.md index 70d0d06..bbfc326 100644 --- a/mycloud-collabora/README.md +++ b/mycloud-collabora/README.md @@ -7,7 +7,7 @@ description: "myCloud component to setup collabora" # mycloud-collabora -![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) myCloud component to setup collabora @@ -52,6 +52,13 @@ myCloud component to setup collabora |-----|------|---------|-------------| | commons.masterPassword | string | `"CHANGEME"` | masterPassword to generate secrets | +### Remote font + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| remoteFont.enabled | bool | `true` | remote font setup | +| remoteFont.url | string | `nil` | url to remote font default (set to nextcloud) | + ### Other Values | Key | Type | Default | Description | diff --git a/mycloud-collabora/templates/release.yaml b/mycloud-collabora/templates/release.yaml index acf2ffc..5d45bb3 100644 --- a/mycloud-collabora/templates/release.yaml +++ b/mycloud-collabora/templates/release.yaml @@ -30,7 +30,20 @@ spec: collabora: username: collabora-admin password: {{ .Values.adminPassword | default (derivePassword 1 "long" .Values.commons.masterPassword "nextcloud" "admin_password") | quote }} - extra_params: --o:user_interface.mode=tabbed --o:ssl.termination=true --o:ssl.enable=false + extra_params: > + --o:user_interface.mode=tabbed + --o:ssl.enable=false + --o:ssl.termination=true + --o:fetch_update_check=0 + {{- if .Values.remoteFont.enabled }} + {{- with .Values.remoteFont.url }} + --o:remote_font_config.url={{ . }} + {{- else }} + --o:remote_font_config.url=https://fs.{{ .Values.commons.ingress.domain }}/apps/richdocuments/settings/fonts.json + {{- end }} + {{- end }} + --o:net.proto=all + server_name: {{ $host | quote }} aliasgroups: {{- range $host, $aliases := .Values.allowedHosts }} diff --git a/mycloud-collabora/values.yaml b/mycloud-collabora/values.yaml index 213420a..cdb090c 100644 --- a/mycloud-collabora/values.yaml +++ b/mycloud-collabora/values.yaml @@ -84,6 +84,15 @@ ingress: # -- adminPassword to access collabora admin platform adminPassword: +remoteFont: + # -- remote font setup + # @section -- Remote font + enabled: true + # -- url to remote font + # default (set to nextcloud) + # @section -- Remote font + url: + # -- allowed host to use this collabora instance # if not set we allow defaults (like nextcloud) # example: