truenas/chart
1
0
Fork 0
mirror of https://github.com/truenas/charts.git synced 2026-04-06 20:29:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correctly set server_name so that it doesn't include the node port

Browse Source
This commit is contained in:
sonicaj
2021-10-19 21:54:34 +05:00
parent fbb2fe07a4
commit ef767c024f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/collabora/1.0.0/questions.yaml
View File

@@ -13,7 +13,7 @@ portals:
protocols:
- "https"
host:
- "$variable-server_name"
- "$variable-config.server_name"
ports:
- "$variable-nodePort"
path: "/loleaflet/dist/admin/admin.html"

2
test/collabora/1.0.0/templates/deployment.yaml
View File

@@ -57,7 +57,7 @@ spec:
{{ $envList = mustAppend $envList (dict "name" "cert_domain" "value" "192.168.0.3") }}
{{ $envList = mustAppend $envList (dict "name" "extra_params" "value" $envConfig.extra_params) }}
{{ $envList = mustAppend $envList (dict "name" "DONT_GEN_SSL_CERT" "value" $envConfig.DONT_GEN_SSL_CERT) }}
{{ $envList = mustAppend $envList (dict "name" "server_name" "value" $envConfig.server_name) }}
{{ $envList = mustAppend $envList (dict "name" "server_name" "value" (printf "%v:%v" $envConfig.server_name .Values.nodePort)) }}
{{ $envList = mustAppend $envList (dict "name" "username" "valueFromSecret" true "secretName" $secretName "secretKey" "username") }}
{{ $envList = mustAppend $envList (dict "name" "password" "valueFromSecret" true "secretName" $secretName "secretKey" "password") }}
{{ include "common.containers.allEnvironmentVariables" (dict "environmentVariables" $envList) | nindent 10 }}