simplify

library/ix-dev/charts/nextcloud/ci/basic-values.yaml

@@ -1,7 +1,7 @@
 ncConfig:
   adminUser: admin
   adminPassword: password
-  host: ""
+  host: "127.0.0.1"
   dataDir: /var/www/html
   commands:
     - ffmpeg

library/ix-dev/charts/nextcloud/templates/_configuration.tpl

@@ -20,10 +20,10 @@
 
   {{/* Temporary set dynamic db details on values,
   so we can print them on the notes */}}
-  {{- $_ := set .Values "haDbPass" $dbPass -}}
-  {{- $_ := set .Values "haDbHost" $dbHost -}}
-  {{- $_ := set .Values "haDbName" $dbName -}}
-  {{- $_ := set .Values "haDbUser" $dbUser -}}
+  {{- $_ := set .Values "ncDbPass" $dbPass -}}
+  {{- $_ := set .Values "ncDbHost" $dbHost -}}
+  {{- $_ := set .Values "ncDbName" $dbName -}}
+  {{- $_ := set .Values "ncDbUser" $dbUser -}}
 
   {{- $dbURL := (printf "postgres://%s:%s@%s:5432/%s?sslmode=disable" $dbUser $dbPass $dbHost $dbName) }}
 secret:
@@ -57,7 +57,7 @@ secret:
         {{- end }}
       {{- end }}
     {{- end }}
-      NEXTCLOUD_TRUSTED_DOMAINS: {{ .Values.ncConfig.host }}
+      NEXTCLOUD_TRUSTED_DOMAINS: {{ (list .Values.ncConfig.host "127.0.0.1" "localhost") | mustUniq | join "," | quote }}
       NEXTCLOUD_ADMIN_USER: {{ .Values.ncConfig.adminUser }}
       NEXTCLOUD_ADMIN_PASSWORD: {{ .Values.ncConfig.adminPassword }}
   {{- if eq (include "nextcloud.is-migration" $) "true" }}

library/ix-dev/charts/nextcloud/templates/_nginx.tpl

@@ -1,9 +1,6 @@
 {{- define "nginx.workload" -}}
   {{- $fullname := (include "ix.v1.common.lib.chart.names.fullname" $) -}}
-  {{- $ncUrl := printf "http://%s:%v" $fullname .Values.ncNetwork.webPort -}}
-  {{- if .Values.ncNetwork.certificateID -}}
-    {{- $ncUrl = printf "https://%s:80" $fullname -}}
-  {{- end }}
+  {{- $ncUrl := printf "http://%s:80" $fullname }}
 workload:
   nginx:
     enabled: true

library/ix-dev/charts/nextcloud/templates/_service.tpl

@@ -15,10 +15,8 @@ service:
         primary: true
         {{- if not .Values.ncNetwork.certificateID }}
         nodePort: {{ .Values.ncNetwork.webPort }}
-        port: {{ .Values.ncNetwork.webPort }}
-        {{- else -}}
-        port: 80
         {{- end }}
+        port: 80
         targetPort: 80
         targetSelector: nextcloud
   {{- if .Values.ncNetwork.certificateID }}