From fc868787296a13bc36cf67ad1662f6f26090ce40 Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Thu, 1 Jun 2023 23:57:01 +0300
Subject: [PATCH] Only set OVERWRITEHOST if both host and port are defined
 (#1233)

---
 library/ix-dev/charts/nextcloud/Chart.yaml                | 2 +-
 library/ix-dev/charts/nextcloud/templates/deployment.yaml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/ix-dev/charts/nextcloud/Chart.yaml b/library/ix-dev/charts/nextcloud/Chart.yaml
index 1b0fdfe18d..fea44c9895 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: 1.6.28
+version: 1.6.29
 apiVersion: v2
 appVersion: 26.0.2
 kubeVersion: '>=1.16.0-0'
diff --git a/library/ix-dev/charts/nextcloud/templates/deployment.yaml b/library/ix-dev/charts/nextcloud/templates/deployment.yaml
index 15c62bdd12..fc88cd52e3 100644
--- a/library/ix-dev/charts/nextcloud/templates/deployment.yaml
+++ b/library/ix-dev/charts/nextcloud/templates/deployment.yaml
@@ -79,7 +79,9 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
         {{ $envList = mustAppend $envList (dict "name" "NEXTCLOUD_DATA_DIR" "value" .Values.nextcloud.datadir) }}
         {{ if eq (include "nginx.certAvailable" .) "true" }}
         {{ $envList = mustAppend $envList (dict "name" "APACHE_DISABLE_REWRITE_IP" "value" "1") }}
+          {{ if and .Values.nextcloud.host .Values.service.nodePort }}
         {{ $envList = mustAppend $envList (dict "name" "OVERWRITEHOST" "value" (printf "%v:%v" .Values.nextcloud.host .Values.service.nodePort)) }}
+          {{ end }}
         {{ $envList = mustAppend $envList (dict "name" "OVERWRITEPROTOCOL" "value" "https") }}
         {{ $envList = mustAppend $envList (dict "name" "TRUSTED_PROXIES" "value" "127.0.0.1") }}
         {{ end }}