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

Cleanup unnecessary ssl configuration knobs for collabora

Browse Source
This commit is contained in:
sonicaj
2021-10-19 21:59:41 +05:00
parent ef767c024f
commit 85bc4ca8ad
2 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,14 +32,6 @@ questions:
type: string
$ref:
- "definitions/timezone"
- variable: domain
label: "Domain(s) using collabora"
description: 'Use backslash "\" before dots ".". Use pipe "|" to separate multiple domains'
schema:
type: string
default: 'nextcloud\.domain\.tld|othernextcloud\.domain\.tld'
# valid_chars: '^$|^([a-z]{1,}\\{1}\.{1}[a-z]{1,}\\{1}\.{1}[a-z]{1,}\|{0,1})*$'
required: false
- variable: username
label: "Username for WebUI"
schema:
@@ -65,23 +57,13 @@ questions:
schema:
type: string
default: "--o:welcome.enable=false --o:user_interface.mode=notebookbar --o:ssl.termination=true --o:ssl.enable=false --o:net.proto=IPv4 --o:net.post_allow.host[0]=.+ --o:storage.wopi.host[0]=.+"
- variable: DONT_GEN_SSL_CERT
label: "DONT_GEN_SSL_CERT"
description: "When set to true it does NOT generate an SSL cert, you have to use your own"
schema:
type: string
default: "true"
enum:
- value: "true"
description: "true"
- value: ""
description: "false"
- variable: server_name
label: "Server Name"
description: "When this environment variable is set (is not “”), then its value will be used as server name in /etc/loolwsd/loolwsd.xml. Without this, CODE is not delivering a correct host for the websocket connection in case of a proxy in front of it."
schema:
type: string
default: ''
$ref:
- "definitions/nodeIP"
- variable: certificate
description: "Collabora Certificate"

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

@@ -54,9 +54,8 @@ spec:
{{ $envList = mustAppend $envList (dict "name" "timezone" "value" $envConfig.timezone) }}
{{ $envList = mustAppend $envList (dict "name" "domain" "value" $envConfig.domain) }}
{{ $envList = mustAppend $envList (dict "name" "dictionaries" "value" $envConfig.dictionaries) }}
{{ $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" "DONT_GEN_SSL_CERT" "value" "true") }}
{{ $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") }}