diff --git a/library/ix-dev/charts/nextcloud/Chart.yaml b/library/ix-dev/charts/nextcloud/Chart.yaml index eb6a60baa5..48b1ccc854 100644 --- a/library/ix-dev/charts/nextcloud/Chart.yaml +++ b/library/ix-dev/charts/nextcloud/Chart.yaml @@ -4,7 +4,7 @@ description: A file sharing server that puts the control and security of your ow annotations: title: Nextcloud type: application -version: 2.0.13 +version: 2.0.14 apiVersion: v2 appVersion: 29.0.5 kubeVersion: '>=1.16.0-0' diff --git a/library/ix-dev/charts/nextcloud/templates/_portal.tpl b/library/ix-dev/charts/nextcloud/templates/_portal.tpl index 9d4ffbeaff..3fd7622681 100644 --- a/library/ix-dev/charts/nextcloud/templates/_portal.tpl +++ b/library/ix-dev/charts/nextcloud/templates/_portal.tpl @@ -3,14 +3,18 @@ {{- if .Values.ncNetwork.certificateID -}} {{- $protocol = "https" -}} {{- end -}} -{{- $host := "$node_ip" -}} -{{- if .Values.ncConfig.host -}} - {{- $host = .Values.ncConfig.host -}} -{{- end -}} {{- $port := .Values.ncNetwork.webPort -}} {{- if .Values.ncNetwork.nginx.useDifferentAccessPort -}} {{- $port = .Values.ncNetwork.nginx.externalAccessPort -}} {{- end }} +{{- $host := "$node_ip" -}} +{{- if .Values.ncConfig.host -}} + {{- $host = .Values.ncConfig.host -}} + {{- if contains ":" .Values.ncConfig.host -}} + {{- $host = (split ":" $host)._0 -}} + {{- $port = (split ":" $host)._1 -}} + {{- end -}} +{{- end -}} --- apiVersion: v1 kind: ConfigMap