diff --git a/charts/ocis/templates/web/config.yaml b/charts/ocis/templates/web/config.yaml index 3db187a18..4d435d21b 100644 --- a/charts/ocis/templates/web/config.yaml +++ b/charts/ocis/templates/web/config.yaml @@ -19,6 +19,10 @@ data: scripts: {{- toYaml .Values.services.web.config.scripts | nindent 10 }} {{- end }} + {{- if gt (len .Values.services.web.config.translations) 0 }} + custom_translations: + {{- toYaml .Values.services.web.config.translations | nindent 10 }} + {{- end }} {{- if gt (len .Values.services.web.config.apps) 0 }} apps: {{- toYaml .Values.services.web.config.apps | nindent 10 }} @@ -32,7 +36,7 @@ data: {{- toYaml .Values.services.web.config.applications | nindent 10 }} {{- end }} options: - contextHelpersReadMore: {{ .Values.services.web.config.contextHelpersReadMore.enabled }} + disableFeedbackLink: {{ not .Values.services.web.config.feedbackLink.enabled }} {{- if .Values.services.web.config.feedbackLink.enabled }} {{- if (or .Values.services.web.config.feedbackLink.href .Values.services.web.config.feedbackLink.ariaLabel .Values.services.web.config.feedbackLink.description) }} @@ -48,14 +52,8 @@ data: {{- end }} {{- end }} {{- end }} + {{- if gt (len .Values.services.web.config.previewFileMimeTypes) 0 }} previewFileMimeTypes: {{- toYaml .Values.services.web.config.previewFileMimeTypes | nindent 12 }} {{- end }} - {{- if .Values.features.externalUserManagement.oidc.sessionManagementLink }} - logoutUrl: {{ .Values.features.externalUserManagement.oidc.sessionManagementLink | quote }} - {{- end }} - {{- if .Values.features.externalUserManagement.oidc.editAccountLink }} - accountEditLink: - href: {{ .Values.features.externalUserManagement.oidc.editAccountLink | quote }} - {{- end }} diff --git a/charts/ocis/templates/web/deployment.yaml b/charts/ocis/templates/web/deployment.yaml index 232fc3c84..e6ff96152 100644 --- a/charts/ocis/templates/web/deployment.yaml +++ b/charts/ocis/templates/web/deployment.yaml @@ -65,6 +65,19 @@ spec: - name: WEB_UI_CONFIG_SERVER value: "https://{{ .Values.externalDomain }}" + - name: WEB_OPTION_CONTEXTHELPERS_READ_MORE + value: {{ .Values.services.web.config.contextHelpersReadMore.enabled | quote }} + + {{- if .Values.features.externalUserManagement.oidc.sessionManagementLink }} + - name: WEB_OPTION_LOGOUT_URL + value: {{ .Values.features.externalUserManagement.oidc.sessionManagementLink | quote }} + {{- end }} + + {{- if .Values.features.externalUserManagement.oidc.editAccountLink }} + - name: WEB_OPTION_ACCOUNT_EDIT_LINK_HREF + value: {{ .Values.features.externalUserManagement.oidc.editAccountLink | quote }} + {{- end }} + - name: WEB_GATEWAY_GRPC_ADDR #TODO: does not support fallback to REVA_GATEWAY as of oCIS 3.0.0-rc.1 value: {{ .appNameGateway }}:9142 diff --git a/charts/ocis/values.yaml b/charts/ocis/values.yaml index 84c20ecff..8b83558d5 100644 --- a/charts/ocis/values.yaml +++ b/charts/ocis/values.yaml @@ -1129,11 +1129,15 @@ services: # - image/x-ms-bmp # -- Configure the {"styles": []} section in the Web config.json. - styles: - - href: /theme/foo.css + styles: [] + # - href: /theme/foo.css # -- Configure the {"styles": []} section in the Web config.json. - scripts: - - href: /theme/foo.js + scripts: [] + # - src: /theme/foo.js + # async: true + # -- COnfigure custom translations + translations: [] + # - url: https://foo.bar # -- Configure the {"custom_translations": []} section in the Web config.json. custom_translations: [] # -- Configure the {"apps": []} section in the Web config.json. @@ -1172,7 +1176,6 @@ services: # -- URL path to load themes from. The theme server will be prepended. Defaults to the ownCloud Web default theme. path: "" - theme: [] #TODO # -- Persistence settings. # @default -- see detailed persistence configuration options below