diff --git a/requirements.lock b/requirements.lock index cef04574ec66d8d06e6043cc1324c85a825a1918..a599598a71b6328d196ed7e9ab7528af90c48dda 100644 --- a/requirements.lock +++ b/requirements.lock @@ -4,6 +4,6 @@ dependencies: version: 1.0.2 - name: collabora-code repository: https://kubernetes-charts.storage.googleapis.com - version: 1.0.1 -digest: sha256:f33ff06ddf9918e4aea15a99a509da296e3669ab1f61a272fefc1f9ae5a7e8a7 -generated: 2019-04-23T12:35:28.513705997+02:00 + version: 1.0.2 +digest: sha256:53d9ba3d4b86bea6e2b7aa480abd03737e623e14cf14275feb27a0ff320a15f6 +generated: 2019-04-30T13:00:36.870647752+02:00 diff --git a/requirements.yaml b/requirements.yaml index 1e961c70f8d4a37e9713833255b4ae1f4a5f0578..e0d50e862fc38260a4a205d3de8cc62c3d514a48 100644 --- a/requirements.yaml +++ b/requirements.yaml @@ -6,7 +6,6 @@ dependencies: - nextcloud # Needs https://github.com/helm/charts/pull/13311 - name: collabora-code - alias: office version: 1.0.2 repository: "@stable" tags: diff --git a/templates/NOTES.txt b/templates/NOTES.txt index 22d044814b8fc73328af2d69af15a7e366d448c8..9ed1c4dc8a02890be70bb63efb0b786a2cb7c6a1 100644 --- a/templates/NOTES.txt +++ b/templates/NOTES.txt @@ -1 +1,16 @@ -Installed! +{{- $collabora := index .Values "collabora-code" -}} +Thank you for installing {{ .Chart.Name }}. + +Your release is named {{ .Release.Name }}. This chart has installed Nextcloud +with Mariadb enabled and Collabora. Nextcloud is available under a pod starting +with the name {{ .Release.Name }}-nextcloud, the Collabora pod name starts with +{{ .Release.Name }}-office. + +Nextcloud has been configured to use Collabora for opening rich text documents, +using the `richdocuments` app. It uses WOPI url: +"https://{{ $collabora.collabora.server_name }}" + +To learn more, try: + + $ helm status {{ .Release.Name }} + $ helm get {{ .Release.Name }} diff --git a/templates/job-register-collabora.yaml b/templates/job-register-collabora.yaml index 4fbafaeb724d68a0dec052b71f4d9bfbc6034efa..420b74c2dfa293df6700f4ed903b66f344d0f8bf 100644 --- a/templates/job-register-collabora.yaml +++ b/templates/job-register-collabora.yaml @@ -1,6 +1,6 @@ # Work around the fact that we can not index hyphenated names # (https://github.com/helm/helm/issues/2993) -{{- $collabora := index .Values "collabora-code" -}} +{{- $collabora := index .Values "collabora-code" }} apiVersion: batch/v1 kind: Job metadata: @@ -24,7 +24,7 @@ spec: spec: restartPolicy: Never containers: - - name: register-collabora + - name: {{ .Release.Name }}-register-collabora-job image: {{ .Values.nextcloud.image.repository }}:{{ .Values.nextcloud.image.tag }} securityContext: runAsUser: 33